Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-28 15:41:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

powerpc: mpc8540: Remove macro CONFIG_MPC8540

Browse source 
Replace CONFIG_MPC8540 with ARCH_MPC8540 in Kconfig and clean up existing
macros.

Signed-off-by: York Sun <york.sun@nxp.com>
This commit is contained in:
York Sun 2016-11-16 11:13:06 -08:00
parent 30411e7cfc
commit 7f825218dc
11 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/powerpc/cpu/mpc85xx/Kconfig
View file

@ -60,6 +60,7 @@ config TARGET_MPC8536DS
config TARGET_MPC8540ADS
bool "Support MPC8540ADS"
select ARCH_MPC8540
config TARGET_MPC8541CDS
bool "Support MPC8541CDS"
@ -193,6 +194,9 @@ config ARCH_C29X
config ARCH_MPC8536
bool
config ARCH_MPC8540
bool
config ARCH_MPC8544
bool

2
arch/powerpc/cpu/mpc85xx/cpu.c
View file

@ -293,7 +293,7 @@ int checkcpu (void)
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_MPC8540) || defined(CONFIG_MPC8541) || \
#if defined(CONFIG_ARCH_MPC8540) || defined(CONFIG_MPC8541) || \
defined(CONFIG_MPC8555) || defined(CONFIG_MPC8560)
unsigned long val, msr;

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

@ -625,7 +625,7 @@ void get_sys_info(sys_info_t *sys_info)
* for four times the clock divider values.
*/
lcrr_div *= 4;
#elif !defined(CONFIG_MPC8540) && !defined(CONFIG_MPC8541) && \
#elif !defined(CONFIG_ARCH_MPC8540) && !defined(CONFIG_MPC8541) && \
!defined(CONFIG_MPC8555) && !defined(CONFIG_MPC8560)
/*
* Yes, the entire PQ38 family use the same
@ -681,7 +681,7 @@ int get_clocks (void)
* for that SOC. This information is taken from application note
* AN2919.
*/
#if defined(CONFIG_MPC8540) || defined(CONFIG_MPC8541) || \
#if defined(CONFIG_ARCH_MPC8540) || defined(CONFIG_MPC8541) || \
defined(CONFIG_MPC8560) || defined(CONFIG_MPC8555) || \
defined(CONFIG_P1022)
gd->arch.i2c1_clk = sys_info.freq_systembus;

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

@ -44,7 +44,7 @@
#define CONFIG_SYS_FSL_ERRATUM_A004508
#define CONFIG_SYS_FSL_ERRATUM_A005125
#elif defined(CONFIG_MPC8540)
#elif defined(CONFIG_ARCH_MPC8540)
#define CONFIG_MAX_CPUS 1
#define CONFIG_SYS_FSL_NUM_LAWS 8
#define CONFIG_SYS_FSL_DDRC_GEN1

2
arch/powerpc/include/asm/fsl_lbc.h
View file

@ -325,7 +325,7 @@ void lbc_sdram_init(void);
*/
#define LCRR_CLKDIV 0x0000001F
#define LCRR_CLKDIV_SHIFT 0
#if defined(CONFIG_MPC83xx) || defined (CONFIG_MPC8540) || \
#if defined(CONFIG_MPC83xx) || defined(CONFIG_ARCH_MPC8540) || \
defined(CONFIG_MPC8541) || defined (CONFIG_MPC8555) || \
defined(CONFIG_MPC8560)
#define LCRR_CLKDIV_2 0x00000002

2
arch/powerpc/include/asm/immap_85xx.h
View file

@ -124,7 +124,7 @@ typedef struct ccsr_i2c {
u8 res[4096 - 1 * sizeof(struct fsl_i2c_base)];
} ccsr_i2c_t;
#if defined(CONFIG_MPC8540) || \
#if defined(CONFIG_ARCH_MPC8540) || \
defined(CONFIG_MPC8541) || \
defined(CONFIG_ARCH_MPC8548) || \
defined(CONFIG_MPC8555)

2
doc/README.mpc85xxads
View file

@ -136,7 +136,7 @@ Updated 13-July-2004 Jon Loeliger
CONFIG_BOOKE BOOKE(e.g. Motorola MPC85xx, AMCC 440, etc)
CONFIG_E500 BOOKE e500 family(Motorola)
CONFIG_MPC85xx MPC8540,MPC8560 and their derivatives
CONFIG_MPC8540 MPC8540 specific
CONFIG_ARCH_MPC8540 MPC8540 specific
CONFIG_MPC8540ADS MPC8540ADS board specific
CONFIG_MPC8560ADS MPC8560ADS board specific
CONFIG_TSEC_ENET Use on-chip 10/100/1000 ethernet for networking

2
drivers/input/keyboard.c
View file

@ -20,7 +20,7 @@ static struct input_config config;
static int kbd_read_keys(struct input_config *config)
{
#if defined(CONFIG_MPC5xxx) || defined(CONFIG_MPC8540) || \
#if defined(CONFIG_MPC5xxx) || defined(CONFIG_ARCH_MPC8540) || \
defined(CONFIG_MPC8541) || defined(CONFIG_MPC8555)
/* no ISR is used, so received chars must be polled */
ps2ser_check();

1
include/configs/MPC8540ADS.h
View file

@ -21,7 +21,6 @@
/* High Level Configuration Options */
#define CONFIG_BOOKE 1 /* BOOKE */
#define CONFIG_E500 1 /* BOOKE e500 family */
#define CONFIG_MPC8540 1 /* MPC8540 specific */
#define CONFIG_MPC8540ADS 1 /* MPC8540ADS board specific */
/*

2
include/keyboard.h
View file

@ -98,7 +98,7 @@ extern int kbd_init_hw(void);
extern void pckbd_leds(unsigned char leds);
#endif /* !CONFIG_DM_KEYBOARD */
#if defined(CONFIG_MPC5xxx) || defined(CONFIG_MPC8540) || \
#if defined(CONFIG_MPC5xxx) || defined(CONFIG_ARCH_MPC8540) || \
defined(CONFIG_MPC8541) || defined(CONFIG_MPC8555)
int ps2ser_check(void);
#endif

1
scripts/config_whitelist.txt
View file

@ -3140,7 +3140,6 @@ CONFIG_MPC83XX_GPIO_1_INIT_OPEN_DRAIN
CONFIG_MPC83XX_GPIO_1_INIT_VALUE
CONFIG_MPC83XX_PCI2
CONFIG_MPC850
CONFIG_MPC8540
CONFIG_MPC8540ADS
CONFIG_MPC8541
CONFIG_MPC8541CDS