CONFIG options must not use lower-case letter. Convert this to upper case.
Signed-off-by: Simon Glass <s...@chromium.org>
---
arch/m68k/Kconfig | 4 ++--
arch/m68k/Makefile | 2 +-
arch/m68k/cpu/mcf532x/cpu.c | 2 +-
arch/m68k/cpu/mcf532x/cpu_init.c | 4 ++--
arch/m68k/cpu/mcf532x/speed.c | 12 ++++++------
arch/m68k/cpu/mcf532x/start.S | 2 +-
arch/m68k/include/asm/cache.h | 2 +-
arch/m68k/include/asm/immap.h | 2 +-
arch/m68k/include/asm/immap_5301x.h | 2 +-
board/freescale/m53017evb/README | 6 +++---
10 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 76233ef563f..af5540f14a4 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -32,7 +32,7 @@ config MCF530x
select DM_SERIAL
bool
-config MCF5301x
+config MCF5301X
select OF_CONTROL
select DM
select DM_SERIAL
@@ -95,7 +95,7 @@ config M5307
config M53015
bool
- select MCF5301x
+ select MCF5301X
config M5329
bool
diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
index 4a7960bbeb4..21e5337d309 100644
--- a/arch/m68k/Makefile
+++ b/arch/m68k/Makefile
@@ -14,7 +14,7 @@ cpuflags-$(CONFIG_M5272) := -mcpu=5272
cpuflags-$(CONFIG_M5275) := -mcpu=5275
cpuflags-$(CONFIG_M5282) := -mcpu=5282
cpuflags-$(CONFIG_M5307) := -mcpu=5307
-cpuflags-$(CONFIG_MCF5301x) := -mcpu=53015 -fPIC
+cpuflags-$(CONFIG_MCF5301X) := -mcpu=53015 -fPIC
cpuflags-$(CONFIG_MCF532x) := -mcpu=5329 -fPIC
cpuflags-$(CONFIG_MCF5441x) := -mcpu=54418 -fPIC
diff --git a/arch/m68k/cpu/mcf532x/cpu.c b/arch/m68k/cpu/mcf532x/cpu.c
index 548cbca36aa..96a9a422f3a 100644
--- a/arch/m68k/cpu/mcf532x/cpu.c
+++ b/arch/m68k/cpu/mcf532x/cpu.c
@@ -46,7 +46,7 @@ int print_cpuinfo(void)
msk = (in_be16(&ccm->cir) >> 6);
ver = (in_be16(&ccm->cir) & 0x003f);
switch (msk) {
-#ifdef CONFIG_MCF5301x
+#ifdef CONFIG_MCF5301X
case 0x78:
id = 53010;
break;
diff --git a/arch/m68k/cpu/mcf532x/cpu_init.c b/arch/m68k/cpu/mcf532x/cpu_init.c
index 844d2cd7600..c12cb310e62 100644
--- a/arch/m68k/cpu/mcf532x/cpu_init.c
+++ b/arch/m68k/cpu/mcf532x/cpu_init.c
@@ -21,7 +21,7 @@
#include <asm/fec.h>
#endif
-#ifdef CONFIG_MCF5301x
+#ifdef CONFIG_MCF5301X
void cpu_init_f(void)
{
scm1_t *scm1 = (scm1_t *) MMAP_SCM1;
@@ -207,7 +207,7 @@ int fecpin_setclear(fec_info_t *info, int setclear)
return 0;
}
#endif /* CONFIG_CMD_NET */
-#endif /* CONFIG_MCF5301x */
+#endif /* CONFIG_MCF5301X */
#ifdef CONFIG_MCF532x
void cpu_init_f(void)
diff --git a/arch/m68k/cpu/mcf532x/speed.c b/arch/m68k/cpu/mcf532x/speed.c
index 32ffac08135..24b2f937aeb 100644
--- a/arch/m68k/cpu/mcf532x/speed.c
+++ b/arch/m68k/cpu/mcf532x/speed.c
@@ -23,7 +23,7 @@ DECLARE_GLOBAL_DATA_PTR;
#define MAX_FSYS 80000 /* KHz */
#define MIN_FSYS 58333 /* KHz */
-#ifdef CONFIG_MCF5301x
+#ifdef CONFIG_MCF5301X
#define FREF 20000 /* KHz */
#define MAX_MFD 63 /* Multiplier */
#define MIN_MFD 0 /* Multiplier */
@@ -58,14 +58,14 @@ int get_sys_clock(void)
/* Test to see if device is in LIMP mode */
if (in_be16(&ccm->misccr) & CCM_MISCCR_LIMP) {
divider = in_be16(&ccm->cdr) & CCM_CDR_LPDIV(0xF);
-#ifdef CONFIG_MCF5301x
+#ifdef CONFIG_MCF5301X
return (FREF / (3 * (1 << divider)));
#endif
#ifdef CONFIG_MCF532x
return (FREF / (2 << divider));
#endif
} else {
-#ifdef CONFIG_MCF5301x
+#ifdef CONFIG_MCF5301X
u32 pfdr = (in_be32(&pll->pcr) & 0x3F) + 1;
u32 refdiv = (1 << ((in_be32(&pll->pcr) & PLL_PCR_REFDIV(7)) >>
8));
u32 busdiv = ((in_be32(&pll->pdr) & 0x00F0) >> 4) + 1;
@@ -151,7 +151,7 @@ int clock_pll(int fsys, int flags)
if (fsys == 0) {
/* Return current PLL output */
-#ifdef CONFIG_MCF5301x
+#ifdef CONFIG_MCF5301X
u32 busdiv = ((in_be32(&pll->pdr) >> 4) & 0x0F) + 1;
mfd = (in_be32(&pll->pcr) & 0x3F) + 1;
@@ -178,7 +178,7 @@ int clock_pll(int fsys, int flags)
* point libraries.
*/
temp = (100 * fsys) / fref;
-#ifdef CONFIG_MCF5301x
+#ifdef CONFIG_MCF5301X
mfd = (BUSDIV * temp) / 100;
/* Determine the output frequency for selected values */
@@ -209,7 +209,7 @@ int clock_pll(int fsys, int flags)
/* Enter LIMP mode */
clock_limp(DEFAULT_LPD);
-#ifdef CONFIG_MCF5301x
+#ifdef CONFIG_MCF5301X
out_be32(&pll->pdr,
PLL_PDR_OUTDIV1((BUSDIV / 3) - 1) |
PLL_PDR_OUTDIV2(BUSDIV - 1) |
diff --git a/arch/m68k/cpu/mcf532x/start.S b/arch/m68k/cpu/mcf532x/start.S
index 72a2f99b7dd..442a91f73ac 100644
--- a/arch/m68k/cpu/mcf532x/start.S
+++ b/arch/m68k/cpu/mcf532x/start.S
@@ -112,7 +112,7 @@ _start:
movec %d0, %ACR0
movec %d0, %ACR1
-#ifdef CONFIG_MCF5301x
+#ifdef CONFIG_MCF5301X
move.l #(0xFC0a0010), %a0
move.w (%a0), %d0
and.l %d0, 0xEFFF
diff --git a/arch/m68k/include/asm/cache.h b/arch/m68k/include/asm/cache.h
index 8ed2b4dbab4..78ff04fe29b 100644
--- a/arch/m68k/include/asm/cache.h
+++ b/arch/m68k/include/asm/cache.h
@@ -15,7 +15,7 @@
#endif
#if defined(CONFIG_MCF530x) || defined(CONFIG_MCF532x) || \
- defined(CONFIG_MCF5301x)
+ defined(CONFIG_MCF5301X)
#define CFG_CF_V3
#endif
diff --git a/arch/m68k/include/asm/immap.h b/arch/m68k/include/asm/immap.h
index 8207c8d5b73..ec270fcf579 100644
--- a/arch/m68k/include/asm/immap.h
+++ b/arch/m68k/include/asm/immap.h
@@ -210,7 +210,7 @@
#endif
#endif /* CONFIG_M5307 */
-#if defined(CONFIG_MCF5301x)
+#if defined(CONFIG_MCF5301X)
#include <asm/immap_5301x.h>
#include <asm/m5301x.h>
diff --git a/arch/m68k/include/asm/immap_5301x.h
b/arch/m68k/include/asm/immap_5301x.h
index e1f7858b100..6bfd5c7a840 100644
--- a/arch/m68k/include/asm/immap_5301x.h
+++ b/arch/m68k/include/asm/immap_5301x.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
- * MCF5301x Internal Memory Map
+ * MCF5301X Internal Memory Map
*
* Copyright (C) 2004-2008 Freescale Semiconductor, Inc.
* TsiChung Liew (tsi-chung.l...@freescale.com)
diff --git a/board/freescale/m53017evb/README b/board/freescale/m53017evb/README
index 34f05f3fdc7..9c14f836cbf 100644
--- a/board/freescale/m53017evb/README
+++ b/board/freescale/m53017evb/README
@@ -58,12 +58,12 @@ Changed files:
- arch/m68k/lib/time.c Timer functions (Dma timer and PIT)
- arch/m68k/lib/traps.c Exception init code
-1 MCF5301x specific Options/Settings
+1 MCF5301X specific Options/Settings
====================================
1.1 pre-loader is no longer suppoer in thie coldfire family
1.2 Configuration settings for M53017EVB Development Board
-CONFIG_MCF5301x -- define for all MCF5301x CPUs
+CONFIG_MCF5301X -- define for all MCF5301X CPUs
CONFIG_M53015 -- define for MCF53015 CPUs
CONFIG_M53017EVB -- define for M53017EVB board
@@ -100,7 +100,7 @@ CFG_SYS_MBAR -- define MBAR offset
CONFIG_MONITOR_IS_IN_RAM -- Not support
-CFG_SYS_INIT_RAM_ADDR -- defines the base address of the MCF5301x internal
SRAM
+CFG_SYS_INIT_RAM_ADDR -- defines the base address of the MCF5301X internal
SRAM
CONFIG_SYS_CSn_BASE -- defines the Chip Select Base register
CONFIG_SYS_CSn_MASK -- defines the Chip Select Mask register
--
2.39.1.456.gfc5497dd1b-goog
