[PATCH v2 34/87] m68k: Rename MCF532x

Simon Glass sjg at chromium.org
Sun Jan 29 01:58:10 CET 2023 

CONFIG options must not use lower-case letter. Convert this to upper case.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

(no changes since v1)

 arch/m68k/Kconfig                     |  6 +++---
 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         | 16 ++++++++--------
 arch/m68k/include/asm/cache.h         |  2 +-
 arch/m68k/include/asm/coldfire/skha.h |  2 +-
 board/freescale/m5373evb/README       |  2 +-
 env/Kconfig                           |  2 +-
 9 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index af5540f14a4..6781ba28c7a 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -38,7 +38,7 @@ config MCF5301X
         select DM_SERIAL
 	bool
 
-config MCF532x
+config MCF532X
 	select OF_CONTROL
 	select DM
         select DM_SERIAL
@@ -99,11 +99,11 @@ config M53015
 
 config M5329
 	bool
-	select MCF532x
+	select MCF532X
 
 config M5373
 	bool
-	select MCF532x
+	select MCF532X
 	select MCF537x
 
 config M54418
diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
index 21e5337d309..cf4562c55f1 100644
--- a/arch/m68k/Makefile
+++ b/arch/m68k/Makefile
@@ -15,7 +15,7 @@ cpuflags-$(CONFIG_M5275)	:= -mcpu=5275
 cpuflags-$(CONFIG_M5282)	:= -mcpu=5282
 cpuflags-$(CONFIG_M5307)	:= -mcpu=5307
 cpuflags-$(CONFIG_MCF5301X)	:= -mcpu=53015 -fPIC
-cpuflags-$(CONFIG_MCF532x)	:= -mcpu=5329 -fPIC
+cpuflags-$(CONFIG_MCF532X)	:= -mcpu=5329 -fPIC
 cpuflags-$(CONFIG_MCF5441x)	:= -mcpu=54418 -fPIC
 
 PLATFORM_CPPFLAGS += $(cpuflags-y)
diff --git a/arch/m68k/cpu/mcf532x/cpu.c b/arch/m68k/cpu/mcf532x/cpu.c
index 96a9a422f3a..108f3cae6df 100644
--- a/arch/m68k/cpu/mcf532x/cpu.c
+++ b/arch/m68k/cpu/mcf532x/cpu.c
@@ -63,7 +63,7 @@ int print_cpuinfo(void)
 		id = 53013;
 		break;
 #endif
-#ifdef CONFIG_MCF532x
+#ifdef CONFIG_MCF532X
 	case 0x54:
 		id = 5329;
 		break;
diff --git a/arch/m68k/cpu/mcf532x/cpu_init.c b/arch/m68k/cpu/mcf532x/cpu_init.c
index c12cb310e62..2ddb5b35e23 100644
--- a/arch/m68k/cpu/mcf532x/cpu_init.c
+++ b/arch/m68k/cpu/mcf532x/cpu_init.c
@@ -209,7 +209,7 @@ int fecpin_setclear(fec_info_t *info, int setclear)
 #endif				/* CONFIG_CMD_NET */
 #endif				/* CONFIG_MCF5301X */
 
-#ifdef CONFIG_MCF532x
+#ifdef CONFIG_MCF532X
 void cpu_init_f(void)
 {
 	scm1_t *scm1 = (scm1_t *) MMAP_SCM1;
@@ -355,4 +355,4 @@ int fecpin_setclear(fec_info_t *info, int setclear)
 	return 0;
 }
 #endif
-#endif				/* CONFIG_MCF532x */
+#endif				/* CONFIG_MCF532X */
diff --git a/arch/m68k/cpu/mcf532x/speed.c b/arch/m68k/cpu/mcf532x/speed.c
index 24b2f937aeb..a326535561d 100644
--- a/arch/m68k/cpu/mcf532x/speed.c
+++ b/arch/m68k/cpu/mcf532x/speed.c
@@ -35,7 +35,7 @@ DECLARE_GLOBAL_DATA_PTR;
 #define DEFAULT_LPD	(0)	/* Divider (not encoded) */
 #endif
 
-#ifdef CONFIG_MCF532x
+#ifdef CONFIG_MCF532X
 #define FREF		16000	/* KHz */
 #define MAX_MFD		135	/* Multiplier */
 #define MIN_MFD		88	/* Multiplier */
@@ -61,7 +61,7 @@ int get_sys_clock(void)
 #ifdef CONFIG_MCF5301X
 		return (FREF / (3 * (1 << divider)));
 #endif
-#ifdef CONFIG_MCF532x
+#ifdef CONFIG_MCF532X
 		return (FREF / (2 << divider));
 #endif
 	} else {
@@ -72,7 +72,7 @@ int get_sys_clock(void)
 
 		return (((FREF * pfdr) / refdiv) / busdiv);
 #endif
-#ifdef CONFIG_MCF532x
+#ifdef CONFIG_MCF532X
 		return (FREF * in_8(&pll->pfdr)) / (BUSDIV * 4);
 #endif
 	}
