diff options
author | York Sun <york.sun@nxp.com> | 2016-11-18 11:15:21 -0800 |
---|---|---|
committer | York Sun <york.sun@nxp.com> | 2016-11-23 23:42:10 -0800 |
commit | ce040c83f1d74b07543fe98b07164912d104a2c7 (patch) | |
tree | 1c5fe30a5422dfef7224626afa9f92376fbc532c /arch/powerpc/cpu/mpc85xx | |
parent | 789460c914111f4e2f35d3cfb48b5ed4d7b3ddef (diff) | |
download | u-boot-imx-ce040c83f1d74b07543fe98b07164912d104a2c7.zip u-boot-imx-ce040c83f1d74b07543fe98b07164912d104a2c7.tar.gz u-boot-imx-ce040c83f1d74b07543fe98b07164912d104a2c7.tar.bz2 |
powerpc: P2041: Remove macro CONFIG_PPC_P2041
Replace CONFIG_PPC_P2041 with ARCH_P2041 in Kconfig and clean up
existing macros.
Signed-off-by: York Sun <york.sun@nxp.com>
Diffstat (limited to 'arch/powerpc/cpu/mpc85xx')
-rw-r--r-- | arch/powerpc/cpu/mpc85xx/Kconfig | 5 | ||||
-rw-r--r-- | arch/powerpc/cpu/mpc85xx/Makefile | 4 | ||||
-rw-r--r-- | arch/powerpc/cpu/mpc85xx/cmd_errata.c | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index 51192fe..0ddb7c5 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -170,6 +170,7 @@ config TARGET_P1_TWR config TARGET_P2041RDB bool "Support P2041RDB" + select ARCH_P2041 select PHYS_64BIT config TARGET_QEMU_PPCE500 @@ -221,6 +222,7 @@ config TARGET_CONTROLCENTERD config TARGET_KMP204X bool "Support kmp204x" + select ARCH_P2041 select PHYS_64BIT config TARGET_XPEDITE520X @@ -311,6 +313,9 @@ config ARCH_P1025 config ARCH_P2020 bool +config ARCH_P2041 + 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 14461e9..de35824 100644 --- a/arch/powerpc/cpu/mpc85xx/Makefile +++ b/arch/powerpc/cpu/mpc85xx/Makefile @@ -39,7 +39,7 @@ obj-$(CONFIG_PCI) += pci.o obj-$(CONFIG_SYS_DPAA_QBMAN) += portals.o # various SoC specific assignments -obj-$(CONFIG_PPC_P2041) += p2041_ids.o +obj-$(CONFIG_ARCH_P2041) += p2041_ids.o obj-$(CONFIG_PPC_P3041) += p3041_ids.o obj-$(CONFIG_PPC_P4080) += p4080_ids.o obj-$(CONFIG_PPC_P5020) += p5020_ids.o @@ -81,7 +81,7 @@ obj-$(CONFIG_ARCH_P1023) += p1023_serdes.o obj-$(CONFIG_ARCH_P1024) += p1021_serdes.o obj-$(CONFIG_ARCH_P1025) += p1021_serdes.o obj-$(CONFIG_ARCH_P2020) += p2020_serdes.o -obj-$(CONFIG_PPC_P2041) += p2041_serdes.o +obj-$(CONFIG_ARCH_P2041) += p2041_serdes.o obj-$(CONFIG_PPC_P3041) += p3041_serdes.o obj-$(CONFIG_PPC_P4080) += p4080_serdes.o obj-$(CONFIG_PPC_P5020) += p5020_serdes.o diff --git a/arch/powerpc/cpu/mpc85xx/cmd_errata.c b/arch/powerpc/cpu/mpc85xx/cmd_errata.c index 3b06ae4..1aba6a8 100644 --- a/arch/powerpc/cpu/mpc85xx/cmd_errata.c +++ b/arch/powerpc/cpu/mpc85xx/cmd_errata.c @@ -26,7 +26,7 @@ static void check_erratum_a4849(uint32_t svr) void __iomem *dcsr = (void *)CONFIG_SYS_DCSRBAR + 0xb0000; unsigned int i; -#if defined(CONFIG_PPC_P2041) || defined(CONFIG_PPC_P3041) +#if defined(CONFIG_ARCH_P2041) || defined(CONFIG_PPC_P3041) static const uint8_t offsets[] = { 0x50, 0x54, 0x58, 0x90, 0x94, 0x98 }; @@ -45,7 +45,7 @@ static void check_erratum_a4849(uint32_t svr) } } -#if defined(CONFIG_PPC_P2041) || defined(CONFIG_PPC_P3041) +#if defined(CONFIG_ARCH_P2041) || defined(CONFIG_PPC_P3041) x108 = 0x12; #endif |