diff options
| author | York Sun <york.sun@nxp.com> | 2016-11-18 11:20:40 -0800 |
|---|---|---|
| committer | York Sun <york.sun@nxp.com> | 2016-11-23 23:42:10 -0800 |
| commit | 5e5fdd2d00489d4aa129e7a9ad289a38563f4387 (patch) | |
| tree | 53a60ab2493ca9a09bb7cf88d7c4be840c06e5f0 /arch/powerpc/cpu/mpc85xx | |
| parent | 37107facbc3d1c57414ae23a807a073b360ce232 (diff) | |
powerpc: P3041: Remove macro CONFIG_PPC_P3041
Replace CONFIG_PPC_P3041 with ARCH_P3041 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 | 4 | ||||
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/Makefile | 4 | ||||
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/cmd_errata.c | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index 0ddb7c5d92..d8bc1d0beb 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -41,6 +41,7 @@ config TARGET_C29XPCIE config TARGET_P3041DS bool "Support P3041DS" select PHYS_64BIT + select ARCH_P3041 config TARGET_P4080DS bool "Support P4080DS" @@ -316,6 +317,9 @@ config ARCH_P2020 config ARCH_P2041 bool +config ARCH_P3041 + 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 de35824439..df777f124e 100644 --- a/arch/powerpc/cpu/mpc85xx/Makefile +++ b/arch/powerpc/cpu/mpc85xx/Makefile @@ -40,7 +40,7 @@ obj-$(CONFIG_SYS_DPAA_QBMAN) += portals.o # various SoC specific assignments obj-$(CONFIG_ARCH_P2041) += p2041_ids.o -obj-$(CONFIG_PPC_P3041) += p3041_ids.o +obj-$(CONFIG_ARCH_P3041) += p3041_ids.o obj-$(CONFIG_PPC_P4080) += p4080_ids.o obj-$(CONFIG_PPC_P5020) += p5020_ids.o obj-$(CONFIG_PPC_P5040) += p5040_ids.o @@ -82,7 +82,7 @@ obj-$(CONFIG_ARCH_P1024) += p1021_serdes.o obj-$(CONFIG_ARCH_P1025) += p1021_serdes.o obj-$(CONFIG_ARCH_P2020) += p2020_serdes.o obj-$(CONFIG_ARCH_P2041) += p2041_serdes.o -obj-$(CONFIG_PPC_P3041) += p3041_serdes.o +obj-$(CONFIG_ARCH_P3041) += p3041_serdes.o obj-$(CONFIG_PPC_P4080) += p4080_serdes.o obj-$(CONFIG_PPC_P5020) += p5020_serdes.o obj-$(CONFIG_PPC_P5040) += p5040_serdes.o diff --git a/arch/powerpc/cpu/mpc85xx/cmd_errata.c b/arch/powerpc/cpu/mpc85xx/cmd_errata.c index 1aba6a8ca9..01710b560f 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_ARCH_P2041) || defined(CONFIG_PPC_P3041) +#if defined(CONFIG_ARCH_P2041) || defined(CONFIG_ARCH_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_ARCH_P2041) || defined(CONFIG_PPC_P3041) +#if defined(CONFIG_ARCH_P2041) || defined(CONFIG_ARCH_P3041) x108 = 0x12; #endif |