@@ -139,7 +139,7 @@ int clock_exit_limp(void)
  */
 int clock_pll(int fsys, int flags)
 {
-#ifdef CONFIG_MCF532x
+#ifdef CONFIG_MCF532X
 	u32 *sdram_workaround = (u32 *)(MMAP_SDRAM + 0x80);
 #endif
 	sdram_t *sdram = (sdram_t *)(MMAP_SDRAM);
@@ -157,7 +157,7 @@ int clock_pll(int fsys, int flags)
 
 		return (fref * mfd) / busdiv;
 #endif
-#ifdef CONFIG_MCF532x
+#ifdef CONFIG_MCF532X
 		mfd = in_8(&pll->pfdr);
 
 		return (fref * mfd / (BUSDIV * 4));
@@ -184,7 +184,7 @@ int clock_pll(int fsys, int flags)
 	/* Determine the output frequency for selected values */
 	fout = ((fref * mfd) / BUSDIV);
 #endif
-#ifdef CONFIG_MCF532x
+#ifdef CONFIG_MCF532X
 	mfd = (4 * BUSDIV * temp) / 100;
 
 	/* Determine the output frequency for selected values */
@@ -219,7 +219,7 @@ int clock_pll(int fsys, int flags)
 	clrbits_be32(&pll->pcr, ~PLL_PCR_FBDIV_UNMASK);
 	setbits_be32(&pll->pcr, PLL_PCR_FBDIV(mfd - 1));
 #endif
-#ifdef CONFIG_MCF532x
+#ifdef CONFIG_MCF532X
 	/* Reprogram PLL for desired fsys */
 	out_8(&pll->podr,
 		PLL_PODR_CPUDIV(BUSDIV / 3) | PLL_PODR_BUSDIV(BUSDIV));
@@ -234,7 +234,7 @@ int clock_pll(int fsys, int flags)
 	if (in_be32(&sdram->ctrl) & SDRAMC_SDCR_REF)
 		setbits_be32(&sdram->ctrl, SDRAMC_SDCR_CKE);
 
-#ifdef CONFIG_MCF532x
+#ifdef CONFIG_MCF532X
 	/*
 	 * software workaround for SDRAM opeartion after exiting LIMP
 	 * mode errata
diff --git a/arch/m68k/include/asm/cache.h b/arch/m68k/include/asm/cache.h
index 78ff04fe29b..4acd677c676 100644
--- a/arch/m68k/include/asm/cache.h
+++ b/arch/m68k/include/asm/cache.h
@@ -14,7 +14,7 @@
 #define CFG_CF_V2
 #endif
 
-#if defined(CONFIG_MCF530x) || defined(CONFIG_MCF532x) || \
+#if defined(CONFIG_MCF530x) || defined(CONFIG_MCF532X) || \
     defined(CONFIG_MCF5301X)
 #define CFG_CF_V3
 #endif
diff --git a/arch/m68k/include/asm/coldfire/skha.h b/arch/m68k/include/asm/coldfire/skha.h
index 3b48dc970c9..e0585a5b409 100644
--- a/arch/m68k/include/asm/coldfire/skha.h
+++ b/arch/m68k/include/asm/coldfire/skha.h
@@ -42,7 +42,7 @@ typedef struct skha_ctrl {
 	u32 c12;		/* 0x9C Context 12 - 5235, 5271, 5272 */
 } skha_t;
 
-#ifdef CONFIG_MCF532x
+#ifdef CONFIG_MCF532X
 #define	SKHA_MODE_CTRM(x)	(((x) & 0x0F) << 9)
 #define	SKHA_MODE_CTRM_MASK	(0xFFFFE1FF)
 #define	SKHA_MODE_DKP		(0x00000100)
diff --git a/board/freescale/m5373evb/README b/board/freescale/m5373evb/README
index 7240648796b..80e8e2ddde7 100644
--- a/board/freescale/m5373evb/README
+++ b/board/freescale/m5373evb/README
@@ -62,7 +62,7 @@ Changed files:
 1.1 pre-loader is no longer suppoer in thie coldfire family
 
 1.2 Configuration settings for M5373EVB Development Board
-CONFIG_MCF532x		-- define for all MCF532x CPUs
+CONFIG_MCF532X		-- define for all MCF532X CPUs
 CONFIG_M5373		-- define for all Freescale MCF5373 CPUs
 CONFIG_M5373EVB		-- define for M5373EVB board
 
diff --git a/env/Kconfig b/env/Kconfig
index c409ea71fe5..688f34841fa 100644
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -115,7 +115,7 @@ config ENV_IS_IN_FLASH
 	default y if ARCH_CINTEGRATOR
 	default y if ARCH_INTEGRATOR_CP
 	default y if M548x || M547x || M5282
-	default y if MCF532x || MCF52x2
+	default y if MCF532X || MCF52x2
 	default y if MPC86xx || MPC83xx
 	default y if ARCH_MPC8548
 	default y if SH && !CPU_SH4
-- 
2.39.1.456.gfc5497dd1b-goog

More information about the U-Boot mailing list