sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
York Sun 2016-11-15 13:57:15 -08:00
parent 4d08d5d9d5
commit 25cb74b30a
7 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/powerpc/cpu/mpc85xx/Kconfig
View File

@ -14,6 +14,7 @@ config TARGET_SBC8548
config TARGET_SOCRATES config TARGET_SOCRATES
bool "Support socrates" bool "Support socrates"
select ARCH_MPC8544
config TARGET_B4860QDS config TARGET_B4860QDS
bool "Support B4860QDS" bool "Support B4860QDS"
@ -61,6 +62,7 @@ config TARGET_MPC8541CDS
config TARGET_MPC8544DS config TARGET_MPC8544DS
bool "Support MPC8544DS" bool "Support MPC8544DS"
select ARCH_MPC8544
config TARGET_MPC8548CDS config TARGET_MPC8548CDS
bool "Support MPC8548CDS" bool "Support MPC8548CDS"
@ -175,6 +177,9 @@ config TARGET_CYRUS
endchoice endchoice
config ARCH_MPC8544
bool
config ARCH_MPC8548 config ARCH_MPC8548
bool bool

2
arch/powerpc/cpu/mpc85xx/Makefile
View File

@ -67,7 +67,7 @@ obj-$(CONFIG_SYS_FSL_QORIQ_CHASSIS2) += fsl_corenet2_serdes.o
# SoC specific SERDES support # SoC specific SERDES support
obj-$(CONFIG_PPC_C29X) += c29x_serdes.o obj-$(CONFIG_PPC_C29X) += c29x_serdes.o
obj-$(CONFIG_MPC8536) += mpc8536_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_ARCH_MPC8548) += mpc8548_serdes.o
obj-$(CONFIG_MPC8568) += mpc8568_serdes.o obj-$(CONFIG_MPC8568) += mpc8568_serdes.o
obj-$(CONFIG_MPC8569) += mpc8569_serdes.o obj-$(CONFIG_MPC8569) += mpc8569_serdes.o

4
arch/powerpc/cpu/mpc85xx/speed.c
View File

@ -652,7 +652,7 @@ void get_sys_info(sys_info_t *sys_info)
int get_clocks (void) int get_clocks (void)
{ {
sys_info_t sys_info; sys_info_t sys_info;
#ifdef CONFIG_MPC8544 #ifdef CONFIG_ARCH_MPC8544
volatile ccsr_gur_t *gur = (void *) CONFIG_SYS_MPC85xx_GUTS_ADDR; volatile ccsr_gur_t *gur = (void *) CONFIG_SYS_MPC85xx_GUTS_ADDR;
#endif #endif
#if defined(CONFIG_CPM2) #if defined(CONFIG_CPM2)
@ -685,7 +685,7 @@ int get_clocks (void)
defined(CONFIG_MPC8560) || defined(CONFIG_MPC8555) || \ defined(CONFIG_MPC8560) || defined(CONFIG_MPC8555) || \
defined(CONFIG_P1022) defined(CONFIG_P1022)
gd->arch.i2c1_clk = sys_info.freq_systembus; 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 * 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 * either CCB/2 or CCB/3, depending on the value of cfg_sec_freq. See

2
arch/powerpc/include/asm/config_mpc85xx.h
View File

@ -57,7 +57,7 @@
#define CONFIG_SYS_FSL_SEC_COMPAT 2 #define CONFIG_SYS_FSL_SEC_COMPAT 2
#define CONFIG_SYS_CCSRBAR_DEFAULT 0xff700000 #define CONFIG_SYS_CCSRBAR_DEFAULT 0xff700000
#elif defined(CONFIG_MPC8544) #elif defined(CONFIG_ARCH_MPC8544)
#define CONFIG_MAX_CPUS 1 #define CONFIG_MAX_CPUS 1
#define CONFIG_SYS_FSL_NUM_LAWS 10 #define CONFIG_SYS_FSL_NUM_LAWS 10
#define CONFIG_SYS_FSL_DDRC_GEN2 #define CONFIG_SYS_FSL_DDRC_GEN2

1
include/configs/MPC8544DS.h
View File

@ -14,7 +14,6 @@
/* High Level Configuration Options */ /* High Level Configuration Options */
#define CONFIG_BOOKE 1 /* BOOKE */ #define CONFIG_BOOKE 1 /* BOOKE */
#define CONFIG_E500 1 /* BOOKE e500 family */ #define CONFIG_E500 1 /* BOOKE e500 family */
#define CONFIG_MPC8544 1
#define CONFIG_MPC8544DS 1 #define CONFIG_MPC8544DS 1
#ifndef CONFIG_SYS_TEXT_BASE #ifndef CONFIG_SYS_TEXT_BASE

1
include/configs/socrates.h
View File

@ -20,7 +20,6 @@
/* High Level Configuration Options */ /* High Level Configuration Options */
#define CONFIG_BOOKE 1 /* BOOKE */ #define CONFIG_BOOKE 1 /* BOOKE */
#define CONFIG_E500 1 /* BOOKE e500 family */ #define CONFIG_E500 1 /* BOOKE e500 family */
#define CONFIG_MPC8544 1
#define CONFIG_SOCRATES 1 #define CONFIG_SOCRATES 1
#define CONFIG_SYS_TEXT_BASE 0xfff80000 #define CONFIG_SYS_TEXT_BASE 0xfff80000

1
scripts/config_whitelist.txt
View File

@ -3151,7 +3151,6 @@ CONFIG_MPC8540
CONFIG_MPC8540ADS CONFIG_MPC8540ADS
CONFIG_MPC8541 CONFIG_MPC8541
CONFIG_MPC8541CDS CONFIG_MPC8541CDS
CONFIG_MPC8544
CONFIG_MPC8544DS CONFIG_MPC8544DS
CONFIG_MPC855 CONFIG_MPC855
CONFIG_MPC8555 CONFIG_MPC8555