diff options
| author | York Sun <york.sun@nxp.com> | 2016-11-15 13:57:15 -0800 |
|---|---|---|
| committer | York Sun <york.sun@nxp.com> | 2016-11-23 23:42:03 -0800 |
| commit | 25cb74b30aa1aafe8c20bb9c71619f0711d0c8a5 (patch) | |
| tree | 0e3355e7c483719cfd8ed528c749f358af97ea47 /arch/powerpc/cpu | |
| parent | 4d08d5d9d5e10ba6ce6208f6b70e34da71e2b36f (diff) | |
| download | u-boot-imx-25cb74b30aa1aafe8c20bb9c71619f0711d0c8a5.zip u-boot-imx-25cb74b30aa1aafe8c20bb9c71619f0711d0c8a5.tar.gz u-boot-imx-25cb74b30aa1aafe8c20bb9c71619f0711d0c8a5.tar.bz2 | |
powerpc: MPC8544: Move CONFIG_MPC8544 to Kconfig option
Replace CONFIG_MPC8544 with ARCH_MPC8544 in Kconfig.
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 | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index 530c232..5ea02b5 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -14,6 +14,7 @@ config TARGET_SBC8548 config TARGET_SOCRATES bool "Support socrates" + select ARCH_MPC8544 config TARGET_B4860QDS bool "Support B4860QDS" @@ -61,6 +62,7 @@ config TARGET_MPC8541CDS config TARGET_MPC8544DS bool "Support MPC8544DS" + select ARCH_MPC8544 config TARGET_MPC8548CDS bool "Support MPC8548CDS" @@ -175,6 +177,9 @@ config TARGET_CYRUS endchoice +config ARCH_MPC8544 + bool + config ARCH_MPC8548 bool diff --git a/arch/powerpc/cpu/mpc85xx/Makefile b/arch/powerpc/cpu/mpc85xx/Makefile index 1383454..744c781 100644 --- a/arch/powerpc/cpu/mpc85xx/Makefile +++ b/arch/powerpc/cpu/mpc85xx/Makefile @@ -67,7 +67,7 @@ obj-$(CONFIG_SYS_FSL_QORIQ_CHASSIS2) += fsl_corenet2_serdes.o # SoC specific SERDES support obj-$(CONFIG_PPC_C29X) += c29x_serdes.o obj-$(CONFIG_MPC8536) += mpc8536_serdes.o -obj-$(CONFIG_MPC8544) += mpc8544_serdes.o +obj-$(CONFIG_ARCH_MPC8544) += mpc8544_serdes.o obj-$(CONFIG_ARCH_MPC8548) += mpc8548_serdes.o obj-$(CONFIG_MPC8568) += mpc8568_serdes.o obj-$(CONFIG_MPC8569) += mpc8569_serdes.o diff --git a/arch/powerpc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c index e732969..be03e01 100644 --- a/arch/powerpc/cpu/mpc85xx/speed.c +++ b/arch/powerpc/cpu/mpc85xx/speed.c @@ -652,7 +652,7 @@ void get_sys_info(sys_info_t *sys_info) int get_clocks (void) { sys_info_t sys_info; -#ifdef CONFIG_MPC8544 +#ifdef CONFIG_ARCH_MPC8544 volatile ccsr_gur_t *gur = (void *) CONFIG_SYS_MPC85xx_GUTS_ADDR; #endif #if defined(CONFIG_CPM2) @@ -685,7 +685,7 @@ int get_clocks (void) defined(CONFIG_MPC8560) || defined(CONFIG_MPC8555) || \ defined(CONFIG_P1022) gd->arch.i2c1_clk = sys_info.freq_systembus; -#elif defined(CONFIG_MPC8544) +#elif defined(CONFIG_ARCH_MPC8544) /* * On the 8544, the I2C clock is the same as the SEC clock. This can be * either CCB/2 or CCB/3, depending on the value of cfg_sec_freq. See |