diff options
| author | York Sun <york.sun@nxp.com> | 2016-11-16 11:23:23 -0800 |
|---|---|---|
| committer | York Sun <york.sun@nxp.com> | 2016-11-23 23:42:05 -0800 |
| commit | 3c3d8ab58d40d39830de7aed3f4b7110067d7d2d (patch) | |
| tree | 6d81062b6b85817fd37480df8bbed788a06db8a1 /arch/powerpc/cpu/mpc85xx | |
| parent | 4096f350d5218830ffedc56631e4382df478a370 (diff) | |
powerpc: MPC8555: Remove macro CONFIG_MPC8555
Replace CONFIG_MPC8555 with ARCH_MPC8555 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/cpu.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/speed.c | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index 8b08ee2ad0..c58f76ff91 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -76,6 +76,7 @@ config TARGET_MPC8548CDS config TARGET_MPC8555CDS bool "Support MPC8555CDS" + select ARCH_MPC8555 config TARGET_MPC8560ADS bool "Support MPC8560ADS" @@ -207,6 +208,9 @@ config ARCH_MPC8544 config ARCH_MPC8548 bool +config ARCH_MPC8555 + bool + source "board/freescale/b4860qds/Kconfig" source "board/freescale/bsc9131rdb/Kconfig" source "board/freescale/bsc9132qds/Kconfig" diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c index c563744cd7..3e6f8f379c 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu.c +++ b/arch/powerpc/cpu/mpc85xx/cpu.c @@ -294,7 +294,7 @@ int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { /* Everything after the first generation of PQ3 parts has RSTCR */ #if defined(CONFIG_ARCH_MPC8540) || defined(CONFIG_ARCH_MPC8541) || \ - defined(CONFIG_MPC8555) || defined(CONFIG_MPC8560) + defined(CONFIG_ARCH_MPC8555) || defined(CONFIG_MPC8560) unsigned long val, msr; /* diff --git a/arch/powerpc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c index bd810d7b60..93c7193852 100644 --- a/arch/powerpc/cpu/mpc85xx/speed.c +++ b/arch/powerpc/cpu/mpc85xx/speed.c @@ -626,7 +626,7 @@ void get_sys_info(sys_info_t *sys_info) */ lcrr_div *= 4; #elif !defined(CONFIG_ARCH_MPC8540) && !defined(CONFIG_ARCH_MPC8541) && \ - !defined(CONFIG_MPC8555) && !defined(CONFIG_MPC8560) + !defined(CONFIG_ARCH_MPC8555) && !defined(CONFIG_MPC8560) /* * Yes, the entire PQ38 family use the same * bit-representation for twice the clock divider values. @@ -682,7 +682,7 @@ int get_clocks (void) * AN2919. */ #if defined(CONFIG_ARCH_MPC8540) || defined(CONFIG_ARCH_MPC8541) || \ - defined(CONFIG_MPC8560) || defined(CONFIG_MPC8555) || \ + defined(CONFIG_MPC8560) || defined(CONFIG_ARCH_MPC8555) || \ defined(CONFIG_P1022) gd->arch.i2c1_clk = sys_info.freq_systembus; #elif defined(CONFIG_ARCH_MPC8544) |