diff options
| author | York Sun <york.sun@nxp.com> | 2016-11-23 14:06:21 -0800 |
|---|---|---|
| committer | York Sun <york.sun@nxp.com> | 2016-11-23 23:42:16 -0800 |
| commit | 1425a87b1478bdb2620a46f2a23af7ca2e4b6073 (patch) | |
| tree | 7a86d8e8990b8b9d704bd9bac3d69c69d743adc2 /arch/powerpc/cpu | |
| parent | 3f82b56d41292ad824555978b9f934c1eea1ba0b (diff) | |
powerpc: MPC8610: Remove macro CONFIG_MPC8610
Replace CONFIG_MPC8610 with ARCH_MPC8610 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/mpc86xx/Kconfig | 4 | ||||
| -rw-r--r-- | arch/powerpc/cpu/mpc86xx/Makefile | 2 | ||||
| -rw-r--r-- | arch/powerpc/cpu/mpc86xx/cpu.c | 4 | ||||
| -rw-r--r-- | arch/powerpc/cpu/mpc86xx/speed.c | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/arch/powerpc/cpu/mpc86xx/Kconfig b/arch/powerpc/cpu/mpc86xx/Kconfig index fe1859d206..c3b3b07c3c 100644 --- a/arch/powerpc/cpu/mpc86xx/Kconfig +++ b/arch/powerpc/cpu/mpc86xx/Kconfig @@ -13,6 +13,7 @@ config TARGET_SBC8641D config TARGET_MPC8610HPCD bool "Support MPC8610HPCD" + select ARCH_MPC8610 config TARGET_MPC8641HPCN bool "Support MPC8641HPCN" @@ -22,6 +23,9 @@ config TARGET_XPEDITE517X endchoice +config ARCH_MPC8610 + bool + source "board/freescale/mpc8610hpcd/Kconfig" source "board/freescale/mpc8641hpcn/Kconfig" source "board/sbc8641d/Kconfig" diff --git a/arch/powerpc/cpu/mpc86xx/Makefile b/arch/powerpc/cpu/mpc86xx/Makefile index 0f790b0efc..0caf9f1012 100644 --- a/arch/powerpc/cpu/mpc86xx/Makefile +++ b/arch/powerpc/cpu/mpc86xx/Makefile @@ -19,6 +19,6 @@ obj-y += cpu_init.o obj-$(CONFIG_OF_LIBFDT) += fdt.o obj-y += interrupts.o obj-$(CONFIG_MP) += mp.o -obj-$(CONFIG_MPC8610) += mpc8610_serdes.o +obj-$(CONFIG_ARCH_MPC8610) += mpc8610_serdes.o obj-$(CONFIG_MPC8641) += mpc8641_serdes.o obj-y += speed.o diff --git a/arch/powerpc/cpu/mpc86xx/cpu.c b/arch/powerpc/cpu/mpc86xx/cpu.c index 30518544dd..4dc483b7d4 100644 --- a/arch/powerpc/cpu/mpc86xx/cpu.c +++ b/arch/powerpc/cpu/mpc86xx/cpu.c @@ -90,7 +90,7 @@ checkcpu(void) puts("L2: "); if (get_l2cr() & 0x80000000) { -#if defined(CONFIG_MPC8610) +#if defined(CONFIG_ARCH_MPC8610) puts("256"); #elif defined(CONFIG_MPC8641) puts("512"); @@ -139,7 +139,7 @@ get_tbclk(void) void watchdog_reset(void) { -#if defined(CONFIG_MPC8610) +#if defined(CONFIG_ARCH_MPC8610) /* * This actually feed the hard enabled watchdog. */ diff --git a/arch/powerpc/cpu/mpc86xx/speed.c b/arch/powerpc/cpu/mpc86xx/speed.c index 5abe6f0bf2..05f23db457 100644 --- a/arch/powerpc/cpu/mpc86xx/speed.c +++ b/arch/powerpc/cpu/mpc86xx/speed.c @@ -115,7 +115,7 @@ int get_clocks(void) * for that SOC. This information is taken from application note * AN2919. */ -#ifdef CONFIG_MPC8610 +#ifdef CONFIG_ARCH_MPC8610 gd->arch.i2c1_clk = sys_info.freq_systembus; #else gd->arch.i2c1_clk = sys_info.freq_systembus / 2; |