brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-09-28 15:40:29 +09:00
Code Issues Projects Releases Wiki Activity

powerpc: QEMU_E500: Remove macro CONFIG_QEMU_E500

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

Signed-off-by: York Sun <york.sun@nxp.com>
This commit is contained in:
York Sun 2016-11-18 12:29:51 -08:00
parent b41f192b67
commit 10343403af
8 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/powerpc/cpu/mpc85xx/Kconfig
View File

@ -186,6 +186,7 @@ config TARGET_P2041RDB
config TARGET_QEMU_PPCE500 config TARGET_QEMU_PPCE500
bool "Support qemu-ppce500" bool "Support qemu-ppce500"
select ARCH_QEMU_E500
select PHYS_64BIT select PHYS_64BIT
config TARGET_T102XQDS config TARGET_T102XQDS
@ -345,6 +346,9 @@ config ARCH_P5020
config ARCH_P5040 config ARCH_P5040
bool bool
config ARCH_QEMU_E500
bool
source "board/freescale/b4860qds/Kconfig" source "board/freescale/b4860qds/Kconfig"
source "board/freescale/bsc9131rdb/Kconfig" source "board/freescale/bsc9131rdb/Kconfig"
source "board/freescale/bsc9132qds/Kconfig" source "board/freescale/bsc9132qds/Kconfig"

2
arch/powerpc/cpu/mpc85xx/Makefile
View File

@ -105,7 +105,7 @@ obj-y += cpu.o
obj-y += cpu_init.o obj-y += cpu_init.o
obj-y += cpu_init_early.o obj-y += cpu_init_early.o
obj-y += interrupts.o obj-y += interrupts.o
ifneq ($(CONFIG_QEMU_E500),y) ifneq ($(CONFIG_ARCH_QEMU_E500),y)
obj-y += speed.o obj-y += speed.o
endif endif
obj-y += tlb.o obj-y += tlb.o

2
arch/powerpc/cpu/mpc85xx/cpu.c
View File

@ -404,7 +404,7 @@ void mpc85xx_reginfo(void)
phys_size_t initdram(int board_type) phys_size_t initdram(int board_type)
{ {
#if defined(CONFIG_SPD_EEPROM) || defined(CONFIG_DDR_SPD) || \ #if defined(CONFIG_SPD_EEPROM) || defined(CONFIG_DDR_SPD) || \
defined(CONFIG_QEMU_E500) defined(CONFIG_ARCH_QEMU_E500)
return fsl_ddr_sdram_size(); return fsl_ddr_sdram_size();
#else #else
return (phys_size_t)CONFIG_SYS_SDRAM_SIZE * 1024 * 1024; return (phys_size_t)CONFIG_SYS_SDRAM_SIZE * 1024 * 1024;

2
arch/powerpc/cpu/mpc85xx/cpu_init_early.c
View File

@ -97,7 +97,7 @@ void cpu_init_early_f(void *fdt)
/* gd area was zeroed during startup */ /* 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, * CONFIG_SYS_CCSRBAR_PHYS below may use gd->fdt_blob on ePAPR systems,
* so we need to populate it before it accesses it. * so we need to populate it before it accesses it.

2
arch/powerpc/cpu/mpc85xx/start.S
View File

@ -311,7 +311,7 @@ l2_disabled:
#endif #endif
mtspr HID0,r0 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 */ li r0,(HID1_ASTME|HID1_ABE)@l /* Addr streaming & broadcast */
mfspr r3,PVR mfspr r3,PVR
andi. r3,r3, 0xff andi. r3,r3, 0xff

2
arch/powerpc/include/asm/config_mpc85xx.h
View File

@ -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_MAX_NUM_OF_SEC 3
#define CONFIG_SYS_FSL_SEC_IDX_OFFSET 0x20000 #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_MAX_CPUS 1
#define CONFIG_SYS_CCSRBAR_DEFAULT 0xe0000000 #define CONFIG_SYS_CCSRBAR_DEFAULT 0xe0000000

1
include/configs/qemu-ppce500.h
View File

@ -15,7 +15,6 @@
/* High Level Configuration Options */ /* High Level Configuration Options */
#define CONFIG_BOOKE #define CONFIG_BOOKE
#define CONFIG_E500 /* BOOKE e500 family */ #define CONFIG_E500 /* BOOKE e500 family */
#define CONFIG_QEMU_E500
#undef CONFIG_SYS_TEXT_BASE #undef CONFIG_SYS_TEXT_BASE
#define CONFIG_SYS_TEXT_BASE 0xf01000 /* 15 MB */ #define CONFIG_SYS_TEXT_BASE 0xf01000 /* 15 MB */

1
scripts/config_whitelist.txt
View File

@ -3689,7 +3689,6 @@ CONFIG_PXA_VIDEO
CONFIG_P_CLK_FREQ CONFIG_P_CLK_FREQ
CONFIG_QBMAN_CLK_DIV CONFIG_QBMAN_CLK_DIV
CONFIG_QE CONFIG_QE
CONFIG_QEMU_E500
CONFIG_QEMU_MIPS CONFIG_QEMU_MIPS
CONFIG_QIXIS_I2C_ACCESS CONFIG_QIXIS_I2C_ACCESS
CONFIG_QSPI CONFIG_QSPI