diff options
| author | York Sun <york.sun@nxp.com> | 2016-11-18 13:11:12 -0800 |
|---|---|---|
| committer | York Sun <york.sun@nxp.com> | 2016-11-23 23:42:13 -0800 |
| commit | 5d737010738c3a02ff346cae3d69cf20ab328d7f (patch) | |
| tree | 1f45be182bf0ad324af92cd195f3032a5b2f1893 /arch/powerpc/cpu | |
| parent | 95a809b918ac624fe688802745366fcf7d04651e (diff) | |
powerpc: T1040: Remove macro CONFIG_PPC_T1040
Replace CONFIG_PPC_T1040 with ARCH_T1040 in Kconfig and clean up
existing macros.
Signed-off-by: York Sun <york.sun@nxp.com>
Diffstat (limited to 'arch/powerpc/cpu')
| -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/fdt.c | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index a404356301..bad4af63ba 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -209,10 +209,12 @@ config TARGET_T1024RDB config TARGET_T1040QDS bool "Support T1040QDS" + select ARCH_T1040 select PHYS_64BIT config TARGET_T1040RDB bool "Support T1040RDB" + select ARCH_T1040 select SUPPORT_SPL select PHYS_64BIT @@ -368,6 +370,9 @@ config ARCH_T1023 config ARCH_T1024 bool +config ARCH_T1040 + 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 574259c56f..6310a72b28 100644 --- a/arch/powerpc/cpu/mpc85xx/Makefile +++ b/arch/powerpc/cpu/mpc85xx/Makefile @@ -49,7 +49,7 @@ obj-$(CONFIG_PPC_T4160) += t4240_ids.o obj-$(CONFIG_PPC_T4080) += t4240_ids.o obj-$(CONFIG_ARCH_B4420) += b4860_ids.o obj-$(CONFIG_ARCH_B4860) += b4860_ids.o -obj-$(CONFIG_PPC_T1040) += t1040_ids.o +obj-$(CONFIG_ARCH_T1040) += t1040_ids.o obj-$(CONFIG_PPC_T1042) += t1040_ids.o obj-$(CONFIG_PPC_T1020) += t1040_ids.o obj-$(CONFIG_PPC_T1022) += t1040_ids.o @@ -92,7 +92,7 @@ obj-$(CONFIG_PPC_T4080) += t4240_serdes.o obj-$(CONFIG_ARCH_B4420) += b4860_serdes.o obj-$(CONFIG_ARCH_B4860) += b4860_serdes.o obj-$(CONFIG_ARCH_BSC9132) += bsc9132_serdes.o -obj-$(CONFIG_PPC_T1040) += t1040_serdes.o +obj-$(CONFIG_ARCH_T1040) += t1040_serdes.o obj-$(CONFIG_PPC_T1042) += t1040_serdes.o obj-$(CONFIG_PPC_T1020) += t1040_serdes.o obj-$(CONFIG_PPC_T1022) += t1040_serdes.o diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c index eeee92c07b..aaca15f83d 100644 --- a/arch/powerpc/cpu/mpc85xx/fdt.c +++ b/arch/powerpc/cpu/mpc85xx/fdt.c @@ -556,7 +556,7 @@ void fdt_fixup_dma3(void *blob) #define fdt_fixup_dma3(x) #endif -#if defined(CONFIG_PPC_T1040) +#if defined(CONFIG_ARCH_T1040) static void fdt_fixup_l2_switch(void *blob) { uchar l2swaddr[6]; |