diff options
| author | York Sun <york.sun@nxp.com> | 2016-11-16 15:23:52 -0800 |
|---|---|---|
| committer | York Sun <york.sun@nxp.com> | 2016-11-23 23:42:07 -0800 |
| commit | feb9e25bc706c85c0eb4d6c467379b5236f8de5f (patch) | |
| tree | 04f44efd3dab71923277dc6fe685e100603c5b16 /arch/powerpc/cpu | |
| parent | 7601686c6039cde149086986dd2bc7e8e83b6b07 (diff) | |
powerpc: P1022: Remove macro CONFIG_P1022
Replace CONFIG_P1022 with ARCH_P1022 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 | 2 | ||||
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/speed.c | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index 89573f8c31..4d9ffd37db 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -108,6 +108,7 @@ config TARGET_P1010RDB_PB config TARGET_P1022DS bool "Support P1022DS" + select ARCH_P1022 select SUPPORT_SPL select SUPPORT_TPL @@ -171,6 +172,7 @@ config TARGET_T4240RDB config TARGET_CONTROLCENTERD bool "Support controlcenterd" + select ARCH_P1022 config TARGET_KMP204X bool "Support kmp204x" @@ -238,6 +240,9 @@ config ARCH_MPC8572 config ARCH_P1010 bool +config ARCH_P1022 + 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 de42b6560a..939f681402 100644 --- a/arch/powerpc/cpu/mpc85xx/Makefile +++ b/arch/powerpc/cpu/mpc85xx/Makefile @@ -80,7 +80,7 @@ obj-$(CONFIG_P1014) += p1010_serdes.o obj-$(CONFIG_P1017) += p1023_serdes.o obj-$(CONFIG_P1020) += p1021_serdes.o obj-$(CONFIG_P1021) += p1021_serdes.o -obj-$(CONFIG_P1022) += p1022_serdes.o +obj-$(CONFIG_ARCH_P1022) += p1022_serdes.o obj-$(CONFIG_P1023) += p1023_serdes.o obj-$(CONFIG_P1024) += p1021_serdes.o obj-$(CONFIG_P1025) += p1021_serdes.o diff --git a/arch/powerpc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c index c20bc9d3d1..2af9143683 100644 --- a/arch/powerpc/cpu/mpc85xx/speed.c +++ b/arch/powerpc/cpu/mpc85xx/speed.c @@ -683,7 +683,7 @@ int get_clocks (void) */ #if defined(CONFIG_ARCH_MPC8540) || defined(CONFIG_ARCH_MPC8541) || \ defined(CONFIG_ARCH_MPC8560) || defined(CONFIG_ARCH_MPC8555) || \ - defined(CONFIG_P1022) + defined(CONFIG_ARCH_P1022) gd->arch.i2c1_clk = sys_info.freq_systembus; #elif defined(CONFIG_ARCH_MPC8544) /* |