diff options
| author | York Sun <york.sun@nxp.com> | 2016-11-18 11:00:57 -0800 |
|---|---|---|
| committer | York Sun <york.sun@nxp.com> | 2016-11-23 23:42:10 -0800 |
| commit | 52b6f13d2c9c69d2841572e10515880bc59fed48 (patch) | |
| tree | 648f0e1be816b94f84861aa438ac720ff129b8dd /arch/powerpc | |
| parent | a990799d5248d3bb92bf2a8919936e1562693b07 (diff) | |
| download | u-boot-imx-52b6f13d2c9c69d2841572e10515880bc59fed48.zip u-boot-imx-52b6f13d2c9c69d2841572e10515880bc59fed48.tar.gz u-boot-imx-52b6f13d2c9c69d2841572e10515880bc59fed48.tar.bz2 | |
powerpc: P1024: Remove CONFIG_P1024
Replace CONFIG_P1024 with ARCH_P1024 in Kconfig and clean up
existing macros.
Signed-off-by: York Sun <york.sun@nxp.com>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/Kconfig | 4 | ||||
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/Makefile | 2 | ||||
| -rw-r--r-- | arch/powerpc/include/asm/config_mpc85xx.h | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index 5550687..62c0dec 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -150,6 +150,7 @@ config TARGET_P1024RDB bool "Support P1024RDB" select SUPPORT_SPL select SUPPORT_TPL + select ARCH_P1024 config TARGET_P1025RDB bool "Support P1025RDB" @@ -297,6 +298,9 @@ config ARCH_P1022 config ARCH_P1023 bool +config ARCH_P1024 + 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 515647d..239cf41 100644 --- a/arch/powerpc/cpu/mpc85xx/Makefile +++ b/arch/powerpc/cpu/mpc85xx/Makefile @@ -78,7 +78,7 @@ obj-$(CONFIG_ARCH_P1020) += p1021_serdes.o obj-$(CONFIG_ARCH_P1021) += p1021_serdes.o obj-$(CONFIG_ARCH_P1022) += p1022_serdes.o obj-$(CONFIG_ARCH_P1023) += p1023_serdes.o -obj-$(CONFIG_P1024) += p1021_serdes.o +obj-$(CONFIG_ARCH_P1024) += p1021_serdes.o obj-$(CONFIG_P1025) += p1021_serdes.o obj-$(CONFIG_P2010) += p2020_serdes.o obj-$(CONFIG_P2020) += p2020_serdes.o diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index bcd7550..dffc222 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -250,7 +250,7 @@ #define CONFIG_SYS_FSL_A004447_SVR_REV 0x11 /* P1024 is lower end variant of P1020 */ -#elif defined(CONFIG_P1024) +#elif defined(CONFIG_ARCH_P1024) #define CONFIG_MAX_CPUS 2 #define CONFIG_SYS_FSL_NUM_LAWS 12 #define CONFIG_SYS_PPC_E500_DEBUG_TLB 2 |