diff options
Diffstat (limited to 'arch/powerpc/cpu/mpc86xx')
| -rw-r--r-- | arch/powerpc/cpu/mpc86xx/Kconfig | 10 | ||||
| -rw-r--r-- | arch/powerpc/cpu/mpc86xx/Makefile | 4 | ||||
| -rw-r--r-- | arch/powerpc/cpu/mpc86xx/cpu.c | 6 | ||||
| -rw-r--r-- | arch/powerpc/cpu/mpc86xx/speed.c | 2 |
4 files changed, 16 insertions, 6 deletions
diff --git a/arch/powerpc/cpu/mpc86xx/Kconfig b/arch/powerpc/cpu/mpc86xx/Kconfig index fe1859d..98fb702 100644 --- a/arch/powerpc/cpu/mpc86xx/Kconfig +++ b/arch/powerpc/cpu/mpc86xx/Kconfig @@ -10,18 +10,28 @@ choice config TARGET_SBC8641D bool "Support sbc8641d" + select ARCH_MPC8641 config TARGET_MPC8610HPCD bool "Support MPC8610HPCD" + select ARCH_MPC8610 config TARGET_MPC8641HPCN bool "Support MPC8641HPCN" + select ARCH_MPC8641 config TARGET_XPEDITE517X bool "Support xpedite517x" + select ARCH_MPC8641 endchoice +config ARCH_MPC8610 + bool + +config ARCH_MPC8641 + 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 0f790b0..88c23fc 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_MPC8641) += mpc8641_serdes.o +obj-$(CONFIG_ARCH_MPC8610) += mpc8610_serdes.o +obj-$(CONFIG_ARCH_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 3051854..7a9570c 100644 --- a/arch/powerpc/cpu/mpc86xx/cpu.c +++ b/arch/powerpc/cpu/mpc86xx/cpu.c @@ -90,9 +90,9 @@ checkcpu(void) puts("L2: "); if (get_l2cr() & 0x80000000) { -#if defined(CONFIG_MPC8610) +#if defined(CONFIG_ARCH_MPC8610) puts("256"); -#elif defined(CONFIG_MPC8641) +#elif defined(CONFIG_ARCH_MPC8641) puts("512"); #endif puts(" KiB enabled\n"); @@ -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 5abe6f0..05f23db 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; |