From 10343403af4eb15690eb905bd5172331b5cfa40d Mon Sep 17 00:00:00 2001 From: York Sun Date: Fri, 18 Nov 2016 12:29:51 -0800 Subject: [PATCH] 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 --- arch/powerpc/cpu/mpc85xx/Kconfig | 4 ++++ arch/powerpc/cpu/mpc85xx/Makefile | 2 +- arch/powerpc/cpu/mpc85xx/cpu.c | 2 +- arch/powerpc/cpu/mpc85xx/cpu_init_early.c | 2 +- arch/powerpc/cpu/mpc85xx/start.S | 2 +- arch/powerpc/include/asm/config_mpc85xx.h | 2 +- include/configs/qemu-ppce500.h | 1 - scripts/config_whitelist.txt | 1 - 8 files changed, 9 insertions(+), 7 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index acac21e5d2..11ae4eaf11 100644 --- 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 c19c3e719c..0ff64a7803 100644 --- 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 268429b897..d180c73929 100644 --- 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 aa519b03fe..345d693ec4 100644 --- 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 5f8881df64..932216c237 100644 --- 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 d705e5cfed..06c6e005d1 100644 --- 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 a7f2a9dc9c..2c85f65fc8 100644 --- 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 29eb3d1b09..3af8b12044 100644 --- 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 -- 2.39.5