diff options
| author | York Sun <york.sun@nxp.com> | 2016-11-16 11:23:23 -0800 |
|---|---|---|
| committer | York Sun <york.sun@nxp.com> | 2016-11-23 23:42:05 -0800 |
| commit | 3c3d8ab58d40d39830de7aed3f4b7110067d7d2d (patch) | |
| tree | 6d81062b6b85817fd37480df8bbed788a06db8a1 /drivers | |
| parent | 4096f350d5218830ffedc56631e4382df478a370 (diff) | |
| download | u-boot-3c3d8ab58d40d39830de7aed3f4b7110067d7d2d.tar.gz | |
powerpc: MPC8555: Remove macro CONFIG_MPC8555
Replace CONFIG_MPC8555 with ARCH_MPC8555 in Kconfig and clean up existing
macros.
Signed-off-by: York Sun <york.sun@nxp.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ddr/fsl/ctrl_regs.c | 2 | ||||
| -rw-r--r-- | drivers/ddr/fsl/mpc85xx_ddr_gen1.c | 2 | ||||
| -rw-r--r-- | drivers/input/keyboard.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ddr/fsl/ctrl_regs.c b/drivers/ddr/fsl/ctrl_regs.c index b2e92a0b44..32b09679e2 100644 --- a/drivers/ddr/fsl/ctrl_regs.c +++ b/drivers/ddr/fsl/ctrl_regs.c @@ -1831,7 +1831,7 @@ static void set_ddr_sdram_clk_cntl(fsl_ddr_cfg_regs_t *ddr, unsigned int clk_adjust; /* Clock adjust */ unsigned int ss_en = 0; /* Source synchronous enable */ -#if defined(CONFIG_ARCH_MPC8541) || defined(CONFIG_MPC8555) +#if defined(CONFIG_ARCH_MPC8541) || defined(CONFIG_ARCH_MPC8555) /* Per FSL Application Note: AN2805 */ ss_en = 1; #endif diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen1.c b/drivers/ddr/fsl/mpc85xx_ddr_gen1.c index 67a9ad8bf8..c005f5294c 100644 --- a/drivers/ddr/fsl/mpc85xx_ddr_gen1.c +++ b/drivers/ddr/fsl/mpc85xx_ddr_gen1.c @@ -47,7 +47,7 @@ void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs, out_be32(&ddr->timing_cfg_2, regs->timing_cfg_2); out_be32(&ddr->sdram_mode, regs->ddr_sdram_mode); out_be32(&ddr->sdram_interval, regs->ddr_sdram_interval); -#if defined(CONFIG_MPC8555) || defined(CONFIG_ARCH_MPC8541) +#if defined(CONFIG_ARCH_MPC8555) || defined(CONFIG_ARCH_MPC8541) out_be32(&ddr->sdram_clk_cntl, regs->ddr_sdram_clk_cntl); #endif diff --git a/drivers/input/keyboard.c b/drivers/input/keyboard.c index f53a07afcc..7af5868dea 100644 --- a/drivers/input/keyboard.c +++ b/drivers/input/keyboard.c @@ -21,7 +21,7 @@ static struct input_config config; static int kbd_read_keys(struct input_config *config) { #if defined(CONFIG_MPC5xxx) || defined(CONFIG_ARCH_MPC8540) || \ - defined(CONFIG_ARCH_MPC8541) || defined(CONFIG_MPC8555) + defined(CONFIG_ARCH_MPC8541) || defined(CONFIG_ARCH_MPC8555) /* no ISR is used, so received chars must be polled */ ps2ser_check(); #endif |