powerpc: QEMU_E500: Remove macro CONFIG_QEMU_E500

Replace CONFIG_QEMU_E500 with ARCH_QEMU_E500 in Kconfig and
clean up existing macros.

Signed-off-by: York Sun <york.sun@nxp.com>

diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig
index acac21e5d2e4ee2fdbef7cdb3f643f6e42571fad..11ae4eaf11f89b972ffc0cabac1d16f263d2a327 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/Kconfig
+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
@@ -186,6 +186,7 @@ config TARGET_P2041RDB
 
 config TARGET_QEMU_PPCE500
        bool "Support qemu-ppce500"
+       select ARCH_QEMU_E500
        select PHYS_64BIT
 
 config TARGET_T102XQDS
@@ -345,6 +346,9 @@ config ARCH_P5020
 config ARCH_P5040
        bool
 
+config ARCH_QEMU_E500
+       bool
+
 source "board/freescale/b4860qds/Kconfig"
 source "board/freescale/bsc9131rdb/Kconfig"
 source "board/freescale/bsc9132qds/Kconfig"

diff --git a/arch/powerpc/cpu/mpc85xx/Makefile b/arch/powerpc/cpu/mpc85xx/Makefile
index c19c3e719c503688702e234fdb92f9c8f2c65551..0ff64a78031f3160dc3e9c7bb2babfb5a1224268 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/Makefile
+++ b/arch/powerpc/cpu/mpc85xx/Makefile
@@ -105,7 +105,7 @@ obj-y       += cpu.o
 obj-y  += cpu_init.o
 obj-y  += cpu_init_early.o
 obj-y  += interrupts.o
-ifneq ($(CONFIG_QEMU_E500),y)
+ifneq ($(CONFIG_ARCH_QEMU_E500),y)
 obj-y  += speed.o
 endif
 obj-y  += tlb.o

diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c
index 268429b897ab83f2dd59531b018b566bfffa16ea..d180c7392994cedc6b52c0d9a57b397adfed87f8 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/cpu.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu.c
@@ -404,7 +404,7 @@ void mpc85xx_reginfo(void)
 phys_size_t initdram(int board_type)
 {
 #if defined(CONFIG_SPD_EEPROM) || defined(CONFIG_DDR_SPD) || \
-       defined(CONFIG_QEMU_E500)
+       defined(CONFIG_ARCH_QEMU_E500)
        return fsl_ddr_sdram_size();
 #else
        return (phys_size_t)CONFIG_SYS_SDRAM_SIZE * 1024 * 1024;

diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init_early.c b/arch/powerpc/cpu/mpc85xx/cpu_init_early.c
index aa519b03fe3fd31e2349b997083e38dfea28fdb7..345d693ec4b5d3ad7972566e60a5416f4306c152 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/cpu_init_early.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init_early.c
@@ -97,7 +97,7 @@ void cpu_init_early_f(void *fdt)
 
        /* gd area was zeroed during startup */
 
-#ifdef CONFIG_QEMU_E500
+#ifdef CONFIG_ARCH_QEMU_E500
        /*
         * CONFIG_SYS_CCSRBAR_PHYS below may use gd->fdt_blob on ePAPR systems,
         * so we need to populate it before it accesses it.

diff --git a/arch/powerpc/cpu/mpc85xx/start.S b/arch/powerpc/cpu/mpc85xx/start.S
index 5f8881df64eddc8aed5fb0e74f5975c5aec047a3..932216c237f9d2a8b96905027018f5d51a55fc23 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/start.S
+++ b/arch/powerpc/cpu/mpc85xx/start.S
@@ -311,7 +311,7 @@ l2_disabled:
 #endif
        mtspr   HID0,r0
 
-#if !defined(CONFIG_E500MC) && !defined(CONFIG_QEMU_E500)
+#if !defined(CONFIG_E500MC) && !defined(CONFIG_ARCH_QEMU_E500)
        li      r0,(HID1_ASTME|HID1_ABE)@l      /* Addr streaming & broadcast */
        mfspr   r3,PVR
        andi.   r3,r3, 0xff

diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h
index d705e5cfed96e5624025a0fd00f864f8013337ef..06c6e005d18c7cf3c1af790c867ff3ec97ea508a 100644 (file)
--- a/arch/powerpc/include/asm/config_mpc85xx.h
+++ b/arch/powerpc/include/asm/config_mpc85xx.h
@@ -850,7 +850,7 @@ defined(CONFIG_PPC_T1014) || defined(CONFIG_PPC_T1013)
 #define CONFIG_SYS_FSL_MAX_NUM_OF_SEC  3
 #define CONFIG_SYS_FSL_SEC_IDX_OFFSET  0x20000
 
-#elif defined(CONFIG_QEMU_E500)
+#elif defined(CONFIG_ARCH_QEMU_E500)
 #define CONFIG_MAX_CPUS                        1
 #define CONFIG_SYS_CCSRBAR_DEFAULT     0xe0000000
 

diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h
index a7f2a9dc9c5e8e27fcc753aae74f928a7d5430a1..2c85f65fc84e4919f40ff706a7aa562777497095 100644 (file)
--- a/include/configs/qemu-ppce500.h
+++ b/include/configs/qemu-ppce500.h
@@ -15,7 +15,6 @@
 /* High Level Configuration Options */
 #define CONFIG_BOOKE
 #define CONFIG_E500                    /* BOOKE e500 family */
-#define CONFIG_QEMU_E500
 
 #undef CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_TEXT_BASE   0xf01000 /* 15 MB */

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 29eb3d1b097a56103d72cd0dd18193b9638ec565..3af8b12044c5a3e76b8f16dcb70c510c183c9796 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -3689,7 +3689,6 @@ CONFIG_PXA_VIDEO
 CONFIG_P_CLK_FREQ
 CONFIG_QBMAN_CLK_DIV
 CONFIG_QE
-CONFIG_QEMU_E500
 CONFIG_QEMU_MIPS
 CONFIG_QIXIS_I2C_ACCESS
 CONFIG_QSPI