Skip to contentSkip to conversation

global: Remove unused CONFIG defines

PATCH In review Tom Rini 8 participants 30 messages Jan 10, 2023 – Jan 20, 2023

Subsystems (46)
lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/19 global: Remove unused CONFIG defines

Remove some CONFIG symbols and related comments, etc, that are unused within the code itself at this point.

---
 arch/arm/cpu/arm1176/start.S                  |  6 +---
 arch/arm/mach-at91/include/mach/at91rm9200.h  |  2 --
 arch/m68k/include/asm/immap.h                 | 16 ----------
 arch/powerpc/cpu/mpc85xx/fdt.c                |  4 +--
 arch/powerpc/include/asm/processor.h          | 31 -------------------
 .../compulab/imx8mm-cl-iot-gate/eeprom_spl.c  |  1 -
 common/spl/spl_fit.c                          | 12 ++-----
 doc/README.socfpga                            | 10 ------
 drivers/i2c/soft_i2c.c                        |  7 -----
 drivers/mtd/ubi/build.c                       |  6 ----
 drivers/net/eepro100.c                        |  2 --
 drivers/net/mvpp2.c                           |  2 --
 drivers/video/vidconsole-uclass.c             |  5 ---
 drivers/video/videomodes.c                    |  3 +-
 drivers/video/videomodes.h                    |  4 ---
 include/fsl_ddr.h                             |  5 ++-
 include/fsl_usb.h                             |  3 --
 17 files changed, 7 insertions(+), 112 deletions(-)
arch/arm/cpu/arm1176/start.S +1 -5
index 9e76a4a9e0e1..78a9cc173a39 100644
@@ -17,10 +17,6 @@
 #include <config.h>
 #include <linux/linkage.h>
 
-#ifndef CONFIG_SYS_PHY_UBOOT_BASE
-#define CONFIG_SYS_PHY_UBOOT_BASE	CFG_SYS_UBOOT_BASE
-#endif
-
 /*
  *************************************************************************
  *
@@ -88,7 +84,7 @@ cpu_init_crit:
 
 	/* Prepare to disable the MMU */
 	adr	r2, mmu_disable_phys
-	sub	r2, r2, #(CONFIG_SYS_PHY_UBOOT_BASE - CONFIG_TEXT_BASE)
+	sub	r2, r2, #(CFG_SYS_UBOOT_BASE - CONFIG_TEXT_BASE)
 	b	mmu_disable
 
 	.align 5
arch/arm/mach-at91/include/mach/at91rm9200.h +0 -2
index 309039347c84..24f3b4e9bacd 100644
@@ -126,6 +126,4 @@
 #define ATMEL_PIO_PORTS		4	/* theese SoCs have 4 PIO */
 #define ATMEL_PMC_UHP		AT91RM9200_PMC_UHP
 
-#define CONFIG_SYS_ATMEL_CPU_NAME	"AT91RM9200"
-
 #endif
arch/m68k/include/asm/immap.h +0 -16
index dab8b26a7037..0c23744a867e 100644
@@ -13,7 +13,6 @@
 #include <asm/immap_520x.h>
 #include <asm/m520x.h>
 
-#define CONFIG_SYS_FEC0_IOBASE		(MMAP_FEC0)
 #define CONFIG_SYS_UART_BASE		(MMAP_UART0 + (CFG_SYS_UART_PORT * 0x4000))
 
 /* Timer */
@@ -36,7 +35,6 @@
 #include <asm/immap_5235.h>
 #include <asm/m5235.h>
 
-#define CONFIG_SYS_FEC0_IOBASE		(MMAP_FEC)
 #define CONFIG_SYS_UART_BASE		(MMAP_UART0 + (CFG_SYS_UART_PORT * 0x40))
 
 /* Timer */
@@ -104,7 +102,6 @@
 #include <asm/immap_5271.h>
 #include <asm/m5271.h>
 
-#define CONFIG_SYS_FEC0_IOBASE		(MMAP_FEC)
 #define CONFIG_SYS_UART_BASE		(MMAP_UART0 + (CFG_SYS_UART_PORT * 0x40))
 
 /* Timer */
@@ -127,7 +124,6 @@
 #include <asm/immap_5272.h>
 #include <asm/m5272.h>
 
-#define CONFIG_SYS_FEC0_IOBASE		(MMAP_FEC)
 #define CONFIG_SYS_UART_BASE		(MMAP_UART0 + (CFG_SYS_UART_PORT * 0x40))
 
 #define CONFIG_SYS_INTR_BASE		(MMAP_INTC)
@@ -150,8 +146,6 @@
 #include <asm/immap_5275.h>
 #include <asm/m5275.h>
 
-#define CONFIG_SYS_FEC0_IOBASE		(MMAP_FEC0)
-#define CONFIG_SYS_FEC1_IOBASE		(MMAP_FEC1)
 #define CONFIG_SYS_UART_BASE		(MMAP_UART0 + (CFG_SYS_UART_PORT * 0x40))
 
 #define CONFIG_SYS_INTR_BASE		(MMAP_INTC0)
@@ -174,7 +168,6 @@
 #include <asm/immap_5282.h>
 #include <asm/m5282.h>
 
-#define CONFIG_SYS_FEC0_IOBASE		(MMAP_FEC)
 #define CONFIG_SYS_UART_BASE		(MMAP_UART0 + (CFG_SYS_UART_PORT * 0x40))
 
 #define CONFIG_SYS_INTR_BASE		(MMAP_INTC0)
@@ -221,8 +214,6 @@
 #include <asm/immap_5301x.h>
 #include <asm/m5301x.h>
 
-#define CONFIG_SYS_FEC0_IOBASE		(MMAP_FEC0)
-#define CONFIG_SYS_FEC1_IOBASE		(MMAP_FEC1)
 #define CONFIG_SYS_UART_BASE		(MMAP_UART0 + (CFG_SYS_UART_PORT * 0x4000))
 
 /* Timer */
@@ -245,7 +236,6 @@
 #include <asm/immap_5329.h>
 #include <asm/m5329.h>
 
-#define CONFIG_SYS_FEC0_IOBASE		(MMAP_FEC)
 #define CONFIG_SYS_UART_BASE		(MMAP_UART0 + (CFG_SYS_UART_PORT * 0x4000))
 
 /* Timer */
@@ -268,9 +258,6 @@
 #include <asm/immap_5441x.h>
 #include <asm/m5441x.h>
 
-#define CONFIG_SYS_FEC0_IOBASE		(MMAP_FEC0)
-#define CONFIG_SYS_FEC1_IOBASE		(MMAP_FEC1)
-
 #if (CFG_SYS_UART_PORT < 4)
 #define CONFIG_SYS_UART_BASE		(MMAP_UART0 + \
 					(CFG_SYS_UART_PORT * 0x4000))
@@ -303,9 +290,6 @@
 #include <asm/m547x_8x.h>
 
 #ifdef CONFIG_FSLDMAFEC
-#define CONFIG_SYS_FEC0_IOBASE		(MMAP_FEC0)
-#define CONFIG_SYS_FEC1_IOBASE		(MMAP_FEC1)
-
 #define FEC0_RX_TASK		0
 #define FEC0_TX_TASK		1
 #define FEC0_RX_PRIORITY	6
arch/powerpc/cpu/mpc85xx/fdt.c +1 -3
index a7e1df104d73..35142508c30e 100644
@@ -92,7 +92,6 @@ void ft_fixup_cpu(void *blob, u64 memory_limit)
 	}
 
 #if defined(T1040_TDM_QUIRK_CCSR_BASE)
-#define	CONFIG_MEM_HOLE_16M	0x1000000
 	/*
 	 * Extract hwconfig from environment.
 	 * Search for tdm entry in hwconfig.
@@ -103,8 +102,7 @@ void ft_fixup_cpu(void *blob, u64 memory_limit)
 
 	/* Reserve the memory hole created by TDM LAW, so OSes dont use it */
 	if (tdm_hwconfig_enabled) {
-		off = fdt_add_mem_rsv(blob, T1040_TDM_QUIRK_CCSR_BASE,
-				      CONFIG_MEM_HOLE_16M);
+		off = fdt_add_mem_rsv(blob, T1040_TDM_QUIRK_CCSR_BASE, SZ_16);
 		if (off < 0)
 			printf("Failed  to reserve memory for tdm: %s\n",
 			       fdt_strerror(off));
arch/powerpc/include/asm/processor.h +0 -31
index 19e63ebf38c5..f7e1a807746a 100644
@@ -979,37 +979,6 @@
 #define PVR_5200	0x80822011
 #define PVR_5200B	0x80822014
 
-/*
- * 405EX/EXr CHIP_21 Errata
- */
-#ifdef CONFIG_SYS_4xx_CHIP_21_405EX_SECURITY
-#define CONFIG_SYS_4xx_CHIP_21_ERRATA
-#define CONFIG_405EX_CHIP21_PVR_REV_C	PVR_405EX1_RC
-#define CONFIG_405EX_CHIP21_PVR_REV_D	PVR_405EX1_RD
-#define CONFIG_405EX_CHIP21_ECID3_REV_D	0x0
-#endif
-
-#ifdef CONFIG_SYS_4xx_CHIP_21_405EX_NO_SECURITY
-#define CONFIG_SYS_4xx_CHIP_21_ERRATA
-#define CONFIG_405EX_CHIP21_PVR_REV_C	PVR_405EX2_RC
-#define CONFIG_405EX_CHIP21_PVR_REV_D	PVR_405EX2_RD
-#define CONFIG_405EX_CHIP21_ECID3_REV_D	0x1
-#endif
-
-#ifdef CONFIG_SYS_4xx_CHIP_21_405EXr_SECURITY
-#define CONFIG_SYS_4xx_CHIP_21_ERRATA
-#define CONFIG_405EX_CHIP21_PVR_REV_C	PVR_405EXR1_RC
-#define CONFIG_405EX_CHIP21_PVR_REV_D	PVR_405EXR1_RD
-#define CONFIG_405EX_CHIP21_ECID3_REV_D	0x2
-#endif
-
-#ifdef CONFIG_SYS_4xx_CHIP_21_405EXr_NO_SECURITY
-#define CONFIG_SYS_4xx_CHIP_21_ERRATA
-#define CONFIG_405EX_CHIP21_PVR_REV_C	PVR_405EXR2_RC
-#define CONFIG_405EX_CHIP21_PVR_REV_D	PVR_405EXR2_RD
-#define CONFIG_405EX_CHIP21_ECID3_REV_D	0x3
-#endif
-
 /*
  * System Version Register
  */
board/compulab/imx8mm-cl-iot-gate/eeprom_spl.c +0 -1
index ee6d2bb0016a..4dbd847d42a1 100644
@@ -13,7 +13,6 @@
 #ifdef CONFIG_SPL_BUILD
 
 #define CONFIG_SYS_I2C_EEPROM_ADDR_P1	0x51
-#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN	1
 
 static iomux_v3_cfg_t const eeprom_pads[] = {
 	IMX8MQ_PAD_GPIO1_IO13__GPIO1_IO13 | MUX_PAD_CTRL(NO_PAD_CTRL),
common/spl/spl_fit.c +2 -10
index 08da7fed88ea..c51482b3b659 100644
@@ -20,14 +20,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#ifndef CONFIG_SPL_LOAD_FIT_APPLY_OVERLAY_BUF_SZ
-#define CONFIG_SPL_LOAD_FIT_APPLY_OVERLAY_BUF_SZ (64 * 1024)
-#endif
-
-#ifndef CONFIG_SYS_BOOTM_LEN
-#define CONFIG_SYS_BOOTM_LEN	(64 << 20)
-#endif
-
 struct spl_fit_info {
 	const void *fit;	/* Pointer to a valid FIT blob */
 	size_t ext_data_offset;	/* Offset to FIT external data (end of FIT) */
@@ -408,7 +400,7 @@ static int spl_fit_append_fdt(struct spl_image_info *spl_image,
 	if (CONFIG_IS_ENABLED(FIT_IMAGE_TINY))
 		return 0;
 
-	if (CONFIG_IS_ENABLED(LOAD_FIT_APPLY_OVERLAY)) {
+#if CONFIG_IS_ENABLED(LOAD_FIT_APPLY_OVERLAY)
 		void *tmpbuffer = NULL;
 
 		for (; ; index++) {
@@ -462,7 +454,7 @@ static int spl_fit_append_fdt(struct spl_image_info *spl_image,
 		free(tmpbuffer);
 		if (ret)
 			return ret;
-	}
+#endif
 	/* Try to make space, so we can inject details on the loadables */
 	ret = fdt_shrink_to_minimum(spl_image->fdt_addr, 8192);
 	if (ret < 0)
doc/README.socfpga +0 -10
index 4d73398eb97f..e5adb62102bf 100644
@@ -6,16 +6,6 @@ This README is about U-Boot and SPL support for Altera's ARM Cortex-A9MPCore
 based SOCFPGA. To know more about the hardware itself, please refer to
 www.altera.com.
 
-
-socfpga_dw_mmc
---------------
-
-Here are macro and detailed configuration required to enable DesignWare SDMMC
-controller support within SOCFPGA
-
-#define CONFIG_SYS_MMC_MAX_BLK_COUNT	256
--> Using smaller max blk cnt to avoid flooding the limited stack in OCRAM
-
 ---------------------------------------------------------------------
 Cyclone 5 / Arria 5 generating the handoff header files for U-Boot SPL
 ---------------------------------------------------------------------
drivers/i2c/soft_i2c.c +0 -7
index c72839eb0111..ed8ba47de450 100644
@@ -88,13 +88,6 @@ DECLARE_GLOBAL_DATA_PTR;
 #  define I2C_SOFT_DECLARATIONS
 #endif
 
-#if !defined(CONFIG_SYS_I2C_SOFT_SPEED)
-#define CONFIG_SYS_I2C_SOFT_SPEED CONFIG_SYS_I2C_SPEED
-#endif
-#if !defined(CONFIG_SYS_I2C_SOFT_SLAVE)
-#define CONFIG_SYS_I2C_SOFT_SLAVE CONFIG_SYS_I2C_SLAVE
-#endif
-
 /*-----------------------------------------------------------------------
  * Definitions
  */
drivers/mtd/ubi/build.c +0 -6
index e2bd32697eaa..3ac0b1940283 100644
@@ -86,13 +86,7 @@ static bool fm_debug;
 #endif
 #else
 #ifdef CONFIG_MTD_UBI_FASTMAP
-#if !defined(CONFIG_MTD_UBI_FASTMAP_AUTOCONVERT)
-#define CONFIG_MTD_UBI_FASTMAP_AUTOCONVERT 0
-#endif
 static bool fm_autoconvert = CONFIG_MTD_UBI_FASTMAP_AUTOCONVERT;
-#if !defined(CONFIG_MTD_UBI_FM_DEBUG)
-#define CONFIG_MTD_UBI_FM_DEBUG 0
-#endif
 static bool fm_debug = CONFIG_MTD_UBI_FM_DEBUG;
 #endif
 #endif
drivers/net/eepro100.c +0 -2
index a0424505bde8..0a1fe5609106 100644
@@ -168,9 +168,7 @@ struct descriptor {		/* A generic descriptor. */
 	unsigned char params[0];
 };
 
-#define CONFIG_SYS_CMD_EL		0x8000
 #define CONFIG_SYS_CMD_SUSPEND		0x4000
-#define CONFIG_SYS_CMD_INT		0x2000
 #define CONFIG_SYS_CMD_IAS		0x0001	/* individual address setup */
 #define CONFIG_SYS_CMD_CONFIGURE	0x0002	/* configure */
 
drivers/net/mvpp2.c +0 -2
index 8c9afdf79aba..7e1922e1c485 100644
@@ -66,8 +66,6 @@ do {									\
 
 #define NET_SKB_PAD	max(32, MVPP2_CPU_D_CACHE_LINE_SIZE)
 
-#define CONFIG_NR_CPUS		1
-
 /* 2(HW hdr) 14(MAC hdr) 4(CRC) 32(extra for cache prefetch) */
 #define WRAP			(2 + ETH_HLEN + 4 + 32)
 #define MTU			1500
drivers/video/vidconsole-uclass.c +0 -5
index 6bdfb6e37dd5..d3373c976c94 100644
@@ -19,11 +19,6 @@
 #include <video_font.h>		/* Bitmap font for code page 437 */
 #include <linux/ctype.h>
 
-/* By default we scroll by a single line */
-#ifndef CONFIG_CONSOLE_SCROLL_LINES
-#define CONFIG_CONSOLE_SCROLL_LINES 1
-#endif
-
 int vidconsole_putc_xy(struct udevice *dev, uint x, uint y, char ch)
 {
 	struct vidconsole_ops *ops = vidconsole_get_ops(dev);
drivers/video/videomodes.c +1 -2
index 69ef736d4c15..35955a5df7dd 100644
@@ -7,8 +7,7 @@
 
 /************************************************************************
   Get Parameters for the video mode:
-  The default video mode can be defined in CONFIG_SYS_DEFAULT_VIDEO_MODE.
-  If undefined, default video mode is set to 0x301
+  The default video mode is set to 0x301
   Parameters can be set via the variable "videomode" in the environment.
   2 diferent ways are possible:
   "videomode=301"   - 301 is a hexadecimal number describing the VESA
drivers/video/videomodes.h +0 -4
index aefe4ef94ab1..405f4e1fc2c6 100644
@@ -6,10 +6,6 @@
 
 #include <edid.h>
 
-#ifndef CONFIG_SYS_DEFAULT_VIDEO_MODE
-#define CONFIG_SYS_DEFAULT_VIDEO_MODE	0x301
-#endif
-
 /* Some mode definitions */
 #define FB_SYNC_HOR_HIGH_ACT	1	/* horizontal sync high active	*/
 #define FB_SYNC_VERT_HIGH_ACT	2	/* vertical sync high active	*/
include/fsl_ddr.h +2 -3
index 24229f6bc448..f336c6a23dd4 100644
@@ -50,13 +50,12 @@ compute_dimm_parameters(const unsigned int ctrl_num,
  *
  * All data structures have to be on the stack
  */
-#define CONFIG_SYS_DIMM_SLOTS_PER_CTLR CONFIG_DIMM_SLOTS_PER_CTLR
 
 typedef struct {
 	generic_spd_eeprom_t
-	   spd_installed_dimms[CONFIG_SYS_NUM_DDR_CTLRS][CONFIG_SYS_DIMM_SLOTS_PER_CTLR];
+	   spd_installed_dimms[CONFIG_SYS_NUM_DDR_CTLRS][CONFIG_DIMM_SLOTS_PER_CTLR];
 	struct dimm_params_s
-	   dimm_params[CONFIG_SYS_NUM_DDR_CTLRS][CONFIG_SYS_DIMM_SLOTS_PER_CTLR];
+	   dimm_params[CONFIG_SYS_NUM_DDR_CTLRS][CONFIG_DIMM_SLOTS_PER_CTLR];
 	memctl_options_t memctl_opts[CONFIG_SYS_NUM_DDR_CTLRS];
 	common_timing_params_t common_timing_params[CONFIG_SYS_NUM_DDR_CTLRS];
 	fsl_ddr_cfg_regs_t fsl_ddr_config_reg[CONFIG_SYS_NUM_DDR_CTLRS];
include/fsl_usb.h +0 -3
index c0f076b06daf..a37a6e51b6f1 100644
@@ -43,10 +43,8 @@ struct ccsr_usb_phy {
 #define CONFIG_SYS_FSL_USB_CTRL_PHY_EN (1 << 0)
 #define CONFIG_SYS_FSL_USB_DRVVBUS_CR_EN (1 << 1)
 #define CONFIG_SYS_FSL_USB_PWRFLT_CR_EN (1 << 1)
-#define CONFIG_SYS_FSL_USB_PLLPRG1_PHY_DIV (1 << 0)
 #define CONFIG_SYS_FSL_USB_PLLPRG2_PHY2_CLK_EN (1 << 0)
 #define CONFIG_SYS_FSL_USB_PLLPRG2_PHY1_CLK_EN (1 << 1)
-#define CONFIG_SYS_FSL_USB_PLLPRG2_FRAC_LPF_EN (1 << 13)
 #ifdef CONFIG_SYS_FSL_SINGLE_SOURCE_CLK
 #define CONFIG_SYS_FSL_USB_PLLPRG2_REF_DIV_INTERNAL_CLK (5 << 4)
 #define CONFIG_SYS_FSL_USB_PLLPRG2_MFI_INTERNAL_CLK (6 << 16)
@@ -55,7 +53,6 @@ struct ccsr_usb_phy {
 #define CONFIG_SYS_FSL_USB_PLLPRG2_REF_DIV (1 << 4)
 #define CONFIG_SYS_FSL_USB_PLLPRG2_MFI (5 << 16)
 #define CONFIG_SYS_FSL_USB_PLLPRG2_PLL_EN (1 << 21)
-#define CONFIG_SYS_FSL_USB_SYS_CLK_VALID (1 << 0)
 #define CONFIG_SYS_FSL_USB_XCVRPRG_HS_DCNT_PROG_EN (1 << 7)
 #define CONFIG_SYS_FSL_USB_XCVRPRG_HS_DCNT_PROG_MASK (3 << 4)
 
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH 2/19 arc: Migrate ARC_MMU_VER to Kconfig

Move this value to Kconfig.

---
 arch/arc/Kconfig             |  7 +++++++
 arch/arc/include/asm/cache.h | 10 ----------
 2 files changed, 7 insertions(+), 10 deletions(-)
arch/arc/Kconfig +7 -0
index 1a7c525cdb96..6ae66bb163c0 100644
@@ -102,6 +102,13 @@ config ARC_MMU_V4
 
 endchoice
 
+config ARC_MMU_VER
+	int
+	default 0 if ARC_MMU_ABSENT
+	default 2 if ARC_MMU_V2
+	default 3 if ARC_MMU_V3
+	default 4 if ARC_MMU_V4
+
 config CPU_BIG_ENDIAN
 	bool "Enable Big Endian Mode"
 	help
arch/arc/include/asm/cache.h +0 -10
index a48e1aec6889..74cff716ef60 100644
@@ -16,16 +16,6 @@
  */
 #define ARCH_DMA_MINALIGN	128
 
-#if defined(ARC_MMU_ABSENT)
-#define CONFIG_ARC_MMU_VER 0
-#elif defined(CONFIG_ARC_MMU_V2)
-#define CONFIG_ARC_MMU_VER 2
-#elif defined(CONFIG_ARC_MMU_V3)
-#define CONFIG_ARC_MMU_VER 3
-#elif defined(CONFIG_ARC_MMU_V4)
-#define CONFIG_ARC_MMU_VER 4
-#endif
-
 #ifndef __ASSEMBLY__
 
 void cache_init(void);
Signature · 1 line
2.25.1
author
#2 lore raw

PATCH 3/19 i2c: fsl_i2c: Rework usage of CONFIG_SYS_IMMR

In reply to Tom Rini

This driver is used on both m68k, where CONFIG_SYS_IMMR is not used, and PowerPC an ARM where it is. Abstract this to a new value rather than re-defining a CONFIG symbol on m68k.

---
 drivers/i2c/fsl_i2c.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/i2c/fsl_i2c.c +7 -5
index 187db92b75f6..147a4b91f0c5 100644
@@ -41,20 +41,22 @@
 DECLARE_GLOBAL_DATA_PTR;
 
 #ifdef CONFIG_M68K
-#define CONFIG_SYS_IMMR		CFG_SYS_MBAR
+#define CFG_FSL_I2C_BASE_ADDR	CFG_SYS_MBAR
+#else
+#define CFG_FSL_I2C_BASE_ADDR	CONFIG_SYS_IMMR
 #endif
 
 #if !CONFIG_IS_ENABLED(DM_I2C)
 static const struct fsl_i2c_base *i2c_base[4] = {
-	(struct fsl_i2c_base *)(CONFIG_SYS_IMMR + CONFIG_SYS_FSL_I2C_OFFSET),
+	(struct fsl_i2c_base *)(CFG_FSL_I2C_BASE_ADDR + CONFIG_SYS_FSL_I2C_OFFSET),
 #ifdef CONFIG_SYS_FSL_I2C2_OFFSET
-	(struct fsl_i2c_base *)(CONFIG_SYS_IMMR + CONFIG_SYS_FSL_I2C2_OFFSET),
+	(struct fsl_i2c_base *)(CFG_FSL_I2C_BASE_ADDR + CONFIG_SYS_FSL_I2C2_OFFSET),
 #endif
 #ifdef CONFIG_SYS_FSL_I2C3_OFFSET
-	(struct fsl_i2c_base *)(CONFIG_SYS_IMMR + CONFIG_SYS_FSL_I2C3_OFFSET),
+	(struct fsl_i2c_base *)(CFG_FSL_I2C_BASE_ADDR + CONFIG_SYS_FSL_I2C3_OFFSET),
 #endif
 #ifdef CONFIG_SYS_FSL_I2C4_OFFSET
-	(struct fsl_i2c_base *)(CONFIG_SYS_IMMR + CONFIG_SYS_FSL_I2C4_OFFSET)
+	(struct fsl_i2c_base *)(CFG_FSL_I2C_BASE_ADDR + CONFIG_SYS_FSL_I2C4_OFFSET)
 #endif
 };
 #endif
Signature · 1 line
2.25.1
author
#3 lore raw

PATCH 4/19 arm: Rework usage of CONFIG_ARMV[78]_SECURE_BASE in linker scripts

In reply to Tom Rini

In order to avoid defining CONFIG_ARMV[78_]SECURE_BASE as empty in the linker scripts, if not already defined, add and use __ARMV[78_]SECURE_BASE for when the base is not defined and we want the linker scripts to continue.

---
 arch/arm/cpu/armv8/u-boot.lds | 6 ++++--
 arch/arm/cpu/u-boot.lds       | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)
arch/arm/cpu/armv8/u-boot.lds +4 -2
index 8fe4682dd2ae..fb6a30c922f7 100644
@@ -51,10 +51,12 @@ SECTIONS
 	}
 
 #ifndef CONFIG_ARMV8_SECURE_BASE
-#define CONFIG_ARMV8_SECURE_BASE
+#define __ARMV8_SECURE_BASE
 #define __ARMV8_PSCI_STACK_IN_RAM
+#else
+#define __ARMV8_SECURE_BASE	CONFIG_ARMV8_SECURE_BASE
 #endif
-	.secure_text CONFIG_ARMV8_SECURE_BASE :
+	.secure_text __ARMV8_SECURE_BASE :
 		AT(ADDR(.__secure_start) + SIZEOF(.__secure_start))
 	{
 		*(._secure.text)
arch/arm/cpu/u-boot.lds +4 -2
index f25f72b2e0d8..fc4f63d83489 100644
@@ -77,11 +77,13 @@ SECTIONS
 	}
 
 #ifndef CONFIG_ARMV7_SECURE_BASE
-#define CONFIG_ARMV7_SECURE_BASE
+#define __ARMV7_SECURE_BASE
 #define __ARMV7_PSCI_STACK_IN_RAM
+#else
+#define __ARMV7_SECURE_BASE	CONFIG_ARMV7_SECURE_BASE
 #endif
 
-	.secure_text CONFIG_ARMV7_SECURE_BASE :
+	.secure_text __ARMV7_SECURE_BASE :
 		AT(ADDR(.__secure_start) + SIZEOF(.__secure_start))
 	{
 		*(._secure.text)
Signature · 1 line
2.25.1
author
#4 lore raw

PATCH 5/19 dm: ns16550: Change how we get UART_REG to be defined

In reply to Tom Rini

In the case of DM_SERIAL and not having CONFIG_SYS_NS16550_REG_SIZE defined, we would set CONFIG_SYS_NS16550_REG_SIZE to -1 with a comment that this isn't really needed. This implies that the reason we set something here is so that we have UART_REG defined and so can use the rest of the structures that are shared between all the users of ns16650.h. In order to not #define a CONFIG variable here, instead move that check over to the CONFIG_NS16550_DYNAMIC case (which is at the conceptual level, similar to DM) to get UART_REG defined.

---
I'm making an assumption, in the end, as to what the DM case is doing. This does work in my lab.

---
 include/ns16550.h | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)
include/ns16550.h +2 -9
index 243226fc3d94..2110f00dbf28 100644
@@ -26,15 +26,8 @@
 
 #include <linux/types.h>
 
-#if CONFIG_IS_ENABLED(DM_SERIAL) && !defined(CONFIG_SYS_NS16550_REG_SIZE)
-/*
- * For driver model we always use one byte per register, and sort out the
- * differences in the driver
- */
-#define CONFIG_SYS_NS16550_REG_SIZE (-1)
-#endif
-
-#if defined(CONFIG_NS16550_DYNAMIC) || defined(CONFIG_DEBUG_UART)
+#if (CONFIG_IS_ENABLED(DM_SERIAL) && !defined(CONFIG_SYS_NS16550_REG_SIZE)) || \
+	defined(CONFIG_NS16550_DYNAMIC) || defined(CONFIG_DEBUG_UART)
 #define UART_REG(x)	unsigned char x
 #else
 #if !defined(CONFIG_SYS_NS16550_REG_SIZE) || (CONFIG_SYS_NS16550_REG_SIZE == 0)
Signature · 1 line
2.25.1
Reviewed-by on v1 5/19
#5 lore raw

Re: [PATCH 05/19] dm: ns16550: Change how we get UART_REG to be defined

Quoted 10 lines · Tom Rini

In the case of DM_SERIAL and not having CONFIG_SYS_NS16550_REG_SIZE defined, we would set CONFIG_SYS_NS16550_REG_SIZE to -1 with a comment that this isn't really needed. This implies that the reason we set something here is so that we have UART_REG defined and so can use the rest of the structures that are shared between all the users of ns16650.h. In order to not #define a CONFIG variable here, instead move that check over to the CONFIG_NS16550_DYNAMIC case (which is at the conceptual level, similar to DM) to get UART_REG defined.

Quoted 8 lines

---
I'm making an assumption, in the end, as to what the DM case is doing. This does work in my lab.

---
 include/ns16550.h | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)'

Seems OK, although this patch brings back nightmares from last time I was in there.

- Simon

author
#6 lore raw

PATCH v2 5/19 dm: ns16550: Restore how we define UART_REG

In reply to Tom Rini

Prior to commit 9591b63531fa ("Convert CONFIG_SYS_NS16550_MEM32 et al to Kconfig") we had defined CONFIG_SYS_NS16550_REG_SIZE to -1 with DM_SERIAL such that we would then have a size 0 character array. This resulted in functionally no padding. The confusion on my part came from dealing with the constraints around platforms that do not use DM_SERIAL in SPL/TPL. After Andre Przywara reported that sunxi was broken, I've re-read the code and comments again and thought on this harder. What we want I believe is what this patch does now.

If DM_SERIAL is defined for this stage, regardless of CONFIG_SYS_NS16550_REG_SIZE then we will dynamically handle reg shifts and 'struct ns16550' needs no padding (which is functionally what unsigned char foo[0] provides). This is the same case as NS16550_DYNAMIC and DEBUG_UART. Expand the existing comment here slightly.

Otherwise, we will have CONFIG_SYS_NS16550_REG_SIZE set to a non-zero value, and handle padding within the struct.

Cc Simon Glass <[email protected]>
Cc Sergei Antonov <[email protected]>
Cc Quentin Schulz <[email protected]>
Cc Andre Przywara <[email protected]>
Fixes 9591b63531fa ("Convert CONFIG_SYS_NS16550_MEM32 et al to Kconfig")
---
 include/ns16550.h | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
include/ns16550.h +4 -6
index 243226fc3d94..e7e68663d030 100644
@@ -26,15 +26,13 @@
 
 #include <linux/types.h>
 
-#if CONFIG_IS_ENABLED(DM_SERIAL) && !defined(CONFIG_SYS_NS16550_REG_SIZE)
+#if CONFIG_IS_ENABLED(DM_SERIAL) ||  defined(CONFIG_NS16550_DYNAMIC) || \
+	defined(CONFIG_DEBUG_UART)
 /*
  * For driver model we always use one byte per register, and sort out the
- * differences in the driver
+ * differences in the driver. In the case of CONFIG_NS16550_DYNAMIC we do
+ * similar, and CONFIG_DEBUG_UART is responsible for shifts in its own manner.
  */
-#define CONFIG_SYS_NS16550_REG_SIZE (-1)
-#endif
-
-#if defined(CONFIG_NS16550_DYNAMIC) || defined(CONFIG_DEBUG_UART)
 #define UART_REG(x)	unsigned char x
 #else
 #if !defined(CONFIG_SYS_NS16550_REG_SIZE) || (CONFIG_SYS_NS16550_REG_SIZE == 0)
Signature · 1 line
2.25.1
Reviewed-by Tested-by on v2 5/19
#7 lore raw

Re: [PATCHv2 05/19] dm: ns16550: Restore how we define UART_REG

Quoted 18 lines · On Tue, 17 Jan 2023 17:10:50 -0500 Tom Rini <[email protected]> wrote:

Prior to commit 9591b63531fa ("Convert CONFIG_SYS_NS16550_MEM32 et al to Kconfig") we had defined CONFIG_SYS_NS16550_REG_SIZE to -1 with DM_SERIAL such that we would then have a size 0 character array. This resulted in functionally no padding. The confusion on my part came from dealing with the constraints around platforms that do not use DM_SERIAL in SPL/TPL. After Andre Przywara reported that sunxi was broken, I've re-read the code and comments again and thought on this harder. What we want I believe is what this patch does now.

If DM_SERIAL is defined for this stage, regardless of CONFIG_SYS_NS16550_REG_SIZE then we will dynamically handle reg shifts and 'struct ns16550' needs no padding (which is functionally what unsigned char foo[0] provides). This is the same case as NS16550_DYNAMIC and DEBUG_UART. Expand the existing comment here slightly.

Otherwise, we will have CONFIG_SYS_NS16550_REG_SIZE set to a non-zero value, and handle padding within the struct.

Quoted 6 lines
Cc Simon Glass <[email protected]>
Cc Sergei Antonov <[email protected]>
Cc Quentin Schulz <[email protected]>
Cc Andre Przywara <[email protected]>
Fixes 9591b63531fa ("Convert CONFIG_SYS_NS16550_MEM32 et al to Kconfig")

Thanks, that indeed fixes the issue for me, booted on LicheePi Nano and Pine64-LTS:

Cheers,
Andre

Quoted 28 lines
---
 include/ns16550.h | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
include/ns16550.h +4 -6
index 243226fc3d94..e7e68663d030 100644
@@ -26,15 +26,13 @@
 
 #include <linux/types.h>
 
-#if CONFIG_IS_ENABLED(DM_SERIAL) && !defined(CONFIG_SYS_NS16550_REG_SIZE)
+#if CONFIG_IS_ENABLED(DM_SERIAL) ||  defined(CONFIG_NS16550_DYNAMIC) || \
+	defined(CONFIG_DEBUG_UART)
 /*
  * For driver model we always use one byte per register, and sort out the
- * differences in the driver
+ * differences in the driver. In the case of CONFIG_NS16550_DYNAMIC we do
+ * similar, and CONFIG_DEBUG_UART is responsible for shifts in its own manner.
  */
-#define CONFIG_SYS_NS16550_REG_SIZE (-1)
-#endif
-
-#if defined(CONFIG_NS16550_DYNAMIC) || defined(CONFIG_DEBUG_UART)
 #define UART_REG(x)	unsigned char x
 #else
 #if !defined(CONFIG_SYS_NS16550_REG_SIZE) || (CONFIG_SYS_NS16550_REG_SIZE == 0)
Tested-by on v2 5/19
#8 lore raw

Re: [PATCHv2 05/19] dm: ns16550: Restore how we define UART_REG

In reply to Tom Rini

Hi Tom,

Quoted 18 lines · Tom Rini

Prior to commit 9591b63531fa ("Convert CONFIG_SYS_NS16550_MEM32 et al to Kconfig") we had defined CONFIG_SYS_NS16550_REG_SIZE to -1 with DM_SERIAL such that we would then have a size 0 character array. This resulted in functionally no padding. The confusion on my part came from dealing with the constraints around platforms that do not use DM_SERIAL in SPL/TPL. After Andre Przywara reported that sunxi was broken, I've re-read the code and comments again and thought on this harder. What we want I believe is what this patch does now.

If DM_SERIAL is defined for this stage, regardless of CONFIG_SYS_NS16550_REG_SIZE then we will dynamically handle reg shifts and 'struct ns16550' needs no padding (which is functionally what unsigned char foo[0] provides). This is the same case as NS16550_DYNAMIC and DEBUG_UART. Expand the existing comment here slightly.

Otherwise, we will have CONFIG_SYS_NS16550_REG_SIZE set to a non-zero value, and handle padding within the struct.

Quoted 6 lines
Cc Simon Glass <[email protected]>
Cc Sergei Antonov <[email protected]>
Cc Quentin Schulz <[email protected]>
Cc Andre Przywara <[email protected]>
Fixes 9591b63531fa ("Convert CONFIG_SYS_NS16550_MEM32 et al to Kconfig")

Thanks,
Quentin

author
#9 lore raw

PATCH 6/19 arm: lib1funcs.S: Update compatibility with Linux comment slightly

In reply to Tom Rini

At this point, the Linux code for "lib1funcs" has changed rather dramatically. While a resync would be beneficial, it's outside the scope of what we need here. Simply remove the define for CONFIG_AEABI and tests for it.

---
 arch/arm/lib/lib1funcs.S | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
arch/arm/lib/lib1funcs.S +2 -7
index 7ff4446dd644..de15d09e3605 100644
@@ -15,12 +15,11 @@
 
 /*
  * U-Boot compatibility bit, define empty UNWIND() macro as, since we
- * do not support stack unwinding and define CONFIG_AEABI to make all
- * of the functions available without diverging from Linux code.
+ * do not support stack unwinding to make all of the functions available
+ * without diverging from Linux code.
  */
 #ifdef __UBOOT__
 #define UNWIND(x...)
-#define CONFIG_AEABI
 #endif
 
 .macro ARM_DIV_BODY dividend, divisor, result, curbit
@@ -314,8 +313,6 @@ UNWIND(.fnend)
 ENDPROC(__modsi3)
 .popsection
 
-#ifdef CONFIG_AEABI
-
 .pushsection .text.__aeabi_uidivmod, "ax"
 ENTRY(__aeabi_uidivmod)
 UNWIND(.fnstart)
@@ -348,8 +345,6 @@ UNWIND(.fnend)
 ENDPROC(__aeabi_idivmod)
 .popsection
 
-#endif
-
 .pushsection .text.Ldiv0, "ax"
 Ldiv0:
 UNWIND(.fnstart)
Signature · 1 line
2.25.1
author
#10 lore raw

PATCH 7/19 autoboot: Rework CONFIG_AUTOBOOT_STOP_STR_* usage

In reply to Tom Rini

In order to not define a CONFIG value when the CONFIG_AUTOBOOT_STOP_STR_* functionality is not enabled, rework the assignment of empty and unused (as the code will be discarded under if 0, in the end) values to be AUTOBOOT_STOP_STR_* instead of CONFIG_AUTOBOOT_STOP_STR_*.

---
 common/autoboot.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)
common/autoboot.c +10 -6
index ea44fdf6add9..95a28b2fd83a 100644
@@ -40,11 +40,15 @@ DECLARE_GLOBAL_DATA_PTR;
 static int stored_bootdelay;
 static int menukey;
 
-#if !defined(CONFIG_AUTOBOOT_STOP_STR_CRYPT)
-#define CONFIG_AUTOBOOT_STOP_STR_CRYPT ""
+#if defined(CONFIG_AUTOBOOT_STOP_STR_CRYPT)
+#define AUTOBOOT_STOP_STR_CRYPT	CONFIG_AUTOBOOT_STOP_STR_CRYPT
+#else
+#define AUTOBOOT_STOP_STR_CRYPT	""
 #endif
-#if !defined(CONFIG_AUTOBOOT_STOP_STR_SHA256)
-#define CONFIG_AUTOBOOT_STOP_STR_SHA256 ""
+#if defined(CONFIG_AUTOBOOT_STOP_STR_SHA256)
+#define AUTOBOOT_STOP_STR_SHA256	CONFIG_AUTOBOOT_STOP_STR_SHA256
+#else
+#define AUTOBOOT_STOP_STR_SHA256	""
 #endif
 
 #ifdef CONFIG_AUTOBOOT_USE_MENUKEY
@@ -81,7 +85,7 @@ static int passwd_abort_crypt(uint64_t etime)
 	int err;
 
 	if (IS_ENABLED(CONFIG_AUTOBOOT_STOP_STR_ENABLE) && !crypt_env_str)
-		crypt_env_str = CONFIG_AUTOBOOT_STOP_STR_CRYPT;
+		crypt_env_str = AUTOBOOT_STOP_STR_CRYPT;
 
 	if (!crypt_env_str)
 		return 0;
@@ -160,7 +164,7 @@ static int passwd_abort_sha256(uint64_t etime)
 	int ret;
 
 	if (sha_env_str == NULL)
-		sha_env_str = CONFIG_AUTOBOOT_STOP_STR_SHA256;
+		sha_env_str = AUTOBOOT_STOP_STR_SHA256;
 
 	presskey = malloc_cache_aligned(DELAY_STOP_STR_MAX_LENGTH);
 	c = strstr(sha_env_str, ":");
Signature · 1 line
2.25.1
author
#11 lore raw

PATCH 8/19 spl: sata: Rework the loading case it not use IS_ENABLED(...)

In reply to Tom Rini

In this case, using IS_ENABLED(...) to attempt to load the image results in harder to read and less useful code, along with having to define a CONFIG value that would be unused. To maintain the current albeit slightly odd behavior, maintain that if we have both SPL_FS_FAT and SPL_SATA_RAW_U_BOOT_USE_SECTOR enabled, we use SPL_FS_FAT for the load.

---
 common/spl/spl_sata.c | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)
common/spl/spl_sata.c +9 -16
index 12397f0ae17e..32746ce9f3cf 100644
@@ -17,11 +17,6 @@
 #include <fat.h>
 #include <image.h>
 
-#ifndef CONFIG_SPL_SATA_RAW_U_BOOT_SECTOR
-/* Dummy value to make the compiler happy */
-#define CONFIG_SPL_SATA_RAW_U_BOOT_SECTOR 0x100
-#endif
-
 static int spl_sata_load_image_raw(struct spl_image_info *spl_image,
 		struct spl_boot_device *bootdev,
 		struct blk_desc *stor_dev, unsigned long sector)
@@ -62,7 +57,7 @@ static int spl_sata_load_image_raw(struct spl_image_info *spl_image,
 static int spl_sata_load_image(struct spl_image_info *spl_image,
 			       struct spl_boot_device *bootdev)
 {
-	int err = 0;
+	int err = -ENOSYS;
 	struct blk_desc *stor_dev;
 
 	/* try to recognize storage devices immediately */
@@ -77,16 +72,14 @@ static int spl_sata_load_image(struct spl_image_info *spl_image,
 				  CONFIG_SYS_SATA_FAT_BOOT_PARTITION))
 #endif
 	{
-		err = -ENOSYS;
-
-		if (IS_ENABLED(CONFIG_SPL_FS_FAT)) {
-			err = spl_load_image_fat(spl_image, bootdev, stor_dev,
-					CONFIG_SYS_SATA_FAT_BOOT_PARTITION,
-					CONFIG_SPL_FS_LOAD_PAYLOAD_NAME);
-		} else if (IS_ENABLED(CONFIG_SPL_SATA_RAW_U_BOOT_USE_SECTOR)) {
-			err = spl_sata_load_image_raw(spl_image, bootdev, stor_dev,
-				CONFIG_SPL_SATA_RAW_U_BOOT_SECTOR);
-		}
+#ifdef CONFIG_SPL_FS_FAT
+		err = spl_load_image_fat(spl_image, bootdev, stor_dev,
+				CONFIG_SYS_SATA_FAT_BOOT_PARTITION,
+				CONFIG_SPL_FS_LOAD_PAYLOAD_NAME);
+#elif defined(CONFIG_SPL_SATA_RAW_U_BOOT_USE_SECTOR)
+		err = spl_sata_load_image_raw(spl_image, bootdev, stor_dev,
+			CONFIG_SPL_SATA_RAW_U_BOOT_SECTOR);
+#endif
 	}
 	if (err) {
 		puts("Error loading sata device\n");
Signature · 1 line
2.25.1
author
#12 lore raw

PATCH 9/19 common/update: Finish Kconfig migration

In reply to Tom Rini

We can enforce the dependencies of this module via Kconfig now, so do so rather than with #error statements. Further, we can ensure that all required values are set to their defaults in Kconfig, and in fact already do so, so remove the tests here. The exception is CONFIG_UPDATE_LOAD_ADDR which needed to be migrated to Kconfig in the first place.

---
 common/Kconfig  | 16 ++++++++++++----
 common/update.c | 21 ---------------------
 2 files changed, 12 insertions(+), 25 deletions(-)
common/Kconfig +12 -4
index 8c71d3c972bf..655d198d30b5 100644
@@ -865,7 +865,7 @@ config UPDATE_COMMON
 
 config UPDATE_TFTP
 	bool "Auto-update using fitImage via TFTP"
-	depends on FIT
+	depends on FIT && OF_LIBFDT && !MTD_NOR_FLASH
 	select UPDATE_COMMON
 	help
 	  This option allows performing update of NOR with data in fitImage
@@ -874,16 +874,24 @@ config UPDATE_TFTP
 config UPDATE_TFTP_CNT_MAX
 	int "The number of connection retries during auto-update"
 	default 0
-	depends on UPDATE_TFTP
+	depends on UPDATE_TFTP || DFU_TFTP
 
 config UPDATE_TFTP_MSEC_MAX
 	int "Delay in mSec to wait for the TFTP server during auto-update"
 	default 100
-	depends on UPDATE_TFTP
+	depends on UPDATE_TFTP || DFU_TFTP
+
+config UPDATE_LOAD_ADDR
+	hex "Address in memory to load the update to"
+	depends on UPDATE_TFTP || DFU_TFTP
+	default 0x100000
+	help
+	  This option defines the location in memory to be used to load the
+	  update to, if 'loadaddr' is not set in the environment.
 
 config UPDATE_FIT
 	bool "Firmware update using fitImage"
-	depends on FIT
+	depends on FIT && OF_LIBFDT
 	depends on DFU
 	select UPDATE_COMMON
 	help
common/update.c +0 -21
index 80f16af65358..3502713d7d83 100644
@@ -10,14 +10,6 @@
 #include <cpu_func.h>
 #include <image.h>
 
-#if !(defined(CONFIG_FIT) && defined(CONFIG_OF_LIBFDT))
-#error "CONFIG_FIT and CONFIG_OF_LIBFDT are required for auto-update feature"
-#endif
-
-#if defined(CONFIG_UPDATE_TFTP) && !defined(CONFIG_MTD_NOR_FLASH)
-#error "CONFIG_UPDATE_TFTP and !CONFIG_MTD_NOR_FLASH needed for legacy behaviour"
-#endif
-
 #include <command.h>
 #include <env.h>
 #include <net.h>
@@ -31,19 +23,6 @@
 /* env variable holding the location of the update file */
 #define UPDATE_FILE_ENV		"updatefile"
 
-/* set configuration defaults if needed */
-#ifndef CONFIG_UPDATE_LOAD_ADDR
-#define CONFIG_UPDATE_LOAD_ADDR	0x100000
-#endif
-
-#ifndef CONFIG_UPDATE_TFTP_MSEC_MAX
-#define CONFIG_UPDATE_TFTP_MSEC_MAX	100
-#endif
-
-#ifndef CONFIG_UPDATE_TFTP_CNT_MAX
-#define CONFIG_UPDATE_TFTP_CNT_MAX	0
-#endif
-
 extern ulong tftp_timeout_ms;
 extern int tftp_timeout_count_max;
 #ifdef CONFIG_MTD_NOR_FLASH
Signature · 1 line
2.25.1
author
#13 lore raw

PATCH 10/19 fpga: Migrate CONFIG_MAX_FPGA_DEVICES to Kconfig

In reply to Tom Rini

This is always defined to 5, so use that as the default.

Cc Michal Simek <[email protected]>
---
 drivers/fpga/Kconfig | 5 +++++
 drivers/fpga/fpga.c  | 5 -----
 include/fpga.h       | 4 ----
 3 files changed, 5 insertions(+), 9 deletions(-)
drivers/fpga/Kconfig +5 -0
index 11b742eeebfe..4113de230cd9 100644
@@ -153,4 +153,9 @@ config SANDBOX_FPGA
 	  This is a driver model based FPGA driver for sandbox.
 	  Currently it is a stub only, as there are no usable uclass methods yet.
 
+config MAX_FPGA_DEVICES
+	int "Maximum number of FPGA devices"
+	depends on FPGA
+	default 5
+
 endmenu
drivers/fpga/fpga.c +0 -5
index 4db5c0a91e98..7f6b6bc73a1f 100644
@@ -13,11 +13,6 @@
 #include <lattice.h>
 #include <dm/device_compat.h>
 
-/* Local definitions */
-#ifndef CONFIG_MAX_FPGA_DEVICES
-#define CONFIG_MAX_FPGA_DEVICES		5
-#endif
-
 /* Local static data */
 static int next_desc = FPGA_INVALID_DEVICE;
 static fpga_desc desc_table[CONFIG_MAX_FPGA_DEVICES];
include/fpga.h +0 -4
index a4e16401da72..ed688cc0fa3b 100644
@@ -9,10 +9,6 @@
 #ifndef _FPGA_H_
 #define _FPGA_H_
 
-#ifndef CONFIG_MAX_FPGA_DEVICES
-#define CONFIG_MAX_FPGA_DEVICES		5
-#endif
-
 /* fpga_xxxx function return value definitions */
 #define FPGA_SUCCESS		0
 #define FPGA_FAIL		1
Signature · 1 line
2.25.1
maintainer Reviewed-by on v1 10/19
#14 lore raw

Re: [PATCH 10/19] fpga: Migrate CONFIG_MAX_FPGA_DEVICES to Kconfig

Quoted 45 lines · Tom Rini

This is always defined to 5, so use that as the default.

Cc Michal Simek <[email protected]>
---
  drivers/fpga/Kconfig | 5 +++++
  drivers/fpga/fpga.c  | 5 -----
  include/fpga.h       | 4 ----
  3 files changed, 5 insertions(+), 9 deletions(-)
drivers/fpga/Kconfig +5 -0
index 11b742eeebfe..4113de230cd9 100644
@@ -153,4 +153,9 @@ config SANDBOX_FPGA
  	  This is a driver model based FPGA driver for sandbox.
  	  Currently it is a stub only, as there are no usable uclass methods yet.
 
+config MAX_FPGA_DEVICES
+	int "Maximum number of FPGA devices"
+	depends on FPGA
+	default 5
+
  endmenu
drivers/fpga/fpga.c +0 -5
index 4db5c0a91e98..7f6b6bc73a1f 100644
@@ -13,11 +13,6 @@
  #include <lattice.h>
  #include <dm/device_compat.h>
 
-/* Local definitions */
-#ifndef CONFIG_MAX_FPGA_DEVICES
-#define CONFIG_MAX_FPGA_DEVICES		5
-#endif
-
  /* Local static data */
  static int next_desc = FPGA_INVALID_DEVICE;
  static fpga_desc desc_table[CONFIG_MAX_FPGA_DEVICES];
include/fpga.h +0 -0
index a4e16401da72..ed688cc0fa3b 100644

include/fpga.h line 14

Quoted 10 lines
include/fpga.h +0 -4
@@ -9,10 +9,6 @@
  #ifndef _FPGA_H_
  #define _FPGA_H_
 
-#ifndef CONFIG_MAX_FPGA_DEVICES
-#define CONFIG_MAX_FPGA_DEVICES		5
-#endif
-
  /* fpga_xxxx function return value definitions */
  #define FPGA_SUCCESS		0
  #define FPGA_FAIL		1

Thanks,
Michal

author
#15 lore raw

PATCH 11/19 usb: musb: Rename CONFIG_USB_MUSB_TIMEOUT to MUSB_TIMEOUT

In reply to Tom Rini

This variable has never been configured to another value at present, and was not converted to Kconfig. Opt instead to rename this to MUSB_TIMEOUT.

---
 drivers/usb/musb/musb_hcd.c | 6 +++---
 drivers/usb/musb/musb_hcd.h | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)
drivers/usb/musb/musb_hcd.c +3 -3
index 17901704f521..4676cabae0aa 100644
@@ -118,7 +118,7 @@ static int wait_until_ep0_ready(struct usb_device *dev, u32 bit_mask)
 {
 	u16 csr;
 	int result = 1;
-	int timeout = CONFIG_USB_MUSB_TIMEOUT;
+	int timeout = MUSB_TIMEOUT;
 
 	while (result > 0) {
 		csr = readw(&musbr->txcsr);
@@ -180,7 +180,7 @@ static int wait_until_ep0_ready(struct usb_device *dev, u32 bit_mask)
 static int wait_until_txep_ready(struct usb_device *dev, u8 ep)
 {
 	u16 csr;
-	int timeout = CONFIG_USB_MUSB_TIMEOUT;
+	int timeout = MUSB_TIMEOUT;
 
 	do {
 		if (check_stall(ep, 1)) {
@@ -212,7 +212,7 @@ static int wait_until_txep_ready(struct usb_device *dev, u8 ep)
 static int wait_until_rxep_ready(struct usb_device *dev, u8 ep)
 {
 	u16 csr;
-	int timeout = CONFIG_USB_MUSB_TIMEOUT;
+	int timeout = MUSB_TIMEOUT;
 
 	do {
 		if (check_stall(ep, 0)) {
drivers/usb/musb/musb_hcd.h +1 -3
index 7eb65e6b10d0..a492e99ef9d1 100644
@@ -16,9 +16,7 @@
 extern unsigned char new[];
 #endif
 
-#ifndef CONFIG_USB_MUSB_TIMEOUT
-# define CONFIG_USB_MUSB_TIMEOUT 100000
-#endif
+#define MUSB_TIMEOUT 100000
 
 /* This defines the endpoint number used for control transfers */
 #define MUSB_CONTROL_EP 0
Signature · 1 line
2.25.1
Reviewed-by on v1 11/19
#16 lore raw

Re: [PATCH 11/19] usb: musb: Rename CONFIG_USB_MUSB_TIMEOUT to MUSB_TIMEOUT

Quoted 3 lines · Tom Rini

This variable has never been configured to another value at present, and was not converted to Kconfig. Opt instead to rename this to MUSB_TIMEOUT.

author
#17 lore raw

PATCH 12/19 fsl-layerscape: Rework usage of CONFIG_CLUSTER_CLK_FREQ

In reply to Tom Rini

In the case where CONFIG_CLUSTER_CLK_FREQ is not defined, simply set cluster_clk to get_board_sys_clk().

---
 arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c +4 -3
index f18407b6d3bb..4455eb1726dc 100644
@@ -48,10 +48,11 @@ void get_sys_info(struct sys_info *sys_info)
 	unsigned long cluster_clk;
 
 	sys_info->freq_systembus = sysclk;
-#ifndef CONFIG_CLUSTER_CLK_FREQ
-#define CONFIG_CLUSTER_CLK_FREQ	get_board_sys_clk()
-#endif
+#ifdef CONFIG_CLUSTER_CLK_FREQ
 	cluster_clk = CONFIG_CLUSTER_CLK_FREQ;
+#else
+	cluster_clk = get_board_sys_clk();
+#endif
 
 #if defined(CONFIG_DYNAMIC_DDR_CLK_FREQ) || defined(CONFIG_STATIC_DDR_CLK_FREQ)
 	sys_info->freq_ddrbus = get_board_ddr_clk();
Signature · 1 line
2.25.1
author
#18 lore raw

PATCH 13/19 net: phy: mv88e61xx: Finish migration of MV88E61XX_FIXED_PORTS

In reply to Tom Rini

Set the default for MV88E61XX_FIXED_PORTS to 0x0 in Kconfig, and move the comment from code to the help to explain what this does.

---
 drivers/net/phy/Kconfig     | 4 ++++
 drivers/net/phy/mv88e61xx.c | 8 --------
 2 files changed, 4 insertions(+), 8 deletions(-)
drivers/net/phy/Kconfig +4 -0
index 580ac8e8fba2..5eaff053a09c 100644
@@ -62,6 +62,10 @@ config MV88E61XX_PHY_PORTS
 
 config MV88E61XX_FIXED_PORTS
 	hex "Bitmask of PHYless serdes Ports"
+	default 0x0
+	help
+	  These are ports without PHYs that may be wired directly to other
+	  serdes interfaces
 
 endif # MV88E61XX_SWITCH
 
drivers/net/phy/mv88e61xx.c +0 -8
index 7eff37b24499..7ab60164c774 100644
@@ -167,14 +167,6 @@
 #error Define CONFIG_MV88E61XX_CPU_PORT to the port the CPU is attached to
 #endif
 
-/*
- *  These are ports without PHYs that may be wired directly
- * to other serdes interfaces
- */
-#ifndef CONFIG_MV88E61XX_FIXED_PORTS
-#define CONFIG_MV88E61XX_FIXED_PORTS 0
-#endif
-
 /* ID register values for different switch models */
 #define PORT_SWITCH_ID_6020		0x0200
 #define PORT_SWITCH_ID_6070		0x0700
Signature · 1 line
2.25.1
Reviewed-by on v1 13/19
#19 lore raw

Re: [PATCH 13/19] net: phy: mv88e61xx: Finish migration of MV88E61XX_FIXED_PORTS

Quoted 45 lines · Tom Rini

Set the default for MV88E61XX_FIXED_PORTS to 0x0 in Kconfig, and move the comment from code to the help to explain what this does.

---
 drivers/net/phy/Kconfig     | 4 ++++
 drivers/net/phy/mv88e61xx.c | 8 --------
 2 files changed, 4 insertions(+), 8 deletions(-)
drivers/net/phy/Kconfig +4 -0
index 580ac8e8fba2..5eaff053a09c 100644
@@ -62,6 +62,10 @@ config MV88E61XX_PHY_PORTS
 
 config MV88E61XX_FIXED_PORTS
        hex "Bitmask of PHYless serdes Ports"
+       default 0x0
+       help
+         These are ports without PHYs that may be wired directly to other
+         serdes interfaces
 
 endif # MV88E61XX_SWITCH
 
drivers/net/phy/mv88e61xx.c +0 -9
index 7eff37b24499..7ab60164c774 100644
@@ -167,14 +167,6 @@
 #error Define CONFIG_MV88E61XX_CPU_PORT to the port the CPU is attached to
 #endif
 
-/*
- *  These are ports without PHYs that may be wired directly
- * to other serdes interfaces
- */
-#ifndef CONFIG_MV88E61XX_FIXED_PORTS
-#define CONFIG_MV88E61XX_FIXED_PORTS 0
-#endif
-
 /* ID register values for different switch models */
 #define PORT_SWITCH_ID_6020            0x0200
 #define PORT_SWITCH_ID_6070            0x0700
--
Quoted 2 lines

2.25.1

author
#20 lore raw

PATCH 14/19 nxp: Finish migration of SYS_FSL_IFC_BANK_COUNT to Kconfig

In reply to Tom Rini

As this is used on both ARM and PowerPC platforms, this needs to be asked in arch/Kconfig.nxp. Set the PowerPC defaults based on arch/powerpc/include/asm/config_mpc85xx.h and remove the default set in drivers/mtd/nand/raw/fsl_ifc_nand.c

---
 arch/Kconfig.nxp                          | 14 ++++++++++++++
 arch/arm/cpu/armv7/ls102xa/Kconfig        |  4 ----
 arch/arm/cpu/armv8/fsl-layerscape/Kconfig |  7 -------
 arch/powerpc/include/asm/config_mpc85xx.h | 14 --------------
 drivers/mtd/nand/raw/fsl_ifc_nand.c       |  4 ----
 5 files changed, 14 insertions(+), 29 deletions(-)
arch/Kconfig.nxp +14 -0
index ad61dabb31b3..e5a8f9beda12 100644
@@ -256,6 +256,20 @@ config SYS_FSL_ESDHC_BE
 config SYS_FSL_IFC_BE
 	bool
 
+config SYS_FSL_IFC_BANK_COUNT
+	int "Maximum banks of Integrated flash controller"
+	depends on ARCH_LS1043A || ARCH_LS1046A || ARCH_LS2080A || \
+		ARCH_LS1088A || ARCH_LS1021A || ARCH_B4860 || ARCH_B4420 || \
+		ARCH_T4240 || ARCH_T1040 || ARCH_T1042 || ARCH_T1024 || \
+		ARCH_T2080 || ARCH_C29X || ARCH_P1010 || ARCH_BSC9131 || \
+		ARCH_BSC9132
+	default 3 if ARCH_BSC9131 || ARCH_BSC9132
+	default 4 if ARCH_LS1043A || ARCH_LS1046A || ARCH_B4860 || \
+			ARCH_B4420 || ARCH_P1010
+	default 8 if ARCH_LS2080A || ARCH_LS1088A || ARCH_LS1021A || \
+			ARCH_T4240 || ARCH_T1040 || ARCH_T1042 || \
+			ARCH_T1024 || ARCH_T2080 || ARCH_C29X
+
 config FSL_QIXIS
 	bool "Enable QIXIS support"
 	depends on PPC || ARCH_LS1021A || FSL_LSCH2 || FSL_LSCH3
arch/arm/cpu/armv7/ls102xa/Kconfig +0 -4
index a83eb7e8fdd1..64fea9a0c4d9 100644
@@ -102,10 +102,6 @@ config SYS_FSL_SRDS_2
 config SYS_HAS_SERDES
 	bool
 
-config SYS_FSL_IFC_BANK_COUNT
-	int "Maximum banks of Integrated flash controller"
-	default 8
-
 config SYS_FSL_ERRATUM_A008407
 	bool
 
arch/arm/cpu/armv8/fsl-layerscape/Kconfig +0 -7
index 9656c52e955f..dcb1ca5e12e8 100644
@@ -525,13 +525,6 @@ config SYS_CCI400_OFFSET
 	  Offset for CCI400 base
 	  CCI400 base addr = CCSRBAR + CCI400_OFFSET
 
-config SYS_FSL_IFC_BANK_COUNT
-	int "Maximum banks of Integrated flash controller"
-	depends on ARCH_LS1043A || ARCH_LS1046A || ARCH_LS2080A || ARCH_LS1088A
-	default 4 if ARCH_LS1043A
-	default 4 if ARCH_LS1046A
-	default 8 if ARCH_LS2080A || ARCH_LS1088A
-
 config SYS_FSL_HAS_CCI400
 	bool
 
arch/powerpc/include/asm/config_mpc85xx.h +0 -14
index d731ac3f4d78..03e86d868b25 100644
@@ -16,9 +16,6 @@
 #define CFG_SYS_FSL_SRIO_IB_WIN_NUM	5
 #define CFG_SYS_FSL_SRIO_MSG_UNIT_NUM	2
 
-#elif defined(CONFIG_ARCH_P1010)
-#define CONFIG_SYS_FSL_IFC_BANK_COUNT	4
-
 #elif defined(CONFIG_ARCH_P1021)
 #define QE_MURAM_SIZE			0x6000UL
 #define MAX_QE_RISC			1
@@ -85,11 +82,6 @@
 #define CFG_SYS_FM_MURAM_SIZE	0x28000
 #define CFG_SYS_FSL_CORENET_SNOOPVEC_COREONLY 0xf0000000
 
-#elif defined(CONFIG_ARCH_BSC9131)
-#define CONFIG_SYS_FSL_IFC_BANK_COUNT	3
-
-#elif defined(CONFIG_ARCH_BSC9132)
-#define CONFIG_SYS_FSL_IFC_BANK_COUNT	3
 
 #elif defined(CONFIG_ARCH_T4240)
 #ifdef CONFIG_ARCH_T4240
@@ -110,7 +102,6 @@
 #define CFG_SYS_FSL_SRDS_4
 #define CFG_SYS_NUM_FMAN		2
 #define CFG_SYS_PME_CLK		0
-#define CONFIG_SYS_FSL_IFC_BANK_COUNT	8
 #define CFG_SYS_FM1_CLK		3
 #define CFG_SYS_FM2_CLK		3
 #define CFG_SYS_FM_MURAM_SIZE	0x60000
@@ -123,7 +114,6 @@
 #define CONFIG_SYS_FSL_SRDS_2
 #define CFG_SYS_NUM_FMAN		1
 #define CFG_SYS_FM1_CLK		0
-#define CONFIG_SYS_FSL_IFC_BANK_COUNT	4
 #define CFG_SYS_FM_MURAM_SIZE	0x60000
 
 #ifdef CONFIG_ARCH_B4860
@@ -146,7 +136,6 @@
 #define CFG_SYS_NUM_FM1_DTSEC	5
 #define CFG_PME_PLAT_CLK_DIV		2
 #define CFG_SYS_PME_CLK		CFG_PME_PLAT_CLK_DIV
-#define CONFIG_SYS_FSL_IFC_BANK_COUNT	8
 #define CFG_FM_PLAT_CLK_DIV	1
 #define CFG_SYS_FM1_CLK		CFG_FM_PLAT_CLK_DIV
 #define CFG_SYS_FM_MURAM_SIZE	0x30000
@@ -161,7 +150,6 @@
 #define CFG_SYS_NUM_FMAN		1
 #define CFG_SYS_NUM_FM1_DTSEC	4
 #define CFG_SYS_NUM_FM1_10GEC	1
-#define CONFIG_SYS_FSL_IFC_BANK_COUNT	8
 #define CFG_SYS_FM1_CLK		0
 #define CFG_QBMAN_CLK_DIV		1
 #define CFG_SYS_FM_MURAM_SIZE	0x30000
@@ -185,13 +173,11 @@
 #define CFG_PME_PLAT_CLK_DIV		1
 #define CFG_SYS_PME_CLK		CFG_PME_PLAT_CLK_DIV
 #define CFG_SYS_FM1_CLK		0
-#define CONFIG_SYS_FSL_IFC_BANK_COUNT	8
 #define CFG_SYS_FM_MURAM_SIZE	0x28000
 #define ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE
 
 
 #elif defined(CONFIG_ARCH_C29X)
-#define CONFIG_SYS_FSL_IFC_BANK_COUNT	8
 #define CFG_SYS_FSL_SEC_IDX_OFFSET	0x20000
 
 #endif
drivers/mtd/nand/raw/fsl_ifc_nand.c +0 -4
index 18abd7544184..1d7c1fddd3f6 100644
@@ -20,10 +20,6 @@
 #include <linux/errno.h>
 #include <fsl_ifc.h>
 
-#ifndef CONFIG_SYS_FSL_IFC_BANK_COUNT
-#define CONFIG_SYS_FSL_IFC_BANK_COUNT	4
-#endif
-
 #define MAX_BANKS	CONFIG_SYS_FSL_IFC_BANK_COUNT
 #define ERR_BYTE	0xFF /* Value returned for read bytes
 				when read failed */
Signature · 1 line
2.25.1
author
#21 lore raw

PATCH 15/19 nxp: Finish migration of SYS_FSL_SRDS_[12] to Kconfig

In reply to Tom Rini

As this is used on both ARM and PowerPC platforms, this needs to be listed in arch/Kconfig.nxp and match how they're currently used by select'ing them under the required PowerPC ARCH_xxx options.

---
 arch/Kconfig.nxp                          |  9 +++++++++
 arch/arm/cpu/armv7/ls102xa/Kconfig        |  9 ---------
 arch/arm/cpu/armv8/fsl-layerscape/Kconfig |  9 ---------
 arch/powerpc/cpu/mpc85xx/Kconfig          | 12 +++++++++---
 arch/powerpc/include/asm/config_mpc85xx.h |  8 --------
 5 files changed, 18 insertions(+), 29 deletions(-)
arch/Kconfig.nxp +9 -0
index e5a8f9beda12..b5df04072460 100644
@@ -285,3 +285,12 @@ config HAS_FSL_DR_USB
 
 config SYS_DPAA_FMAN
 	bool
+
+config SYS_FSL_SRDS_1
+	bool
+
+config SYS_FSL_SRDS_2
+	bool
+
+config SYS_HAS_SERDES
+	bool
arch/arm/cpu/armv7/ls102xa/Kconfig +0 -9
index 64fea9a0c4d9..0edcf4c5ee7a 100644
@@ -93,15 +93,6 @@ config SYS_FSL_ERRATUM_A010315
 config SYS_FSL_HAS_CCI400
 	bool
 
-config SYS_FSL_SRDS_1
-	bool
-
-config SYS_FSL_SRDS_2
-	bool
-
-config SYS_HAS_SERDES
-	bool
-
 config SYS_FSL_ERRATUM_A008407
 	bool
 
arch/arm/cpu/armv8/fsl-layerscape/Kconfig +0 -9
index dcb1ca5e12e8..a8b493e2f875 100644
@@ -567,18 +567,9 @@ config SYS_DP_DDR_BASE_PHY
 	  DDR controller uses this value as the base address for binding.
 	  It is mapped to CONFIG_SYS_DP_DDR_BASE for core to access.
 
-config SYS_FSL_SRDS_1
-	bool
-
-config SYS_FSL_SRDS_2
-	bool
-
 config SYS_NXP_SRDS_3
 	bool
 
-config SYS_HAS_SERDES
-	bool
-
 config FSL_TZASC_1
 	bool
 
arch/powerpc/cpu/mpc85xx/Kconfig +9 -3
index 1b180481a483..c0ca578fcc95 100644
@@ -312,6 +312,8 @@ config ARCH_B4860
 	select SYS_FSL_PCIE_COMPAT_QORIQ_PCIE_v24
 	select SYS_FSL_SEC_BE
 	select SYS_FSL_SEC_COMPAT_4
+	select SYS_FSL_SRDS_1
+	select SYS_FSL_SRDS_2
 	select SYS_FSL_SRIO_LIODN
 	select SYS_FSL_QMAN_V3 if SYS_DPAA_QBMAN
 	select SYS_FSL_USB1_PHY_ENABLE
@@ -779,6 +781,7 @@ config ARCH_T1024
 	select SYS_FSL_SEC_BE
 	select SYS_FSL_SEC_COMPAT_5
 	select SYS_FSL_SINGLE_SOURCE_CLK
+	select SYS_FSL_SRDS_1
 	select SYS_FSL_QMAN_V3 if SYS_DPAA_QBMAN
 	select SYS_FSL_USB_DUAL_PHY_ENABLE
 	select FSL_IFC
@@ -812,6 +815,7 @@ config ARCH_T1040
 	select SYS_FSL_SEC_BE
 	select SYS_FSL_SEC_COMPAT_5
 	select SYS_FSL_SINGLE_SOURCE_CLK
+	select SYS_FSL_SRDS_1
 	select SYS_FSL_QMAN_V3 if SYS_DPAA_QBMAN
 	select SYS_FSL_USB_DUAL_PHY_ENABLE
 	select FSL_IFC
@@ -844,6 +848,7 @@ config ARCH_T1042
 	select SYS_FSL_SEC_BE
 	select SYS_FSL_SEC_COMPAT_5
 	select SYS_FSL_SINGLE_SOURCE_CLK
+	select SYS_FSL_SRDS_1
 	select SYS_FSL_QMAN_V3 if SYS_DPAA_QBMAN
 	select SYS_FSL_USB_DUAL_PHY_ENABLE
 	select FSL_IFC
@@ -879,6 +884,8 @@ config ARCH_T2080
 	select SYS_FSL_PCIE_COMPAT_QORIQ_PCIE_v30
 	select SYS_FSL_SEC_BE
 	select SYS_FSL_SEC_COMPAT_4
+	select SYS_FSL_SRDS_1
+	select SYS_FSL_SRDS_2
 	select SYS_FSL_SRIO_LIODN
 	select SYS_FSL_QMAN_V3 if SYS_DPAA_QBMAN
 	select SYS_FSL_USB_DUAL_PHY_ENABLE
@@ -920,6 +927,8 @@ config ARCH_T4240
 	select SYS_FSL_PCIE_COMPAT_QORIQ_PCIE_v30
 	select SYS_FSL_SEC_BE
 	select SYS_FSL_SEC_COMPAT_4
+	select SYS_FSL_SRDS_1
+	select SYS_FSL_SRDS_2
 	select SYS_FSL_SRIO_LIODN
 	select SYS_FSL_QMAN_V3 if SYS_DPAA_QBMAN
 	select SYS_FSL_USB_DUAL_PHY_ENABLE
@@ -1197,9 +1206,6 @@ config SYS_FSL_ERRATUM_SRIO_A004034
 config SYS_FSL_ERRATUM_USB14
 	bool
 
-config SYS_HAS_SERDES
-	bool
-
 config SYS_P4080_ERRATUM_CPU22
 	bool
 
arch/powerpc/include/asm/config_mpc85xx.h +0 -8
index 03e86d868b25..d990ecff96f0 100644
@@ -96,8 +96,6 @@
 #define CFG_SYS_NUM_FM2_DTSEC	8
 #define CFG_SYS_NUM_FM2_10GEC	1
 #endif
-#define CONFIG_SYS_FSL_SRDS_1
-#define CONFIG_SYS_FSL_SRDS_2
 #define CFG_SYS_FSL_SRDS_3
 #define CFG_SYS_FSL_SRDS_4
 #define CFG_SYS_NUM_FMAN		2
@@ -110,8 +108,6 @@
 #define CFG_SYS_FSL_SRIO_IB_WIN_NUM	5
 
 #elif defined(CONFIG_ARCH_B4860) || defined(CONFIG_ARCH_B4420)
-#define CONFIG_SYS_FSL_SRDS_1
-#define CONFIG_SYS_FSL_SRDS_2
 #define CFG_SYS_NUM_FMAN		1
 #define CFG_SYS_FM1_CLK		0
 #define CFG_SYS_FM_MURAM_SIZE	0x60000
@@ -131,7 +127,6 @@
 
 #elif defined(CONFIG_ARCH_T1040) || defined(CONFIG_ARCH_T1042)
 #define CFG_SYS_FSL_CLUSTER_CLOCKS   { 1, 1, 1, 1 }
-#define CONFIG_SYS_FSL_SRDS_1
 #define CFG_SYS_NUM_FMAN		1
 #define CFG_SYS_NUM_FM1_DTSEC	5
 #define CFG_PME_PLAT_CLK_DIV		2
@@ -146,7 +141,6 @@
 
 #elif defined(CONFIG_ARCH_T1024)
 #define CFG_SYS_FSL_CLUSTER_CLOCKS  { 1, 1, 1, 1 }
-#define CONFIG_SYS_FSL_SRDS_1
 #define CFG_SYS_NUM_FMAN		1
 #define CFG_SYS_NUM_FM1_DTSEC	4
 #define CFG_SYS_NUM_FM1_10GEC	1
@@ -161,11 +155,9 @@
 #elif defined(CONFIG_ARCH_T2080)
 #define CFG_SYS_NUM_FMAN		1
 #define CFG_SYS_FSL_CLUSTER_CLOCKS	{ 1, 4, 4, 4 }
-#define CONFIG_SYS_FSL_SRDS_1
 #if defined(CONFIG_ARCH_T2080)
 #define CFG_SYS_NUM_FM1_DTSEC	8
 #define CFG_SYS_NUM_FM1_10GEC	4
-#define CONFIG_SYS_FSL_SRDS_2
 #define CFG_SYS_FSL_SRIO_MAX_PORTS	2
 #define CFG_SYS_FSL_SRIO_OB_WIN_NUM	9
 #define CFG_SYS_FSL_SRIO_IB_WIN_NUM	5
Signature · 1 line
2.25.1
author
#22 lore raw

PATCH 16/19 usbtty: Remove default CONFIG_USBD_* values

In reply to Tom Rini

For this legacy driver, the only user sets these values in Kconfig, so we can remove them from the header.

---
 drivers/serial/usbtty.h | 19 -------------------
 1 file changed, 19 deletions(-)
drivers/serial/usbtty.h +0 -19
index ac4d22044d3d..8c7e61b2ca27 100644
@@ -20,25 +20,6 @@
 #include <usb/udc.h>
 #include <version.h>
 
-/* If no VendorID/ProductID is defined in config.h, pretend to be Linux
- * DO NOT Reuse this Vendor/Product setup with protocol incompatible devices */
-
-#ifndef CONFIG_USBD_VENDORID
-#define CONFIG_USBD_VENDORID		0x0525	/* Linux/NetChip */
-#endif
-#ifndef CONFIG_USBD_PRODUCTID_GSERIAL
-#define CONFIG_USBD_PRODUCTID_GSERIAL	0xa4a6	/* gserial */
-#endif
-#ifndef CONFIG_USBD_PRODUCTID_CDCACM
-#define CONFIG_USBD_PRODUCTID_CDCACM	0xa4a7	/* CDC ACM */
-#endif
-#ifndef CONFIG_USBD_MANUFACTURER
-#define CONFIG_USBD_MANUFACTURER	"Das U-Boot"
-#endif
-#ifndef CONFIG_USBD_PRODUCT_NAME
-#define CONFIG_USBD_PRODUCT_NAME	U_BOOT_VERSION
-#endif
-
 #ifndef CONFIG_USBD_CONFIGURATION_STR
 #define CONFIG_USBD_CONFIGURATION_STR	"TTY via USB"
 #endif
Signature · 1 line
2.25.1
author
#23 lore raw

PATCH 17/19 watchdog: Clean up defaults for imx_watchdog / ulp_wdog

In reply to Tom Rini

In imx_watchdog, clean up the comment to just note the range now, as we do not need to set the default here as Kconfig does this for us. For ulp_wdog, set the default value via Kconfig instead.

Cc Stefan Roese <[email protected]>
Cc Stefano Babic <[email protected]>
Cc Peng Fan <[email protected]>
---
 drivers/watchdog/Kconfig        | 1 +
 drivers/watchdog/imx_watchdog.c | 7 +------
 drivers/watchdog/ulp_wdog.c     | 4 ----
 3 files changed, 2 insertions(+), 10 deletions(-)
drivers/watchdog/Kconfig +1 -0
index f1b1cf63ca3a..b5ac8f7f50dc 100644
@@ -30,6 +30,7 @@ config WATCHDOG_TIMEOUT_MSECS
 	default 128000 if ARCH_MX7 || ARCH_VF610
 	default 30000 if ARCH_SOCFPGA
 	default 16000 if ARCH_SUNXI
+	default 5376 if ULP_WATCHDOG
 	default 60000
 	help
 	  Watchdog timeout in msec
drivers/watchdog/imx_watchdog.c +1 -6
index 3586246fbfbc..894158b304a7 100644
@@ -68,13 +68,8 @@ static void imx_watchdog_init(struct watchdog_regs *wdog, bool ext_reset,
 
 	/*
 	 * The timer watchdog can be set between
-	 * 0.5 and 128 Seconds. If not defined
-	 * in configuration file, sets 128 Seconds
+	 * 0.5 and 128 Seconds.
 	 */
-#ifndef CONFIG_WATCHDOG_TIMEOUT_MSECS
-#define CONFIG_WATCHDOG_TIMEOUT_MSECS 128000
-#endif
-
 	timeout = max_t(u64, timeout, TIMEOUT_MIN);
 	timeout = min_t(u64, timeout, TIMEOUT_MAX);
 	timeout = lldiv(timeout, 500) - 1;
drivers/watchdog/ulp_wdog.c +0 -4
index e08105430485..c21aa3af55fa 100644
@@ -25,10 +25,6 @@ struct ulp_wdt_priv {
 	u32 clk_rate;
 };
 
-#ifndef CONFIG_WATCHDOG_TIMEOUT_MSECS
-#define CONFIG_WATCHDOG_TIMEOUT_MSECS 0x1500
-#endif
-
 #define REFRESH_WORD0 0xA602 /* 1st refresh word */
 #define REFRESH_WORD1 0xB480 /* 2nd refresh word */
 
Signature · 1 line
2.25.1
Reviewed-by on v1 17/19
#24 lore raw

Re: [PATCH 17/19] watchdog: Clean up defaults for imx_watchdog / ulp_wdog

Quoted 8 lines · Tom Rini

In imx_watchdog, clean up the comment to just note the range now, as we do not need to set the default here as Kconfig does this for us. For ulp_wdog, set the default value via Kconfig instead.

Cc Stefan Roese <[email protected]>
Cc Stefano Babic <[email protected]>
Cc Peng Fan <[email protected]>

Thanks,
Stefan

Quoted 42 lines
---
  drivers/watchdog/Kconfig        | 1 +
  drivers/watchdog/imx_watchdog.c | 7 +------
  drivers/watchdog/ulp_wdog.c     | 4 ----
  3 files changed, 2 insertions(+), 10 deletions(-)
drivers/watchdog/Kconfig +1 -0
index f1b1cf63ca3a..b5ac8f7f50dc 100644
@@ -30,6 +30,7 @@ config WATCHDOG_TIMEOUT_MSECS
  	default 128000 if ARCH_MX7 || ARCH_VF610
  	default 30000 if ARCH_SOCFPGA
  	default 16000 if ARCH_SUNXI
+	default 5376 if ULP_WATCHDOG
  	default 60000
  	help
  	  Watchdog timeout in msec
drivers/watchdog/imx_watchdog.c +1 -6
index 3586246fbfbc..894158b304a7 100644
@@ -68,13 +68,8 @@ static void imx_watchdog_init(struct watchdog_regs *wdog, bool ext_reset,
 
  	/*
  	 * The timer watchdog can be set between
-	 * 0.5 and 128 Seconds. If not defined
-	 * in configuration file, sets 128 Seconds
+	 * 0.5 and 128 Seconds.
  	 */
-#ifndef CONFIG_WATCHDOG_TIMEOUT_MSECS
-#define CONFIG_WATCHDOG_TIMEOUT_MSECS 128000
-#endif
-
  	timeout = max_t(u64, timeout, TIMEOUT_MIN);
  	timeout = min_t(u64, timeout, TIMEOUT_MAX);
  	timeout = lldiv(timeout, 500) - 1;
drivers/watchdog/ulp_wdog.c +0 -0
index e08105430485..c21aa3af55fa 100644

drivers/watchdog/ulp_wdog.c struct ulp_wdt_priv { · line 30

Quoted 10 lines
drivers/watchdog/ulp_wdog.c +0 -4
@@ -25,10 +25,6 @@ struct ulp_wdt_priv {
  	u32 clk_rate;
  };
 
-#ifndef CONFIG_WATCHDOG_TIMEOUT_MSECS
-#define CONFIG_WATCHDOG_TIMEOUT_MSECS 0x1500
-#endif
-
  #define REFRESH_WORD0 0xA602 /* 1st refresh word */
  #define REFRESH_WORD1 0xB480 /* 2nd refresh word */
 

Viele Grüße,
Stefan Roese

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]
author
#25 lore raw

PATCH 18/19 global: Finish CONFIG -> CFG migration

In reply to Tom Rini

At this point, the remaining places where we have a symbol that is defined as CONFIG_... are in fairly odd locations. While as much dead code has been removed as possible, some of these locations are simply less obvious at first. In other cases, this code is used, but was defined in such a way as to have been missed by earlier checks. Perform a rename of all such remaining symbols to be CFG_... rather than CONFIG_...

---
 README                                        |  24 +-
 arch/arm/cpu/armv8/fsl-layerscape/cpu.c       | 166 +++++-----
 .../arm/include/asm/arch-fsl-layerscape/cpu.h |  96 +++---
 .../include/asm/arch-rockchip/ddr_rk3288.h    |   2 +-
 .../include/asm/arch-rockchip/sdram_rk322x.h  |   2 +-
 arch/arm/include/asm/arch-sunxi/i2c.h         |   2 +-
 arch/arm/mach-omap2/fdt-common.c              |   4 +-
 arch/arm/mach-omap2/omap5/fdt.c               |   8 +-
 .../arm/mach-rmobile/include/mach/rcar-mstp.h |  96 +++---
 arch/arm/mach-rockchip/rk3036/sdram_rk3036.c  |   2 +-
 arch/arm/mach-tegra/tegra20/warmboot_avp.c    |   2 +-
 arch/arm/mach-tegra/tegra20/warmboot_avp.h    |   4 +-
 arch/m68k/cpu/mcf523x/interrupts.c            |   8 +-
 arch/m68k/cpu/mcf52x2/interrupts.c            |  14 +-
 arch/m68k/cpu/mcf530x/interrupts.c            |   2 +-
 arch/m68k/cpu/mcf532x/interrupts.c            |   8 +-
 arch/m68k/cpu/mcf5445x/interrupts.c           |   8 +-
 arch/m68k/include/asm/cache.h                 |  42 +--
 arch/m68k/include/asm/coldfire/intctrl.h      |   8 +-
 arch/m68k/include/asm/immap.h                 | 290 +++++++++---------
 arch/m68k/lib/cache.c                         |  28 +-
 arch/m68k/lib/interrupts.c                    |   2 +-
 arch/m68k/lib/time.c                          |  24 +-
 arch/mips/mach-mtmips/mt7621/spl/start.S      |   8 +-
 arch/powerpc/cpu/mpc83xx/bats/bats.h          | 128 ++++----
 arch/powerpc/cpu/mpc83xx/cpu_init.c           |  26 +-
 arch/powerpc/cpu/mpc83xx/hid/hid.h            |  12 +-
 arch/powerpc/cpu/mpc83xx/hrcw/hrcw.h          |   4 +-
 arch/powerpc/cpu/mpc83xx/lblaw/lblaw.h        |  32 +-
 arch/powerpc/cpu/mpc83xx/spd_sdram.c          |   6 +-
 arch/powerpc/cpu/mpc83xx/spl_minimal.c        |  10 +-
 arch/powerpc/cpu/mpc83xx/start.S              | 154 +++++-----
 arch/powerpc/cpu/mpc85xx/cpu_init.c           |  56 ++--
 arch/powerpc/cpu/mpc85xx/fdt.c                |  10 +-
 arch/powerpc/cpu/mpc85xx/liodn.c              |   6 +-
 arch/powerpc/cpu/mpc8xxx/fsl_pamu.c           |  16 +-
 arch/powerpc/include/asm/fsl_pamu.h           |   2 +-
 arch/powerpc/include/asm/fsl_secure_boot.h    |   8 +-
 arch/powerpc/lib/bootm.c                      |   6 +-
 arch/powerpc/lib/interrupts.c                 |   6 +-
 arch/riscv/include/asm/encoding.h             |   2 +-
 arch/x86/include/asm/acpi/chromeos.asl        |   4 +-
 board/alliedtelesis/x530/x530.c               |   6 +-
 board/armltd/vexpress64/vexpress64.c          |   2 +-
 .../compulab/imx8mm-cl-iot-gate/eeprom_spl.c  |   6 +-
 board/davinci/da8xxevm/da850evm.c             |   6 +-
 board/davinci/da8xxevm/omapl138_lcdk.c        |   4 +-
 board/eets/pdu001/board.c                     |   4 +-
 board/freescale/common/cadmus.c               |  12 +-
 board/freescale/common/fsl_chain_of_trust.c   |   6 +-
 board/freescale/common/pixis.c                |  30 +-
 board/freescale/ls1043aqds/eth.c              |   4 +-
 board/freescale/ls1043ardb/eth.c              |   4 +-
 board/freescale/ls1046afrwy/eth.c             |   2 +-
 board/freescale/ls1046aqds/eth.c              |   2 +-
 board/freescale/ls1046ardb/eth.c              |   4 +-
 board/freescale/p2041rdb/eth.c                |   4 +-
 board/freescale/t102xrdb/eth_t102xrdb.c       |   4 +-
 board/freescale/t104xrdb/eth.c                |   2 +-
 board/freescale/t208xqds/eth_t208xqds.c       |   4 +-
 board/freescale/t4rdb/eth.c                   |   4 +-
 board/logicpd/omap3som/omap3logic.c           |   4 +-
 board/renesas/blanche/blanche.c               |   2 +-
 board/sysam/amcore/amcore.c                   |   2 +-
 board/ti/evm/evm.c                            |   4 +-
 cmd/ximg.c                                    |   6 +-
 common/command.c                              |   2 +-
 doc/README.davinci                            |   2 +-
 doc/README.fec_mxc                            |   2 +-
 doc/develop/environment.rst                   |   2 +-
 doc/usage/netconsole.rst                      |   2 +-
 drivers/crypto/fsl/jr.c                       |   6 +-
 drivers/crypto/fsl/jr.h                       |   2 +-
 drivers/ddr/fsl/ctrl_regs.c                   |  10 +-
 drivers/ddr/fsl/options.c                     |   6 +-
 drivers/fpga/virtex2.c                        |   8 +-
 drivers/fpga/zynqpl.c                         |   6 +-
 drivers/gpio/mpc83xx_gpio.c                   |  40 +--
 drivers/i2c/fsl_i2c.c                         |  16 +-
 drivers/i2c/lpc32xx_i2c.c                     |  16 +-
 drivers/i2c/mvtwsi.c                          |   6 +-
 drivers/i2c/octeon_i2c.c                      |   4 +-
 drivers/misc/gpio_led.c                       |   6 +-
 drivers/mtd/nand/raw/kmeter1_nand.c           |  12 +-
 drivers/mtd/spi/fsl_espi_spl.c                |   4 +-
 drivers/net/ag7xxx.c                          |  30 +-
 drivers/net/designware.c                      |  18 +-
 drivers/net/designware.h                      |  18 +-
 drivers/net/eepro100.c                        |  24 +-
 drivers/net/fec_mxc.c                         |   8 +-
 drivers/net/fm/fm.c                           |   2 +-
 drivers/net/mcfmii.c                          |  12 +-
 drivers/net/mt7628-eth.c                      |  12 +-
 drivers/net/mvpp2.c                           |   2 +-
 drivers/net/netconsole.c                      |   6 +-
 drivers/net/npcm750_eth.c                     |  32 +-
 drivers/net/octeon/octeon_eth.c               |   6 +-
 drivers/net/qe/dm_qe_uec.c                    |   8 +-
 drivers/net/sun8i_emac.c                      |  38 +--
 drivers/net/ti/davinci_emac.c                 |  20 +-
 drivers/phy/phy-ti-am654.c                    |   8 +-
 drivers/pinctrl/nxp/pinctrl-imx.h             |   2 +-
 drivers/pinctrl/nxp/pinctrl-imx7ulp.c         |   4 +-
 drivers/pinctrl/nxp/pinctrl-imx8ulp.c         |   4 +-
 drivers/pinctrl/nxp/pinctrl-mxs.c             |   6 +-
 drivers/pinctrl/nxp/pinctrl-mxs.h             |   6 +-
 drivers/pinctrl/pinctrl-zynqmp.c              |   8 +-
 drivers/qe/qe.c                               |   4 +-
 drivers/ram/aspeed/sdram_ast2600.c            |  12 +-
 drivers/ram/octeon/octeon_ddr.c               |   8 +-
 drivers/ram/rockchip/dmc-rk3368.c             |   2 +-
 drivers/serial/ns16550.c                      |  12 +-
 drivers/serial/serial_omap.c                  |   6 +-
 drivers/serial/usbtty.c                       |  28 +-
 drivers/serial/usbtty.h                       |  18 +-
 drivers/spi/mxc_spi.c                         |   6 +-
 drivers/timer/mpc83xx_timer.c                 |   6 +-
 drivers/ufs/ufs.h                             |   2 +-
 drivers/usb/gadget/ci_udc.c                   |  10 +-
 drivers/usb/gadget/ci_udc.h                   |   6 +-
 drivers/usb/host/ehci-faraday.c               |   6 +-
 drivers/usb/host/ehci-tegra.c                 |   6 +-
 drivers/usb/musb-new/linux-compat.h           |   4 +-
 drivers/usb/musb-new/musb_core.c              |   4 +-
 drivers/usb/musb-new/musb_core.h              |   2 +-
 drivers/usb/ulpi/omap-ulpi-viewport.c         |   2 +-
 drivers/usb/ulpi/ulpi-viewport.c              |   2 +-
 drivers/usb/ulpi/ulpi.c                       |   2 +-
 include/command.h                             |   4 +-
 include/env_callback.h                        |   6 +-
 include/fm_eth.h                              |  28 +-
 include/fsl_ddr_sdram.h                       |  16 +-
 include/fsl_usb.h                             |  42 +--
 include/usb/ulpi.h                            |   4 +-
 lib/gzip.c                                    |  14 +-
 lib/time.c                                    |   6 +-
 net/bootp.c                                   |  14 +-
 137 files changed, 1087 insertions(+), 1087 deletions(-)
README +12 -12
index fe571f7ef0a6..40619ee40c54 100644
@@ -445,12 +445,12 @@ The following options need to be configured:
 		example "env grep" and "setexpr".
 
 - Watchdog:
-		CONFIG_SYS_WATCHDOG_FREQ
+		CFG_SYS_WATCHDOG_FREQ
 		Some platforms automatically call WATCHDOG_RESET()
 		from the timer interrupt handler every
-		CONFIG_SYS_WATCHDOG_FREQ interrupts. If not set by the
+		CFG_SYS_WATCHDOG_FREQ interrupts. If not set by the
 		board configuration file, a default of CONFIG_SYS_HZ/2
-		(i.e. 500) is used. Setting CONFIG_SYS_WATCHDOG_FREQ
+		(i.e. 500) is used. Setting CFG_SYS_WATCHDOG_FREQ
 		to 0 disables calling WATCHDOG_RESET() from the timer
 		interrupt.
 
@@ -523,7 +523,7 @@ The following options need to be configured:
 			CONFIG_LAN91C96_USE_32_BIT
 			Define this to enable 32 bit addressing
 
-			CONFIG_SYS_DAVINCI_EMAC_PHY_COUNT
+			CFG_SYS_DAVINCI_EMAC_PHY_COUNT
 			Define this if you have more then 3 PHYs.
 
 		CONFIG_FTGMAC100
@@ -653,7 +653,7 @@ The following options need to be configured:
 		To enable the ULPI layer support, define CONFIG_USB_ULPI and
 		CONFIG_USB_ULPI_VIEWPORT in your board configuration file.
 		If your ULPI phy needs a different reference clock than the
-		standard 24 MHz then you have to define CONFIG_ULPI_REF_CLK to
+		standard 24 MHz then you have to define CFG_ULPI_REF_CLK to
 		the appropriate value in Hz.
 
 - MMC Support:
@@ -734,7 +734,7 @@ The following options need to be configured:
 		4th and following
 		BOOTP requests:		delay 0 ... 8 sec
 
-		CONFIG_BOOTP_ID_CACHE_SIZE
+		CFG_BOOTP_ID_CACHE_SIZE
 
 		BOOTP packets are uniquely identified using a 32-bit ID. The
 		server will copy the ID from client requests to responses and
@@ -747,7 +747,7 @@ The following options need to be configured:
 		time is too long, U-Boot will retransmit requests. In order
 		to allow earlier responses to still be accepted after these
 		retransmissions, U-Boot's BOOTP client keeps a small cache of
-		IDs. The CONFIG_BOOTP_ID_CACHE_SIZE controls the size of this
+		IDs. The CFG_BOOTP_ID_CACHE_SIZE controls the size of this
 		cache. The default is to keep IDs for up to four outstanding
 		requests. Increasing this will allow U-Boot to accept offers
 		from a BOOTP client in networks with unusually high latency.
@@ -832,11 +832,11 @@ The following options need to be configured:
 		status LED backend implementation. Define CONFIG_LED_STATUS_GPIO
 		to include the gpio_led driver in the U-Boot binary.
 
-		CONFIG_GPIO_LED_INVERTED_TABLE
+		CFG_GPIO_LED_INVERTED_TABLE
 		Some GPIO connected LEDs may have inverted polarity in which
 		case the GPIO high value corresponds to LED off state and
 		GPIO low value corresponds to LED on state.
-		In such cases CONFIG_GPIO_LED_INVERTED_TABLE may be defined
+		In such cases CFG_GPIO_LED_INVERTED_TABLE may be defined
 		with a list of GPIO LEDs that have inverted polarity.
 
 - I2C Support:
@@ -993,7 +993,7 @@ The following options need to be configured:
 		SPI EEPROM, also an instance works with Crystal A/D and
 		D/As on the SACSng board)
 
-		CONFIG_SYS_SPI_MXC_WAIT
+		CFG_SYS_SPI_MXC_WAIT
 		Timeout for waiting until spi transfer completed.
 		default: (CONFIG_SYS_HZ/100)     /* 10 ms */
 
@@ -1023,7 +1023,7 @@ The following options need to be configured:
 		If defined, a function that provides delays in the FPGA
 		configuration driver.
 
-		CONFIG_SYS_FPGA_CHECK_ERROR
+		CFG_SYS_FPGA_CHECK_ERROR
 
 		Check for configuration errors during FPGA bitfile
 		loading. For example, abort during Virtex II
@@ -1319,7 +1319,7 @@ Configuration Settings:
 - CONFIG_SYS_LONGHELP: Defined when you want long help messages included;
 		undefine this when you're short of memory.
 
-- CONFIG_SYS_HELP_CMD_WIDTH: Defined when you want to override the default
+- CFG_SYS_HELP_CMD_WIDTH: Defined when you want to override the default
 		width of the commands listed in the 'help' command output.
 
 - CONFIG_SYS_PROMPT:	This is what U-Boot prints on the console to
arch/arm/cpu/armv8/fsl-layerscape/cpu.c +83 -83

346 lines not on this page · raw message

arch/arm/include/asm/arch-fsl-layerscape/cpu.h +48 -48

125 lines not on this page · raw message

arch/arm/include/asm/arch-rockchip/ddr_rk3288.h +1 -1
index 979d5470e7a2..43ccae10bdf0 100644
@@ -360,7 +360,7 @@ check_member(rk3288_msch, devtodev, 0x003c);
 #define PCTL_STAT_MSK			7
 #define INIT_MEM			0
 #define CONFIG				1
-#define CONFIG_REQ			2
+#define CFG_REQ			2
 #define ACCESS				3
 #define ACCESS_REQ			4
 #define LOW_POWER			5
arch/arm/include/asm/arch-rockchip/sdram_rk322x.h +1 -1
index 6f6c5c9954fb..0d29aefb646f 100644
@@ -415,7 +415,7 @@ struct rk322x_base_params {
 #define PCTL_STAT_MASK			7
 #define INIT_MEM			0
 #define CONFIG				1
-#define CONFIG_REQ			2
+#define CFG_REQ			2
 #define ACCESS				3
 #define ACCESS_REQ			4
 #define LOW_POWER			5
arch/arm/include/asm/arch-sunxi/i2c.h +1 -1
index e3dcfdf37082..f0da46d863cf 100644
@@ -14,7 +14,7 @@
 #define CFG_I2C_MVTWSI_BASE1	SUNXI_TWI1_BASE
 #endif
 #ifdef CONFIG_R_I2C_ENABLE
-#define CONFIG_I2C_MVTWSI_BASE2 SUNXI_R_TWI_BASE
+#define CFG_I2C_MVTWSI_BASE2 SUNXI_R_TWI_BASE
 #endif
 
 /* This is abp0-clk on sun4i/5i/7i / abp1-clk on sun6i/sun8i which is 24MHz */
arch/arm/mach-omap2/fdt-common.c +2 -2
index 5eb044731230..e90d5776703d 100644
@@ -17,8 +17,8 @@
 #ifndef TI_OMAP5_SECURE_BOOT_RESV_SRAM_SZ
 #define TI_OMAP5_SECURE_BOOT_RESV_SRAM_SZ (0)
 #endif
-#ifndef CONFIG_SECURE_RUNTIME_RESV_SRAM_SZ
-#define CONFIG_SECURE_RUNTIME_RESV_SRAM_SZ (0)
+#ifndef CFG_SECURE_RUNTIME_RESV_SRAM_SZ
+#define CFG_SECURE_RUNTIME_RESV_SRAM_SZ (0)
 #endif
 
 int ft_hs_disable_rng(void *fdt, struct bd_info *bd)
arch/arm/mach-omap2/omap5/fdt.c +4 -4
index c4162420f3a7..a8c301c6c28f 100644
@@ -19,8 +19,8 @@
 #ifndef TI_OMAP5_SECURE_BOOT_RESV_SRAM_SZ
 #define TI_OMAP5_SECURE_BOOT_RESV_SRAM_SZ (0)
 #endif
-#ifndef CONFIG_SECURE_RUNTIME_RESV_SRAM_SZ
-#define CONFIG_SECURE_RUNTIME_RESV_SRAM_SZ (0)
+#ifndef CFG_SECURE_RUNTIME_RESV_SRAM_SZ
+#define CFG_SECURE_RUNTIME_RESV_SRAM_SZ (0)
 #endif
 
 static u32 hs_irq_skip[] = {
@@ -92,7 +92,7 @@ static int ft_hs_fixup_crossbar(void *fdt, struct bd_info *bd)
 }
 
 #if ((TI_OMAP5_SECURE_BOOT_RESV_SRAM_SZ != 0) || \
-    (CONFIG_SECURE_RUNTIME_RESV_SRAM_SZ != 0))
+    (CFG_SECURE_RUNTIME_RESV_SRAM_SZ != 0))
 static int ft_hs_fixup_sram(void *fdt, struct bd_info *bd)
 {
 	const char *path;
@@ -116,7 +116,7 @@ static int ft_hs_fixup_sram(void *fdt, struct bd_info *bd)
 	temp[0] = cpu_to_fdt32(0);
 	/* reservation size */
 	temp[1] = cpu_to_fdt32(max(TI_OMAP5_SECURE_BOOT_RESV_SRAM_SZ,
-				   CONFIG_SECURE_RUNTIME_RESV_SRAM_SZ));
+				   CFG_SECURE_RUNTIME_RESV_SRAM_SZ));
 	fdt_delprop(fdt, offs, "reg");
 	ret = fdt_setprop(fdt, offs, "reg", temp, 2 * sizeof(u32));
 	if (ret < 0) {
arch/arm/mach-rmobile/include/mach/rcar-mstp.h +48 -48

126 lines not on this page · raw message

arch/arm/mach-rockchip/rk3036/sdram_rk3036.c +1 -1
index 6ae254e99af5..fcae65b2e5a1 100644
@@ -198,7 +198,7 @@ enum {
 	/* PCTL_STAT */
 	INIT_MEM			= 0,
 	CONFIG,
-	CONFIG_REQ,
+	CFG_REQ,
 	ACCESS,
 	ACCESS_REQ,
 	LOW_POWER,
arch/arm/mach-tegra/tegra20/warmboot_avp.c +1 -1
index be801d108e37..94ce762e01f5 100644
@@ -34,7 +34,7 @@ void wb_start(void)
 	u32 reg;
 
 	/* enable JTAG & TBE */
-	writel(CONFIG_CTL_TBE | CONFIG_CTL_JTAG, &apb_misc->cfg_ctl);
+	writel(CFG_CTL_TBE | CFG_CTL_JTAG, &apb_misc->cfg_ctl);
 
 	/* Are we running where we're supposed to be? */
 	asm volatile (
arch/arm/mach-tegra/tegra20/warmboot_avp.h +2 -2
index 19a476b89571..f300fe66254b 100644
@@ -19,8 +19,8 @@
 
 #define USEC_CFG_DIVISOR_MASK		0xffff
 
-#define CONFIG_CTL_TBE			(1 << 7)
-#define CONFIG_CTL_JTAG			(1 << 6)
+#define CFG_CTL_TBE			(1 << 7)
+#define CFG_CTL_JTAG			(1 << 6)
 
 #define CPU_RST				(1 << 0)
 #define CLK_ENB_CPU			(1 << 0)
arch/m68k/cpu/mcf523x/interrupts.c +4 -4
index b554c51fcbe3..331288e00602 100644
@@ -13,7 +13,7 @@
 
 int interrupt_init(void)
 {
-	int0_t *intp = (int0_t *) (CONFIG_SYS_INTR_BASE);
+	int0_t *intp = (int0_t *) (CFG_SYS_INTR_BASE);
 
 	/* Make sure all interrupts are disabled */
 	setbits_be32(&intp->imrl0, 0x1);
@@ -25,10 +25,10 @@ int interrupt_init(void)
 #if defined(CONFIG_MCFTMR)
 void dtimer_intr_setup(void)
 {
-	int0_t *intp = (int0_t *) (CONFIG_SYS_INTR_BASE);
+	int0_t *intp = (int0_t *) (CFG_SYS_INTR_BASE);
 
-	out_8(&intp->icr0[CONFIG_SYS_TMRINTR_NO], CONFIG_SYS_TMRINTR_PRI);
+	out_8(&intp->icr0[CFG_SYS_TMRINTR_NO], CFG_SYS_TMRINTR_PRI);
 	clrbits_be32(&intp->imrl0, INTC_IPRL_INT0);
-	clrbits_be32(&intp->imrl0, CONFIG_SYS_TMRINTR_MASK);
+	clrbits_be32(&intp->imrl0, CFG_SYS_TMRINTR_MASK);
 }
 #endif
arch/m68k/cpu/mcf52x2/interrupts.c +7 -7
index 35ed1e7901ba..e8a1e132d278 100644
@@ -37,10 +37,10 @@ int interrupt_init(void)
 #if defined(CONFIG_MCFTMR)
 void dtimer_intr_setup(void)
 {
-	intctrl_t *intp = (intctrl_t *) (CONFIG_SYS_INTR_BASE);
+	intctrl_t *intp = (intctrl_t *) (CFG_SYS_INTR_BASE);
 
 	clrbits_be32(&intp->int_icr1, INT_ICR1_TMR3MASK);
-	setbits_be32(&intp->int_icr1, CONFIG_SYS_TMRINTR_PRI);
+	setbits_be32(&intp->int_icr1, CFG_SYS_TMRINTR_PRI);
 }
 #endif				/* CONFIG_MCFTMR */
 #endif				/* CONFIG_M5272 */
@@ -49,7 +49,7 @@ void dtimer_intr_setup(void)
     defined(CONFIG_M5271) || defined(CONFIG_M5275)
 int interrupt_init(void)
 {
-	int0_t *intp = (int0_t *) (CONFIG_SYS_INTR_BASE);
+	int0_t *intp = (int0_t *) (CFG_SYS_INTR_BASE);
 
 	/* Make sure all interrupts are disabled */
 #if defined(CONFIG_M5208)
@@ -66,11 +66,11 @@ int interrupt_init(void)
 #if defined(CONFIG_MCFTMR)
 void dtimer_intr_setup(void)
 {
-	int0_t *intp = (int0_t *) (CONFIG_SYS_INTR_BASE);
+	int0_t *intp = (int0_t *) (CFG_SYS_INTR_BASE);
 
-	out_8(&intp->icr0[CONFIG_SYS_TMRINTR_NO], CONFIG_SYS_TMRINTR_PRI);
+	out_8(&intp->icr0[CFG_SYS_TMRINTR_NO], CFG_SYS_TMRINTR_PRI);
 	clrbits_be32(&intp->imrl0, 0x00000001);
-	clrbits_be32(&intp->imrl0, CONFIG_SYS_TMRINTR_MASK);
+	clrbits_be32(&intp->imrl0, CFG_SYS_TMRINTR_MASK);
 }
 #endif				/* CONFIG_MCFTMR */
 #endif				/* CONFIG_M5282 | CONFIG_M5271 | CONFIG_M5275 */
@@ -87,7 +87,7 @@ int interrupt_init(void)
 void dtimer_intr_setup(void)
 {
 	mbar_writeLong(MCFSIM_IMR, mbar_readLong(MCFSIM_IMR) & ~0x00000400);
-	mbar_writeByte(MCFSIM_TIMER2ICR, CONFIG_SYS_TMRINTR_PRI);
+	mbar_writeByte(MCFSIM_TIMER2ICR, CFG_SYS_TMRINTR_PRI);
 }
 #endif				/* CONFIG_MCFTMR */
 #endif				/* CONFIG_M5249 || CONFIG_M5253 */
arch/m68k/cpu/mcf530x/interrupts.c +1 -1
index 2659e3478f04..11686202dc73 100644
@@ -24,6 +24,6 @@ void dtimer_intr_setup(void)
 	/* clearing TIMER2 mask, so enabling the related interrupt */
 	out_be32(&icr->imr, in_be32(&icr->imr) & ~0x00000400);
 	/* set TIMER2 interrupt priority */
-	out_8(&icr->icr2, CONFIG_SYS_TMRINTR_PRI);
+	out_8(&icr->icr2, CFG_SYS_TMRINTR_PRI);
 }
 #endif
arch/m68k/cpu/mcf532x/interrupts.c +4 -4
index 8f2df452baee..64e04664a52b 100644
@@ -13,7 +13,7 @@
 
 int interrupt_init(void)
 {
-	int0_t *intp = (int0_t *) (CONFIG_SYS_INTR_BASE);
+	int0_t *intp = (int0_t *) (CFG_SYS_INTR_BASE);
 
 	/* Make sure all interrupts are disabled */
 	setbits_be32(&intp->imrh0, 0xffffffff);
@@ -26,9 +26,9 @@ int interrupt_init(void)
 #if defined(CONFIG_MCFTMR)
 void dtimer_intr_setup(void)
 {
-	int0_t *intp = (int0_t *) (CONFIG_SYS_INTR_BASE);
+	int0_t *intp = (int0_t *) (CFG_SYS_INTR_BASE);
 
-	out_8(&intp->icr0[CONFIG_SYS_TMRINTR_NO], CONFIG_SYS_TMRINTR_PRI);
-	clrbits_be32(&intp->imrh0, CONFIG_SYS_TMRINTR_MASK);
+	out_8(&intp->icr0[CFG_SYS_TMRINTR_NO], CFG_SYS_TMRINTR_PRI);
+	clrbits_be32(&intp->imrh0, CFG_SYS_TMRINTR_MASK);
 }
 #endif
arch/m68k/cpu/mcf5445x/interrupts.c +4 -4
index 5a6a88cd5713..ea0cf87990c9 100644
@@ -16,7 +16,7 @@
 
 int interrupt_init(void)
 {
-	int0_t *intp = (int0_t *) (CONFIG_SYS_INTR_BASE);
+	int0_t *intp = (int0_t *) (CFG_SYS_INTR_BASE);
 
 	/* Make sure all interrupts are disabled */
 	setbits_be32(&intp->imrh0, 0xffffffff);
@@ -29,9 +29,9 @@ int interrupt_init(void)
 #if defined(CONFIG_MCFTMR)
 void dtimer_intr_setup(void)
 {
-	int0_t *intp = (int0_t *) (CONFIG_SYS_INTR_BASE);
+	int0_t *intp = (int0_t *) (CFG_SYS_INTR_BASE);
 
-	out_8(&intp->icr0[CONFIG_SYS_TMRINTR_NO], CONFIG_SYS_TMRINTR_PRI);
-	clrbits_be32(&intp->imrh0, CONFIG_SYS_TMRINTR_MASK);
+	out_8(&intp->icr0[CFG_SYS_TMRINTR_NO], CFG_SYS_TMRINTR_PRI);
+	clrbits_be32(&intp->imrh0, CFG_SYS_TMRINTR_MASK);
 }
 #endif
arch/m68k/include/asm/cache.h +21 -21

103 lines not on this page · raw message

arch/m68k/include/asm/coldfire/intctrl.h +4 -4
index f7f0f07d30f0..3f7c458ef083 100644
@@ -12,7 +12,7 @@
 #if defined(CONFIG_M5235) || defined(CONFIG_M5271) || \
     defined(CONFIG_M5275) || defined(CONFIG_M5282) || \
     defined(CONFIG_M547x)
-#	define	CONFIG_SYS_CF_INTC_REG1
+#	define	CFG_SYS_CF_INTC_REG1
 #endif
 
 typedef struct int0_ctrl {
@@ -23,7 +23,7 @@ typedef struct int0_ctrl {
 	u32 imrl0;		/* 0x0C Mask Low */
 	u32 frch0;		/* 0x10 Force High */
 	u32 frcl0;		/* 0x14 Force Low */
-#if defined(CONFIG_SYS_CF_INTC_REG1)
+#if defined(CFG_SYS_CF_INTC_REG1)
 	u8 irlr;		/* 0x18 */
 	u8 iacklpr;		/* 0x19 */
 	u16 res1[19];		/* 0x1a - 0x3c */
@@ -64,7 +64,7 @@ typedef struct int1_ctrl {
 	u32 imrl1;		/* 0x0C Mask Low */
 	u32 frch1;		/* 0x10 Force High */
 	u32 frcl1;		/* 0x14 Force Low */
-#if defined(CONFIG_SYS_CF_INTC_REG1)
+#if defined(CFG_SYS_CF_INTC_REG1)
 	u8 irlr;		/* 0x18 */
 	u8 iacklpr;		/* 0x19 */
 	u16 res1[19];		/* 0x1a - 0x3c */
@@ -192,7 +192,7 @@ typedef struct intgack_ctrl1 {
 #define INTC_IACKLPR_PRI(x)		((x) & 0x0F)
 #define INTC_IACKLPR_PRI_MASK		(0xF0)
 
-#if defined(CONFIG_SYS_CF_INTC_REG1)
+#if defined(CFG_SYS_CF_INTC_REG1)
 #define INTC_ICR_IL(x)			(((x) & 0x07) << 3)
 #define INTC_ICR_IL_MASK		(0xC7)
 #define INTC_ICR_IP(x)			((x) & 0x07)
arch/m68k/include/asm/immap.h +145 -145

432 lines not on this page · raw message

arch/m68k/lib/cache.c +14 -14
index 4ddda69f5a38..57e5632fdb5b 100644
@@ -33,12 +33,12 @@ void icache_enable(void)
 
 	*cf_icache_status = 1;
 
-#if defined(CONFIG_CF_V4) || defined(CONFIG_CF_V4E)
+#if defined(CONFIG_CF_V4) || defined(CFG_CF_V4E)
 	__asm__ __volatile__("movec %0, %%acr2"::"r"(CFG_SYS_CACHE_ACR2));
-	__asm__ __volatile__("movec %0, %%acr3"::"r"(CONFIG_SYS_CACHE_ACR3));
-#if defined(CONFIG_CF_V4E)
-	__asm__ __volatile__("movec %0, %%acr6"::"r"(CONFIG_SYS_CACHE_ACR6));
-	__asm__ __volatile__("movec %0, %%acr7"::"r"(CONFIG_SYS_CACHE_ACR7));
+	__asm__ __volatile__("movec %0, %%acr3"::"r"(CFG_SYS_CACHE_ACR3));
+#if defined(CFG_CF_V4E)
+	__asm__ __volatile__("movec %0, %%acr6"::"r"(CFG_SYS_CACHE_ACR6));
+	__asm__ __volatile__("movec %0, %%acr7"::"r"(CFG_SYS_CACHE_ACR7));
 #endif
 #else
 	__asm__ __volatile__("movec %0, %%acr0"::"r"(CFG_SYS_CACHE_ACR0));
@@ -55,10 +55,10 @@ void icache_disable(void)
 	*cf_icache_status = 0;
 	icache_invalid();
 
-#if defined(CONFIG_CF_V4) || defined(CONFIG_CF_V4E)
+#if defined(CONFIG_CF_V4) || defined(CFG_CF_V4E)
 	__asm__ __volatile__("movec %0, %%acr2"::"r"(temp));
 	__asm__ __volatile__("movec %0, %%acr3"::"r"(temp));
-#if defined(CONFIG_CF_V4E)
+#if defined(CFG_CF_V4E)
 	__asm__ __volatile__("movec %0, %%acr6"::"r"(temp));
 	__asm__ __volatile__("movec %0, %%acr7"::"r"(temp));
 #endif
@@ -88,12 +88,12 @@ void dcache_enable(void)
 	dcache_invalid();
 	*cf_dcache_status = 1;
 
-#if defined(CONFIG_CF_V4) || defined(CONFIG_CF_V4E)
+#if defined(CONFIG_CF_V4) || defined(CFG_CF_V4E)
 	__asm__ __volatile__("movec %0, %%acr0"::"r"(CFG_SYS_CACHE_ACR0));
 	__asm__ __volatile__("movec %0, %%acr1"::"r"(CFG_SYS_CACHE_ACR1));
-#if defined(CONFIG_CF_V4E)
-	__asm__ __volatile__("movec %0, %%acr4"::"r"(CONFIG_SYS_CACHE_ACR4));
-	__asm__ __volatile__("movec %0, %%acr5"::"r"(CONFIG_SYS_CACHE_ACR5));
+#if defined(CFG_CF_V4E)
+	__asm__ __volatile__("movec %0, %%acr4"::"r"(CFG_SYS_CACHE_ACR4));
+	__asm__ __volatile__("movec %0, %%acr5"::"r"(CFG_SYS_CACHE_ACR5));
 #endif
 #endif
 
@@ -109,10 +109,10 @@ void dcache_disable(void)
 
 	__asm__ __volatile__("movec %0, %%cacr"::"r"(temp));
 
-#if defined(CONFIG_CF_V4) || defined(CONFIG_CF_V4E)
+#if defined(CONFIG_CF_V4) || defined(CFG_CF_V4E)
 	__asm__ __volatile__("movec %0, %%acr0"::"r"(temp));
 	__asm__ __volatile__("movec %0, %%acr1"::"r"(temp));
-#if defined(CONFIG_CF_V4E)
+#if defined(CFG_CF_V4E)
 	__asm__ __volatile__("movec %0, %%acr4"::"r"(temp));
 	__asm__ __volatile__("movec %0, %%acr5"::"r"(temp));
 #endif
@@ -121,7 +121,7 @@ void dcache_disable(void)
 
 void dcache_invalid(void)
 {
-#if defined(CONFIG_CF_V4) || defined(CONFIG_CF_V4E)
+#if defined(CONFIG_CF_V4) || defined(CFG_CF_V4E)
 	u32 temp;
 
 	temp = CFG_SYS_DCACHE_INV;
arch/m68k/lib/interrupts.c +1 -1
index 1caef61d20e9..799daab5612d 100644
@@ -14,7 +14,7 @@
 #include <asm/immap.h>
 #include <asm/ptrace.h>
 
-#define	NR_IRQS		(CONFIG_SYS_NUM_IRQS)
+#define	NR_IRQS		(CFG_SYS_NUM_IRQS)
 
 /*
  * Interrupt vector functions.
arch/m68k/lib/time.c +12 -12
index cd7437b3e22e..2ce69088d94c 100644
@@ -21,23 +21,23 @@ DECLARE_GLOBAL_DATA_PTR;
 
 static volatile ulong timestamp = 0;
 
-#ifndef CONFIG_SYS_WATCHDOG_FREQ
-#define CONFIG_SYS_WATCHDOG_FREQ (CONFIG_SYS_HZ / 2)
+#ifndef CFG_SYS_WATCHDOG_FREQ
+#define CFG_SYS_WATCHDOG_FREQ (CONFIG_SYS_HZ / 2)
 #endif
 
 #if defined(CONFIG_MCFTMR)
-#ifndef CONFIG_SYS_UDELAY_BASE
+#ifndef CFG_SYS_UDELAY_BASE
 #	error	"uDelay base not defined!"
 #endif
 
-#if !defined(CONFIG_SYS_TMR_BASE) || !defined(CONFIG_SYS_INTR_BASE) || !defined(CONFIG_SYS_TMRINTR_NO) || !defined(CONFIG_SYS_TMRINTR_MASK)
+#if !defined(CFG_SYS_TMR_BASE) || !defined(CFG_SYS_INTR_BASE) || !defined(CFG_SYS_TMRINTR_NO) || !defined(CFG_SYS_TMRINTR_MASK)
 #	error	"TMR_BASE, INTR_BASE, TMRINTR_NO or TMRINTR_MASk not defined!"
 #endif
 extern void dtimer_intr_setup(void);
 
 void __udelay(unsigned long usec)
 {
-	volatile dtmr_t *timerp = (dtmr_t *) (CONFIG_SYS_UDELAY_BASE);
+	volatile dtmr_t *timerp = (dtmr_t *) (CFG_SYS_UDELAY_BASE);
 	uint start, now, tmp;
 
 	while (usec > 0) {
@@ -52,7 +52,7 @@ void __udelay(unsigned long usec)
 		timerp->tcn = 0;
 		/* set period to 1 us */
 		timerp->tmr =
-		    CONFIG_SYS_TIMER_PRESCALER | DTIM_DTMR_CLK_DIV1 | DTIM_DTMR_FRR |
+		    CFG_SYS_TIMER_PRESCALER | DTIM_DTMR_CLK_DIV1 | DTIM_DTMR_FRR |
 		    DTIM_DTMR_RST_EN;
 
 		start = now = timerp->tcn;
@@ -63,15 +63,15 @@ void __udelay(unsigned long usec)
 
 void dtimer_interrupt(void *not_used)
 {
-	volatile dtmr_t *timerp = (dtmr_t *) (CONFIG_SYS_TMR_BASE);
+	volatile dtmr_t *timerp = (dtmr_t *) (CFG_SYS_TMR_BASE);
 
 	/* check for timer interrupt asserted */
-	if ((CONFIG_SYS_TMRPND_REG & CONFIG_SYS_TMRINTR_MASK) == CONFIG_SYS_TMRINTR_PEND) {
+	if ((CFG_SYS_TMRPND_REG & CFG_SYS_TMRINTR_MASK) == CFG_SYS_TMRINTR_PEND) {
 		timerp->ter = (DTIM_DTER_CAP | DTIM_DTER_REF);
 		timestamp++;
 
 		#if defined(CONFIG_WATCHDOG) || defined (CONFIG_HW_WATCHDOG)
-		if (CONFIG_SYS_WATCHDOG_FREQ && (timestamp % (CONFIG_SYS_WATCHDOG_FREQ)) == 0) {
+		if (CFG_SYS_WATCHDOG_FREQ && (timestamp % (CFG_SYS_WATCHDOG_FREQ)) == 0) {
 			schedule();
 		}
 		#endif    /* CONFIG_WATCHDOG || CONFIG_HW_WATCHDOG */
@@ -81,7 +81,7 @@ void dtimer_interrupt(void *not_used)
 
 int timer_init(void)
 {
-	volatile dtmr_t *timerp = (dtmr_t *) (CONFIG_SYS_TMR_BASE);
+	volatile dtmr_t *timerp = (dtmr_t *) (CFG_SYS_TMR_BASE);
 
 	timestamp = 0;
 
@@ -92,7 +92,7 @@ int timer_init(void)
 	timerp->tmr = DTIM_DTMR_RST_RST;
 
 	/* initialize and enable timer interrupt */
-	irq_install_handler(CONFIG_SYS_TMRINTR_NO, dtimer_interrupt, 0);
+	irq_install_handler(CFG_SYS_TMRINTR_NO, dtimer_interrupt, 0);
 
 	timerp->tcn = 0;
 	timerp->trr = 1000;	/* Interrupt every ms */
@@ -100,7 +100,7 @@ int timer_init(void)
 	dtimer_intr_setup();
 
 	/* set a period of 1us, set timer mode to restart and enable timer and interrupt */
-	timerp->tmr = CONFIG_SYS_TIMER_PRESCALER | DTIM_DTMR_CLK_DIV1 |
+	timerp->tmr = CFG_SYS_TIMER_PRESCALER | DTIM_DTMR_CLK_DIV1 |
 	    DTIM_DTMR_FRR | DTIM_DTMR_ORRI | DTIM_DTMR_RST_EN;
 
 	return 0;
arch/mips/mach-mtmips/mt7621/spl/start.S +4 -4
index 7063f32610b7..d2f9c031cbae 100644
@@ -17,8 +17,8 @@
 #include "../mt7621.h"
 #include "dram.h"
 
-#ifndef CONFIG_SYS_INIT_SP_ADDR
-#define CONFIG_SYS_INIT_SP_ADDR	(CFG_SYS_SDRAM_BASE + \
+#ifndef CFG_SYS_INIT_SP_ADDR
+#define CFG_SYS_INIT_SP_ADDR	(CFG_SYS_SDRAM_BASE + \
 				CFG_SYS_INIT_SP_OFFSET)
 #endif
 
@@ -31,7 +31,7 @@
 
 	.macro setup_stack_gd
 	li	t0, -16
-	PTR_LI	t1, CONFIG_SYS_INIT_SP_ADDR
+	PTR_LI	t1, CFG_SYS_INIT_SP_ADDR
 	and	sp, t1, t0		# force 16 byte alignment
 	PTR_SUBU \
 		sp, sp, GD_SIZE		# reserve space for gd
@@ -201,7 +201,7 @@ ENTRY(_start)
 
 #if CONFIG_IS_ENABLED(INIT_STACK_WITHOUT_MALLOC_F)
 	/* Set malloc base */
-	li	t0, (CONFIG_SYS_INIT_SP_ADDR + 15) & (~15)
+	li	t0, (CFG_SYS_INIT_SP_ADDR + 15) & (~15)
 	PTR_S	t0, GD_MALLOC_BASE(k0)	# gd->malloc_base offset
 #endif
 
arch/powerpc/cpu/mpc83xx/bats/bats.h +64 -64

287 lines not on this page · raw message

arch/powerpc/cpu/mpc83xx/cpu_init.c +13 -13
index 63c2729411c7..2af5c89ae522 100644
@@ -208,24 +208,24 @@ void cpu_init_f (volatile immap_t * im)
 	init_early_memctl_regs();
 
 	/* Local Access window setup */
-#if defined(CONFIG_SYS_LBLAWBAR0_PRELIM) && defined(CONFIG_SYS_LBLAWAR0_PRELIM)
-	im->sysconf.lblaw[0].bar = CONFIG_SYS_LBLAWBAR0_PRELIM;
-	im->sysconf.lblaw[0].ar = CONFIG_SYS_LBLAWAR0_PRELIM;
+#if defined(CFG_SYS_LBLAWBAR0_PRELIM) && defined(CFG_SYS_LBLAWAR0_PRELIM)
+	im->sysconf.lblaw[0].bar = CFG_SYS_LBLAWBAR0_PRELIM;
+	im->sysconf.lblaw[0].ar = CFG_SYS_LBLAWAR0_PRELIM;
 #else
-#error	CONFIG_SYS_LBLAWBAR0_PRELIM & CONFIG_SYS_LBLAWAR0_PRELIM must be defined
+#error	CFG_SYS_LBLAWBAR0_PRELIM & CFG_SYS_LBLAWAR0_PRELIM must be defined
 #endif
 
-#if defined(CONFIG_SYS_LBLAWBAR1_PRELIM) && defined(CONFIG_SYS_LBLAWAR1_PRELIM)
-	im->sysconf.lblaw[1].bar = CONFIG_SYS_LBLAWBAR1_PRELIM;
-	im->sysconf.lblaw[1].ar = CONFIG_SYS_LBLAWAR1_PRELIM;
+#if defined(CFG_SYS_LBLAWBAR1_PRELIM) && defined(CFG_SYS_LBLAWAR1_PRELIM)
+	im->sysconf.lblaw[1].bar = CFG_SYS_LBLAWBAR1_PRELIM;
+	im->sysconf.lblaw[1].ar = CFG_SYS_LBLAWAR1_PRELIM;
 #endif
-#if defined(CONFIG_SYS_LBLAWBAR2_PRELIM) && defined(CONFIG_SYS_LBLAWAR2_PRELIM)
-	im->sysconf.lblaw[2].bar = CONFIG_SYS_LBLAWBAR2_PRELIM;
-	im->sysconf.lblaw[2].ar = CONFIG_SYS_LBLAWAR2_PRELIM;
+#if defined(CFG_SYS_LBLAWBAR2_PRELIM) && defined(CFG_SYS_LBLAWAR2_PRELIM)
+	im->sysconf.lblaw[2].bar = CFG_SYS_LBLAWBAR2_PRELIM;
+	im->sysconf.lblaw[2].ar = CFG_SYS_LBLAWAR2_PRELIM;
 #endif
-#if defined(CONFIG_SYS_LBLAWBAR3_PRELIM) && defined(CONFIG_SYS_LBLAWAR3_PRELIM)
-	im->sysconf.lblaw[3].bar = CONFIG_SYS_LBLAWBAR3_PRELIM;
-	im->sysconf.lblaw[3].ar = CONFIG_SYS_LBLAWAR3_PRELIM;
+#if defined(CFG_SYS_LBLAWBAR3_PRELIM) && defined(CFG_SYS_LBLAWAR3_PRELIM)
+	im->sysconf.lblaw[3].bar = CFG_SYS_LBLAWBAR3_PRELIM;
+	im->sysconf.lblaw[3].ar = CFG_SYS_LBLAWAR3_PRELIM;
 #endif
 #if defined(CONFIG_SYS_LBLAWBAR4_PRELIM) && defined(CONFIG_SYS_LBLAWAR4_PRELIM)
 	im->sysconf.lblaw[4].bar = CONFIG_SYS_LBLAWBAR4_PRELIM;
arch/powerpc/cpu/mpc83xx/hid/hid.h +6 -6
index 9f5260c012c7..089d1d77f0b9 100644
@@ -1,4 +1,4 @@
-#define CONFIG_SYS_HID0_FINAL ( \
+#define CFG_SYS_HID0_FINAL ( \
 	CONFIG_HID0_FINAL_ABE_BIT |\
 	CONFIG_HID0_FINAL_CLKOUT |\
 	CONFIG_HID0_FINAL_DCE_BIT |\
@@ -24,7 +24,7 @@
 	CONFIG_HID0_FINAL_SLEEP_BIT \
 )
 
-#define CONFIG_SYS_HID0_INIT ( \
+#define CFG_SYS_HID0_INIT ( \
 	CONFIG_HID0_INIT_ABE_BIT |\
 	CONFIG_HID0_INIT_CLKOUT |\
 	CONFIG_HID0_INIT_DCE_BIT |\
@@ -50,12 +50,12 @@
 
 #ifdef CONFIG_TARGET_IDS8313
 /* IDS8313 defines a reserved bit; keep to not break compatibility */
-#define CONFIG_HID2_SPECIAL 0x00020000
+#define CFG_HID2_SPECIAL 0x00020000
 #else
-#define CONFIG_HID2_SPECIAL 0x0
+#define CFG_HID2_SPECIAL 0x0
 #endif
 
-#define CONFIG_SYS_HID2 ( \
+#define CFG_SYS_HID2 ( \
 	CONFIG_HID2_LET_BIT |\
 	CONFIG_HID2_IFEB_BIT |\
 	CONFIG_HID2_MESISTATE_BIT |\
@@ -68,5 +68,5 @@
 	CONFIG_HID2_IWLCK |\
 	CONFIG_HID2_ICWP_BIT |\
 	CONFIG_HID2_DWLCK |\
-	CONFIG_HID2_SPECIAL \
+	CFG_HID2_SPECIAL \
 )
arch/powerpc/cpu/mpc83xx/hrcw/hrcw.h +2 -2
index 0f3426789181..7f8787ffb0de 100644
@@ -1,4 +1,4 @@
-#define CONFIG_SYS_HRCW_LOW (\
+#define CFG_SYS_HRCW_LOW (\
 	(CONFIG_LBMC_CLOCK_MODE << (31 - 0)) |\
 	(CONFIG_DDR_MC_CLOCK_MODE << (31 - 1)) |\
 	(CONFIG_SYSTEM_PLL_VCO_DIV << (31 - 3)) |\
@@ -9,7 +9,7 @@
 	(CONFIG_QUICC_MULT_FACTOR << (31 - 31)) \
 	)
 
-#define CONFIG_SYS_HRCW_HIGH (\
+#define CFG_SYS_HRCW_HIGH (\
 	(CONFIG_PCI_HOST_MODE << (31 - 0)) |\
 	(CONFIG_PCI_64BIT_MODE << (31 - 1)) |\
 	(CONFIG_PCI_INT_ARBITER1 << (31 - 2)) |\
arch/powerpc/cpu/mpc83xx/lblaw/lblaw.h +16 -16
index 6972afcc2c70..082b2b9c9a56 100644
@@ -1,55 +1,55 @@
 #if defined(CONFIG_LBLAW0)
-#define CONFIG_SYS_LBLAWBAR0_PRELIM \
+#define CFG_SYS_LBLAWBAR0_PRELIM \
 	CONFIG_LBLAW0_BASE
-#define CONFIG_SYS_LBLAWAR0_PRELIM (\
+#define CFG_SYS_LBLAWAR0_PRELIM (\
 	CONFIG_LBLAW0_ENABLE_BIT |\
 	CONFIG_LBLAW0_LENGTH \
 )
 #endif
 
 #if defined(CONFIG_LBLAW1)
-#define CONFIG_SYS_LBLAWBAR1_PRELIM \
+#define CFG_SYS_LBLAWBAR1_PRELIM \
 	CONFIG_LBLAW1_BASE
-#define CONFIG_SYS_LBLAWAR1_PRELIM (\
+#define CFG_SYS_LBLAWAR1_PRELIM (\
 	CONFIG_LBLAW1_ENABLE_BIT |\
 	CONFIG_LBLAW1_LENGTH \
 )
 #endif
 
 #if defined(CONFIG_LBLAW2)
-#define CONFIG_SYS_LBLAWBAR2_PRELIM \
+#define CFG_SYS_LBLAWBAR2_PRELIM \
 	CONFIG_LBLAW2_BASE
-#define CONFIG_SYS_LBLAWAR2_PRELIM (\
+#define CFG_SYS_LBLAWAR2_PRELIM (\
 	CONFIG_LBLAW2_ENABLE_BIT |\
 	CONFIG_LBLAW2_LENGTH \
 )
 #endif
 
 #if defined(CONFIG_LBLAW3)
-#define CONFIG_SYS_LBLAWBAR3_PRELIM \
+#define CFG_SYS_LBLAWBAR3_PRELIM \
 	CONFIG_LBLAW3_BASE
-#define CONFIG_SYS_LBLAWAR3_PRELIM (\
+#define CFG_SYS_LBLAWAR3_PRELIM (\
 	CONFIG_LBLAW3_ENABLE_BIT |\
 	CONFIG_LBLAW3_LENGTH \
 )
 #endif
 
 #ifdef CONFIG_NAND_LBLAWBAR_PRELIM_0
-#define CONFIG_SYS_NAND_LBLAWBAR_PRELIM CONFIG_SYS_LBLAWBAR0_PRELIM
-#define CONFIG_SYS_NAND_LBLAWAR_PRELIM CONFIG_SYS_LBLAWAR0_PRELIM
+#define CFG_SYS_NAND_LBLAWBAR_PRELIM CFG_SYS_LBLAWBAR0_PRELIM
+#define CFG_SYS_NAND_LBLAWAR_PRELIM CFG_SYS_LBLAWAR0_PRELIM
 #endif
 
 #ifdef CONFIG_NAND_LBLAWBAR_PRELIM_1
-#define CONFIG_SYS_NAND_LBLAWBAR_PRELIM CONFIG_SYS_LBLAWBAR1_PRELIM
-#define CONFIG_SYS_NAND_LBLAWAR_PRELIM CONFIG_SYS_LBLAWAR1_PRELIM
+#define CFG_SYS_NAND_LBLAWBAR_PRELIM CFG_SYS_LBLAWBAR1_PRELIM
+#define CFG_SYS_NAND_LBLAWAR_PRELIM CFG_SYS_LBLAWAR1_PRELIM
 #endif
 
 #ifdef CONFIG_NAND_LBLAWBAR_PRELIM_2
-#define CONFIG_SYS_NAND_LBLAWBAR_PRELIM CONFIG_SYS_LBLAWBAR2_PRELIM
-#define CONFIG_SYS_NAND_LBLAWAR_PRELIM CONFIG_SYS_LBLAWAR2_PRELIM
+#define CFG_SYS_NAND_LBLAWBAR_PRELIM CFG_SYS_LBLAWBAR2_PRELIM
+#define CFG_SYS_NAND_LBLAWAR_PRELIM CFG_SYS_LBLAWAR2_PRELIM
 #endif
 
 #ifdef CONFIG_NAND_LBLAWBAR_PRELIM_3
-#define CONFIG_SYS_NAND_LBLAWBAR_PRELIM CONFIG_SYS_LBLAWBAR3_PRELIM
-#define CONFIG_SYS_NAND_LBLAWAR_PRELIM CONFIG_SYS_LBLAWAR3_PRELIM
+#define CFG_SYS_NAND_LBLAWBAR_PRELIM CFG_SYS_LBLAWBAR3_PRELIM
+#define CFG_SYS_NAND_LBLAWAR_PRELIM CFG_SYS_LBLAWAR3_PRELIM
 #endif
arch/powerpc/cpu/mpc83xx/spd_sdram.c +3 -3
index 4f982b8303ae..6da8fc4381d1 100644
@@ -66,8 +66,8 @@ void board_add_ram_info(int use_default)
 }
 
 #ifdef CONFIG_SPD_EEPROM
-#ifndef	CONFIG_SYS_READ_SPD
-#define CONFIG_SYS_READ_SPD	i2c_read
+#ifndef	CFG_SYS_READ_SPD
+#define CFG_SYS_READ_SPD	i2c_read
 #endif
 #ifndef SPD_EEPROM_OFFSET
 #define SPD_EEPROM_OFFSET	0
@@ -167,7 +167,7 @@ long int spd_sdram()
 	isync();
 
 	/* Read SPD parameters with I2C */
-	CONFIG_SYS_READ_SPD(SPD_EEPROM_ADDRESS, SPD_EEPROM_OFFSET,
+	CFG_SYS_READ_SPD(SPD_EEPROM_ADDRESS, SPD_EEPROM_OFFSET,
 		SPD_EEPROM_ADDR_LEN, (uchar *) &spd, sizeof(spd));
 #ifdef SPD_DEBUG
 	spd_debug(&spd);
arch/powerpc/cpu/mpc83xx/spl_minimal.c +5 -5
index 7cc0383afbfc..b55bfaffcaed 100644
@@ -73,14 +73,14 @@ void cpu_init_f (volatile immap_t * im)
 
 #if defined(CFG_SYS_NAND_BR_PRELIM)  \
 	&& defined(CFG_SYS_NAND_OR_PRELIM) \
-	&& defined(CONFIG_SYS_NAND_LBLAWBAR_PRELIM) \
-	&& defined(CONFIG_SYS_NAND_LBLAWAR_PRELIM)
+	&& defined(CFG_SYS_NAND_LBLAWBAR_PRELIM) \
+	&& defined(CFG_SYS_NAND_LBLAWAR_PRELIM)
 	set_lbc_br(0, CFG_SYS_NAND_BR_PRELIM);
 	set_lbc_or(0, CFG_SYS_NAND_OR_PRELIM);
-	im->sysconf.lblaw[0].bar = CONFIG_SYS_NAND_LBLAWBAR_PRELIM;
-	im->sysconf.lblaw[0].ar = CONFIG_SYS_NAND_LBLAWAR_PRELIM;
+	im->sysconf.lblaw[0].bar = CFG_SYS_NAND_LBLAWBAR_PRELIM;
+	im->sysconf.lblaw[0].ar = CFG_SYS_NAND_LBLAWAR_PRELIM;
 #else
-#error CFG_SYS_NAND_BR_PRELIM, CFG_SYS_NAND_OR_PRELIM, CONFIG_SYS_NAND_LBLAWBAR_PRELIM & CONFIG_SYS_NAND_LBLAWAR_PRELIM must be defined
+#error CFG_SYS_NAND_BR_PRELIM, CFG_SYS_NAND_OR_PRELIM, CFG_SYS_NAND_LBLAWBAR_PRELIM & CFG_SYS_NAND_LBLAWAR_PRELIM must be defined
 #endif
 }
 
arch/powerpc/cpu/mpc83xx/start.S +77 -77

266 lines not on this page · raw message

arch/powerpc/cpu/mpc85xx/cpu_init.c +28 -28

118 lines not on this page · raw message

arch/powerpc/cpu/mpc85xx/fdt.c +5 -5
index 35142508c30e..e26436bf5701 100644
@@ -532,7 +532,7 @@ void fdt_fixup_dma3(void *blob)
 	int nodeoff;
 	ccsr_gur_t __iomem *gur = (void *)(CFG_SYS_MPC85xx_GUTS_ADDR);
 
-#define CONFIG_SYS_ELO3_DMA3 (0xffe000000 + 0x102300)
+#define CFG_SYS_ELO3_DMA3 (0xffe000000 + 0x102300)
 #if defined(CONFIG_ARCH_T2080)
 	u32 srds_prtcl_s2 = in_be32(&gur->rcwsr[4]) &
 				    FSL_CORENET2_RCWSR4_SRDS2_PRTCL;
@@ -554,7 +554,7 @@ void fdt_fixup_dma3(void *blob)
 	case 16:
 #endif
 		nodeoff = fdt_node_offset_by_compat_reg(blob, "fsl,elo3-dma",
-							CONFIG_SYS_ELO3_DMA3);
+							CFG_SYS_ELO3_DMA3);
 		if (nodeoff > 0)
 			fdt_status_disabled(blob, nodeoff);
 		else
@@ -616,11 +616,11 @@ void ft_cpu_setup(void *blob, struct bd_info *bd)
 
 	fdt_add_enet_stashing(blob);
 
-#ifndef CONFIG_FSL_TBCLK_EXTRA_DIV
-#define CONFIG_FSL_TBCLK_EXTRA_DIV 1
+#ifndef CFG_FSL_TBCLK_EXTRA_DIV
+#define CFG_FSL_TBCLK_EXTRA_DIV 1
 #endif
 	do_fixup_by_prop_u32(blob, "device_type", "cpu", 4,
-		"timebase-frequency", get_tbclk() / CONFIG_FSL_TBCLK_EXTRA_DIV,
+		"timebase-frequency", get_tbclk() / CFG_FSL_TBCLK_EXTRA_DIV,
 		1);
 	do_fixup_by_prop_u32(blob, "device_type", "cpu", 4,
 		"bus-frequency", bd->bi_busfreq, 1);
arch/powerpc/cpu/mpc85xx/liodn.c +3 -3
index 18790921dd72..4b8844a4d960 100644
@@ -255,14 +255,14 @@ static void fdt_fixup_srio_liodn(void *blob, struct srio_liodn_id_table *tbl)
 }
 #endif
 
-#define CONFIG_SYS_MAX_PCI_EPS		8
+#define CFG_SYS_MAX_PCI_EPS		8
 
 static void fdt_fixup_pci_liodn_offsets(void *fdt, const char *compat,
 					int ep_liodn_start)
 {
 	int off, pci_idx = 0, pci_cnt = 0, i, rc;
 	const uint32_t *base_liodn;
-	uint32_t liodn_offs[CONFIG_SYS_MAX_PCI_EPS + 1] = { 0 };
+	uint32_t liodn_offs[CFG_SYS_MAX_PCI_EPS + 1] = { 0 };
 
 	/*
 	 * Count the number of pci nodes.
@@ -282,7 +282,7 @@ static void fdt_fixup_pci_liodn_offsets(void *fdt, const char *compat,
 			       path, fdt_strerror(rc));
 			continue;
 		}
-		for (i = 0; i < CONFIG_SYS_MAX_PCI_EPS; i++)
+		for (i = 0; i < CFG_SYS_MAX_PCI_EPS; i++)
 			liodn_offs[i + 1] = ep_liodn_start +
 					i * pci_cnt + pci_idx - *base_liodn;
 		rc = fdt_setprop(fdt, off, "fsl,liodn-offset-list",
arch/powerpc/cpu/mpc8xxx/fsl_pamu.c +8 -8
index 1c051d18980f..8e1f6c964d3f 100644
@@ -240,8 +240,8 @@ int pamu_init(void)
 	spaact_size = sizeof(struct paace) * NUM_SPAACT_ENTRIES;
 
 	/* Allocate space for Primary PAACT Table */
-#if (defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_PPAACT_ADDR))
-	ppaact = (void *)CONFIG_SPL_PPAACT_ADDR;
+#if (defined(CONFIG_SPL_BUILD) && defined(CFG_SPL_PPAACT_ADDR))
+	ppaact = (void *)CFG_SPL_PPAACT_ADDR;
 #else
 	ppaact = memalign(PAMU_TABLE_ALIGNMENT, ppaact_size);
 	if (!ppaact)
@@ -250,8 +250,8 @@ int pamu_init(void)
 	memset(ppaact, 0, ppaact_size);
 
 	/* Allocate space for Secondary PAACT Table */
-#if (defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_SPAACT_ADDR))
-	sec = (void *)CONFIG_SPL_SPAACT_ADDR;
+#if (defined(CONFIG_SPL_BUILD) && defined(CFG_SPL_SPAACT_ADDR))
+	sec = (void *)CFG_SPL_SPAACT_ADDR;
 #else
 	sec = memalign(PAMU_TABLE_ALIGNMENT, spaact_size);
 	if (!sec)
@@ -266,7 +266,7 @@ int pamu_init(void)
 	spaact_lim = spaact_phys + spaact_size;
 
 	/* Configure all PAMU's */
-	for (i = 0; i < CONFIG_NUM_PAMU; i++) {
+	for (i = 0; i < CFG_NUM_PAMU; i++) {
 		regs = (struct ccsr_pamu *)base_addr;
 
 		out_be32(&regs->ppbah, ppaact_phys >> 32);
@@ -293,7 +293,7 @@ void pamu_enable(void)
 {
 	u32 i = 0;
 	u32 base_addr = CFG_SYS_PAMU_ADDR;
-	for (i = 0; i < CONFIG_NUM_PAMU; i++) {
+	for (i = 0; i < CFG_NUM_PAMU; i++) {
 		setbits_be32((void *)base_addr + PAMU_PCR_OFFSET,
 			     PAMU_PCR_PE);
 		sync();
@@ -307,7 +307,7 @@ void pamu_reset(void)
 	u32 base_addr = CFG_SYS_PAMU_ADDR;
 	struct ccsr_pamu *regs;
 
-	for (i = 0; i < CONFIG_NUM_PAMU; i++) {
+	for (i = 0; i < CFG_NUM_PAMU; i++) {
 		regs = (struct ccsr_pamu *)base_addr;
 	/* Clear PPAACT Base register */
 		out_be32(&regs->ppbah, 0);
@@ -331,7 +331,7 @@ void pamu_disable(void)
 	u32 base_addr = CFG_SYS_PAMU_ADDR;
 
 
-	for (i = 0; i < CONFIG_NUM_PAMU; i++) {
+	for (i = 0; i < CFG_NUM_PAMU; i++) {
 		clrbits_be32((void *)base_addr + PAMU_PCR_OFFSET, PAMU_PCR_PE);
 		sync();
 		base_addr += PAMU_OFFSET;
arch/powerpc/include/asm/fsl_pamu.h +1 -1
index 07e822b796ed..d0d33fd16363 100644
@@ -6,7 +6,7 @@
 #ifndef __PAMU_H
 #define __PAMU_H
 
-#define CONFIG_NUM_PAMU		16
+#define CFG_NUM_PAMU		16
 #define NUM_PPAACT_ENTRIES	512
 #define NUM_SPAACT_ENTRIES	256
 
arch/powerpc/include/asm/fsl_secure_boot.h +4 -4
index 236098e718ef..221f9d842a83 100644
@@ -41,10 +41,10 @@
  * PPAACT and SPAACT table for PAMU must be placed on DDR after DDR init
  * due to space crunch on CPC and thus malloc will not work.
  */
-#define CONFIG_SPL_PPAACT_ADDR		0x2e000000
-#define CONFIG_SPL_SPAACT_ADDR		0x2f000000
-#define CONFIG_SPL_JR0_LIODN_S		454
-#define CONFIG_SPL_JR0_LIODN_NS		458
+#define CFG_SPL_PPAACT_ADDR		0x2e000000
+#define CFG_SPL_SPAACT_ADDR		0x2f000000
+#define CFG_SPL_JR0_LIODN_S		454
+#define CFG_SPL_JR0_LIODN_NS		458
 #endif /* ifdef CONFIG_SPL_BUILD */
 
 #ifndef CONFIG_SPL_BUILD
arch/powerpc/lib/bootm.c +3 -3
index 1df0822e9d73..7b392b06bcba 100644
@@ -41,8 +41,8 @@ static ulong get_sp (void);
 extern void ft_fixup_num_cores(void *blob);
 static void set_clocks_in_mhz (struct bd_info *kbd);
 
-#ifndef CONFIG_SYS_LINUX_LOWMEM_MAX_SIZE
-#define CONFIG_SYS_LINUX_LOWMEM_MAX_SIZE	(768*1024*1024)
+#ifndef CFG_SYS_LINUX_LOWMEM_MAX_SIZE
+#define CFG_SYS_LINUX_LOWMEM_MAX_SIZE	(768*1024*1024)
 #endif
 
 static void boot_jump_linux(struct bootm_headers *images)
@@ -133,7 +133,7 @@ void arch_lmb_reserve(struct lmb *lmb)
 #endif
 
 	size = min(bootm_size, get_effective_memsize());
-	size = min(size, (ulong)CONFIG_SYS_LINUX_LOWMEM_MAX_SIZE);
+	size = min(size, (ulong)CFG_SYS_LINUX_LOWMEM_MAX_SIZE);
 
 	if (size < bootm_size) {
 		ulong base = bootmap_base + size;
arch/powerpc/lib/interrupts.c +3 -3
index bdb8030c27f0..df312dfa28ef 100644
@@ -17,8 +17,8 @@
 #include <asm/ptrace.h>
 
 #ifndef CONFIG_MPC83XX_TIMER
-#ifndef CONFIG_SYS_WATCHDOG_FREQ
-#define CONFIG_SYS_WATCHDOG_FREQ (CONFIG_SYS_HZ / 2)
+#ifndef CFG_SYS_WATCHDOG_FREQ
+#define CFG_SYS_WATCHDOG_FREQ (CONFIG_SYS_HZ / 2)
 #endif
 
 static unsigned decrementer_count; /* count value for 1e6/HZ microseconds */
@@ -80,7 +80,7 @@ void timer_interrupt(struct pt_regs *regs)
 	timestamp++;
 
 #if defined(CONFIG_WATCHDOG) || defined (CONFIG_HW_WATCHDOG)
-	if (CONFIG_SYS_WATCHDOG_FREQ && (timestamp % (CONFIG_SYS_WATCHDOG_FREQ)) == 0)
+	if (CFG_SYS_WATCHDOG_FREQ && (timestamp % (CFG_SYS_WATCHDOG_FREQ)) == 0)
 		schedule();
 #endif    /* CONFIG_WATCHDOG || CONFIG_HW_WATCHDOG */
 
arch/riscv/include/asm/encoding.h +1 -1
index edafad36b38d..56c5da86e867 100644
@@ -93,7 +93,7 @@
 #define DEFAULT_RSTVEC		0x00001000
 #define DEFAULT_NMIVEC		0x00001004
 #define DEFAULT_MTVEC		0x00001010
-#define CONFIG_STRING_ADDR	0x0000100C
+#define CFG_STRING_ADDR	0x0000100C
 #define EXT_IO_BASE		0x40000000
 #define DRAM_BASE		0x80000000
 
arch/x86/include/asm/acpi/chromeos.asl +2 -2
index 2a0fd33265d5..4fb13f34d425 100644
@@ -5,7 +5,7 @@
 
 #ifdef CONFIG_CHROMEOS
 
-#define CONFIG_VBOOT_VBNV_OFFSET 0x26
+#define CFG_VBOOT_VBNV_OFFSET 0x26
 
 #include <asm/acpi/vbnv_layout.h>
 
@@ -68,7 +68,7 @@ Device (CRHW)
 		Name(VNBV, Package() {
 			// See src/vendorcode/google/chromeos/Kconfig
 			// for the definition of these:
-			CONFIG_VBOOT_VBNV_OFFSET,
+			CFG_VBOOT_VBNV_OFFSET,
 			VBOOT_VBNV_BLOCK_SIZE
 		})
 		Return(VNBV)
board/alliedtelesis/x530/x530.c +3 -3
index 0cfb7c522f67..80ad62c2c665 100644
@@ -26,8 +26,8 @@ DECLARE_GLOBAL_DATA_PTR;
 
 #define MVEBU_DEV_BUS_BASE		(MVEBU_REGISTER(0x10400))
 
-#define CONFIG_NVS_LOCATION		0xf4800000
-#define CONFIG_NVS_SIZE			(512 << 10)
+#define CFG_NVS_LOCATION		0xf4800000
+#define CFG_NVS_SIZE			(512 << 10)
 
 static struct serdes_map board_serdes_map[] = {
 	{PEX0, SERDES_SPEED_5_GBPS, PEX_ROOT_COMPLEX_X1, 0, 0},
@@ -109,7 +109,7 @@ int board_init(void)
 	gd->bd->bi_boot_params = mvebu_sdram_bar(0) + 0x100;
 
 	/* window for NVS */
-	mbus_dt_setup_win(CONFIG_NVS_LOCATION, CONFIG_NVS_SIZE,
+	mbus_dt_setup_win(CFG_NVS_LOCATION, CFG_NVS_SIZE,
 			  CPU_TARGET_DEVICEBUS_BOOTROM_SPI, CPU_ATTR_DEV_CS1);
 
 	/* DEV_READYn is not needed for NVS, ignore it when accessing CS1 */
board/armltd/vexpress64/vexpress64.c +1 -1
index 99fb67ecedc2..ee65a596838a 100644
@@ -220,7 +220,7 @@ int board_eth_init(struct bd_info *bis)
 	int rc = 0;
 #ifndef CONFIG_DM_ETH
 #ifdef CONFIG_SMC911X
-	rc = smc911x_initialize(0, CONFIG_SMC911X_BASE);
+	rc = smc911x_initialize(0, CFG_SMC911X_BASE);
 #endif
 #endif
 	return rc;
board/compulab/imx8mm-cl-iot-gate/eeprom_spl.c +3 -3
index 4dbd847d42a1..90cc33a6e460 100644
@@ -12,7 +12,7 @@
 
 #ifdef CONFIG_SPL_BUILD
 
-#define CONFIG_SYS_I2C_EEPROM_ADDR_P1	0x51
+#define CFG_SYS_I2C_EEPROM_ADDR_P1	0x51
 
 static iomux_v3_cfg_t const eeprom_pads[] = {
 	IMX8MQ_PAD_GPIO1_IO13__GPIO1_IO13 | MUX_PAD_CTRL(NO_PAD_CTRL),
@@ -40,7 +40,7 @@ static int cl_eeprom_read(uint offset, uchar *buf, int len)
 	struct udevice *dev;
 	int ret;
 
-	ret = i2c_get_chip_for_busnum(1, CONFIG_SYS_I2C_EEPROM_ADDR_P1,
+	ret = i2c_get_chip_for_busnum(1, CFG_SYS_I2C_EEPROM_ADDR_P1,
 				      CONFIG_SYS_I2C_EEPROM_ADDR_LEN, &dev);
 	if (ret) {
 		printf("%s: Cannot find EEPROM: %d\n", __func__, ret);
@@ -57,7 +57,7 @@ static int cl_eeprom_write(uint offset, uchar *buf, int len)
 
 	cl_eeprom_we(1);
 
-	ret = i2c_get_chip_for_busnum(1, CONFIG_SYS_I2C_EEPROM_ADDR_P1,
+	ret = i2c_get_chip_for_busnum(1, CFG_SYS_I2C_EEPROM_ADDR_P1,
 				      CONFIG_SYS_I2C_EEPROM_ADDR_LEN, &dev);
 	if (ret) {
 		printf("%s: Cannot find EEPROM: %d\n", __func__, ret);
board/davinci/da8xxevm/da850evm.c +3 -3
index e3a0f266a4c5..474dca72929f 100644
@@ -226,8 +226,8 @@ const struct lpsc_resource lpsc[] = {
 
 const int lpsc_size = ARRAY_SIZE(lpsc);
 
-#ifndef CONFIG_DA850_EVM_MAX_CPU_CLK
-#define CONFIG_DA850_EVM_MAX_CPU_CLK	300000000
+#ifndef CFG_DA850_EVM_MAX_CPU_CLK
+#define CFG_DA850_EVM_MAX_CPU_CLK	300000000
 #endif
 
 #define REV_AM18X_EVM		0x100
@@ -245,7 +245,7 @@ const int lpsc_size = ARRAY_SIZE(lpsc);
 u32 get_board_rev(void)
 {
 	char *s;
-	u32 maxcpuclk = CONFIG_DA850_EVM_MAX_CPU_CLK;
+	u32 maxcpuclk = CFG_DA850_EVM_MAX_CPU_CLK;
 	u32 rev = 0;
 
 	s = env_get("maxcpuclk");
board/davinci/da8xxevm/omapl138_lcdk.c +2 -2
index cd021cc8e583..5ffd420fff36 100644
@@ -139,8 +139,8 @@ const struct lpsc_resource lpsc[] = {
 
 const int lpsc_size = ARRAY_SIZE(lpsc);
 
-#ifndef CONFIG_DA850_EVM_MAX_CPU_CLK
-#define CONFIG_DA850_EVM_MAX_CPU_CLK	456000000
+#ifndef CFG_DA850_EVM_MAX_CPU_CLK
+#define CFG_DA850_EVM_MAX_CPU_CLK	456000000
 #endif
 
 int board_early_init_f(void)
board/eets/pdu001/board.c +2 -2
index 648d77fd21e3..de224d4d2834 100644
@@ -62,8 +62,8 @@ DECLARE_GLOBAL_DATA_PTR;
  * To get the boot device from 'am33xx_spl_board_init' to
  * 'board_late_init' we therefore use a scratch register from the RTC.
  */
-#define CONFIG_SYS_RTC_SCRATCH0 0x60
-#define BOOT_DEVICE_SAVE_REGISTER (RTC_BASE + CONFIG_SYS_RTC_SCRATCH0)
+#define CFG_SYS_RTC_SCRATCH0 0x60
+#define BOOT_DEVICE_SAVE_REGISTER (RTC_BASE + CFG_SYS_RTC_SCRATCH0)
 
 #ifdef CONFIG_SPL_BUILD
 static void save_boot_device(void)
board/freescale/common/cadmus.c +6 -6
index 8f3fb5fa81b2..e7e07fff86c3 100644
@@ -10,8 +10,8 @@
 /*
  * CADMUS Board System Registers
  */
-#ifndef CONFIG_SYS_CADMUS_BASE_REG
-#define CONFIG_SYS_CADMUS_BASE_REG	(CADMUS_BASE_ADDR + 0x4000)
+#ifndef CFG_SYS_CADMUS_BASE_REG
+#define CFG_SYS_CADMUS_BASE_REG	(CADMUS_BASE_ADDR + 0x4000)
 #endif
 
 typedef struct cadmus_reg {
@@ -30,7 +30,7 @@ typedef struct cadmus_reg {
 unsigned int
 get_board_version(void)
 {
-	volatile cadmus_reg_t *cadmus = (cadmus_reg_t *)CONFIG_SYS_CADMUS_BASE_REG;
+	volatile cadmus_reg_t *cadmus = (cadmus_reg_t *)CFG_SYS_CADMUS_BASE_REG;
 
 	return cadmus->cm_ver;
 }
@@ -39,7 +39,7 @@ get_board_version(void)
 unsigned long
 get_board_sys_clk(void)
 {
-	volatile cadmus_reg_t *cadmus = (cadmus_reg_t *)CONFIG_SYS_CADMUS_BASE_REG;
+	volatile cadmus_reg_t *cadmus = (cadmus_reg_t *)CFG_SYS_CADMUS_BASE_REG;
 
 	uint pci1_speed = (cadmus->cm_pci >> 2) & 0x3; /* PSPEED in [4:5] */
 
@@ -57,7 +57,7 @@ get_board_sys_clk(void)
 unsigned int
 get_pci_slot(void)
 {
-	volatile cadmus_reg_t *cadmus = (cadmus_reg_t *)CONFIG_SYS_CADMUS_BASE_REG;
+	volatile cadmus_reg_t *cadmus = (cadmus_reg_t *)CFG_SYS_CADMUS_BASE_REG;
 
 	/*
 	 * PCI slot in USER bits CSR[6:7] by convention.
@@ -69,7 +69,7 @@ get_pci_slot(void)
 unsigned int
 get_pci_dual(void)
 {
-	volatile cadmus_reg_t *cadmus = (cadmus_reg_t *)CONFIG_SYS_CADMUS_BASE_REG;
+	volatile cadmus_reg_t *cadmus = (cadmus_reg_t *)CFG_SYS_CADMUS_BASE_REG;
 
 	/*
 	 * PCI DUAL in CM_PCI[3]
board/freescale/common/fsl_chain_of_trust.c +3 -3
index 029d06bbf9d6..b47ce052516e 100644
@@ -28,9 +28,9 @@
 #endif
 
 #if defined(CONFIG_MPC85xx)
-#define CONFIG_DCFG_ADDR	CFG_SYS_MPC85xx_GUTS_ADDR
+#define CFG_DCFG_ADDR	CFG_SYS_MPC85xx_GUTS_ADDR
 #else
-#define CONFIG_DCFG_ADDR	CFG_SYS_FSL_GUTS_ADDR
+#define CFG_DCFG_ADDR	CFG_SYS_FSL_GUTS_ADDR
 #endif
 
 #ifdef CONFIG_SYS_FSL_CCSR_GUR_LE
@@ -44,7 +44,7 @@ int fsl_check_boot_mode_secure(void)
 {
 	uint32_t val;
 	struct ccsr_sfp_regs *sfp_regs = (void *)(CFG_SYS_SFP_ADDR);
-	struct ccsr_gur __iomem *gur = (void *)(CONFIG_DCFG_ADDR);
+	struct ccsr_gur __iomem *gur = (void *)(CFG_DCFG_ADDR);
 
 	val = sfp_in32(&sfp_regs->ospr) & ITS_MASK;
 	if (val == ITS_MASK)
board/freescale/common/pixis.c +15 -15
index cb9f4549725c..7096b107e540 100644
@@ -149,8 +149,8 @@ static int set_px_corepll(unsigned long corepll)
 	return 1;
 }
 
-#ifndef CONFIG_SYS_PIXIS_VCFGEN0_ENABLE
-#define CONFIG_SYS_PIXIS_VCFGEN0_ENABLE		0x1C
+#ifndef CFG_SYS_PIXIS_VCFGEN0_ENABLE
+#define CFG_SYS_PIXIS_VCFGEN0_ENABLE		0x1C
 #endif
 
 /* Tell the PIXIS where to find the COREPLL, MPXPLL, SYSCLK values
@@ -159,7 +159,7 @@ static int set_px_corepll(unsigned long corepll)
  * or various other PIXIS registers to determine the values for COREPLL,
  * MPXPLL, and SYSCLK.
  *
- * CONFIG_SYS_PIXIS_VCFGEN0_ENABLE is the value to write to the PIXIS_VCFGEN0
+ * CFG_SYS_PIXIS_VCFGEN0_ENABLE is the value to write to the PIXIS_VCFGEN0
  * register that tells the pixis to use the various PIXIS register.
  */
 static void read_from_px_regs(int set)
@@ -167,18 +167,18 @@ static void read_from_px_regs(int set)
 	u8 tmp = in_8(pixis_base + PIXIS_VCFGEN0);
 
 	if (set)
-		tmp = tmp | CONFIG_SYS_PIXIS_VCFGEN0_ENABLE;
+		tmp = tmp | CFG_SYS_PIXIS_VCFGEN0_ENABLE;
 	else
-		tmp = tmp & ~CONFIG_SYS_PIXIS_VCFGEN0_ENABLE;
+		tmp = tmp & ~CFG_SYS_PIXIS_VCFGEN0_ENABLE;
 
 	out_8(pixis_base + PIXIS_VCFGEN0, tmp);
 }
 
-/* CONFIG_SYS_PIXIS_VBOOT_ENABLE is the value to write to the PX_VCFGEN1
+/* CFG_SYS_PIXIS_VBOOT_ENABLE is the value to write to the PX_VCFGEN1
  * register that tells the pixis to use the PX_VBOOT[LBMAP] register.
  */
-#ifndef CONFIG_SYS_PIXIS_VBOOT_ENABLE
-#define CONFIG_SYS_PIXIS_VBOOT_ENABLE	0x04
+#ifndef CFG_SYS_PIXIS_VBOOT_ENABLE
+#define CFG_SYS_PIXIS_VBOOT_ENABLE	0x04
 #endif
 
 /* Configure the source of the boot location
@@ -194,14 +194,14 @@ static void read_from_px_regs_altbank(int set)
 	u8 tmp = in_8(pixis_base + PIXIS_VCFGEN1);
 
 	if (set)
-		tmp = tmp | CONFIG_SYS_PIXIS_VBOOT_ENABLE;
+		tmp = tmp | CFG_SYS_PIXIS_VBOOT_ENABLE;
 	else
-		tmp = tmp & ~CONFIG_SYS_PIXIS_VBOOT_ENABLE;
+		tmp = tmp & ~CFG_SYS_PIXIS_VBOOT_ENABLE;
 
 	out_8(pixis_base + PIXIS_VCFGEN1, tmp);
 }
 
-/* CONFIG_SYS_PIXIS_VBOOT_MASK contains the bits to set in VBOOT register that
+/* CFG_SYS_PIXIS_VBOOT_MASK contains the bits to set in VBOOT register that
  * tells the PIXIS what the alternate flash bank is.
  *
  * Note that it's not really a mask.  It contains the actual LBMAP bits that
@@ -209,8 +209,8 @@ static void read_from_px_regs_altbank(int set)
  * primary bank has these bits set to 0, and the alternate bank has these
  * bits set to 1.
  */
-#ifndef CONFIG_SYS_PIXIS_VBOOT_MASK
-#define CONFIG_SYS_PIXIS_VBOOT_MASK	(0x40)
+#ifndef CFG_SYS_PIXIS_VBOOT_MASK
+#define CFG_SYS_PIXIS_VBOOT_MASK	(0x40)
 #endif
 
 /* Tell the PIXIS to boot from the default flash bank
@@ -220,7 +220,7 @@ static void read_from_px_regs_altbank(int set)
  */
 static void clear_altbank(void)
 {
-	clrbits_8(pixis_base + PIXIS_VBOOT, CONFIG_SYS_PIXIS_VBOOT_MASK);
+	clrbits_8(pixis_base + PIXIS_VBOOT, CFG_SYS_PIXIS_VBOOT_MASK);
 }
 
 /* Tell the PIXIS to boot from the alternate flash bank
@@ -230,7 +230,7 @@ static void clear_altbank(void)
  */
 static void set_altbank(void)
 {
-	setbits_8(pixis_base + PIXIS_VBOOT, CONFIG_SYS_PIXIS_VBOOT_MASK);
+	setbits_8(pixis_base + PIXIS_VBOOT, CFG_SYS_PIXIS_VBOOT_MASK);
 }
 
 /* Reset the board with watchdog disabled.
board/freescale/ls1043aqds/eth.c +2 -2
index 645c56c73d53..cd1f83e3d068 100644
@@ -314,7 +314,7 @@ int board_eth_init(struct bd_info *bis)
 		mdio_mux[i] = EMI_NONE;
 
 	dtsec_mdio_info.regs =
-		(struct memac_mdio_controller *)CONFIG_SYS_FM1_DTSEC_MDIO_ADDR;
+		(struct memac_mdio_controller *)CFG_SYS_FM1_DTSEC_MDIO_ADDR;
 
 	dtsec_mdio_info.name = DEFAULT_FM_MDIO_NAME;
 
@@ -322,7 +322,7 @@ int board_eth_init(struct bd_info *bis)
 	fm_memac_mdio_init(bis, &dtsec_mdio_info);
 
 	tgec_mdio_info.regs =
-		(struct memac_mdio_controller *)CONFIG_SYS_FM1_TGEC_MDIO_ADDR;
+		(struct memac_mdio_controller *)CFG_SYS_FM1_TGEC_MDIO_ADDR;
 	tgec_mdio_info.name = DEFAULT_FM_TGEC_MDIO_NAME;
 
 	/* Register the 10G MDIO bus */
board/freescale/ls1043ardb/eth.c +2 -2
index 3cae2a08677c..cc95214c4e3f 100644
@@ -28,7 +28,7 @@ int board_eth_init(struct bd_info *bis)
 	srds_s1 >>= FSL_CHASSIS2_RCWSR4_SRDS1_PRTCL_SHIFT;
 
 	dtsec_mdio_info.regs =
-		(struct memac_mdio_controller *)CONFIG_SYS_FM1_DTSEC_MDIO_ADDR;
+		(struct memac_mdio_controller *)CFG_SYS_FM1_DTSEC_MDIO_ADDR;
 
 	dtsec_mdio_info.name = DEFAULT_FM_MDIO_NAME;
 
@@ -36,7 +36,7 @@ int board_eth_init(struct bd_info *bis)
 	fm_memac_mdio_init(bis, &dtsec_mdio_info);
 
 	tgec_mdio_info.regs =
-		(struct memac_mdio_controller *)CONFIG_SYS_FM1_TGEC_MDIO_ADDR;
+		(struct memac_mdio_controller *)CFG_SYS_FM1_TGEC_MDIO_ADDR;
 	tgec_mdio_info.name = DEFAULT_FM_TGEC_MDIO_NAME;
 
 	/* Register the 10G MDIO bus */
board/freescale/ls1046afrwy/eth.c +1 -1
index 71c4c21cd4fd..d1a2bfe18855 100644
@@ -27,7 +27,7 @@ int board_eth_init(struct bd_info *bis)
 	srds_s1 >>= FSL_CHASSIS2_RCWSR4_SRDS1_PRTCL_SHIFT;
 
 	dtsec_mdio_info.regs =
-		(struct memac_mdio_controller *)CONFIG_SYS_FM1_DTSEC_MDIO_ADDR;
+		(struct memac_mdio_controller *)CFG_SYS_FM1_DTSEC_MDIO_ADDR;
 
 	dtsec_mdio_info.name = DEFAULT_FM_MDIO_NAME;
 
board/freescale/ls1046aqds/eth.c +1 -1
index 926bd74ddc67..bbf8b8c2bee5 100644
@@ -285,7 +285,7 @@ int board_eth_init(struct bd_info *bis)
 		mdio_mux[i] = EMI_NONE;
 
 	dtsec_mdio_info.regs =
-		(struct memac_mdio_controller *)CONFIG_SYS_FM1_DTSEC_MDIO_ADDR;
+		(struct memac_mdio_controller *)CFG_SYS_FM1_DTSEC_MDIO_ADDR;
 
 	dtsec_mdio_info.name = DEFAULT_FM_MDIO_NAME;
 
board/freescale/ls1046ardb/eth.c +2 -2
index af70d1077344..bbc22a3cdf4a 100644
@@ -29,7 +29,7 @@ int board_eth_init(struct bd_info *bis)
 	srds_s1 >>= FSL_CHASSIS2_RCWSR4_SRDS1_PRTCL_SHIFT;
 
 	dtsec_mdio_info.regs =
-		(struct memac_mdio_controller *)CONFIG_SYS_FM1_DTSEC_MDIO_ADDR;
+		(struct memac_mdio_controller *)CFG_SYS_FM1_DTSEC_MDIO_ADDR;
 
 	dtsec_mdio_info.name = DEFAULT_FM_MDIO_NAME;
 
@@ -37,7 +37,7 @@ int board_eth_init(struct bd_info *bis)
 	fm_memac_mdio_init(bis, &dtsec_mdio_info);
 
 	tgec_mdio_info.regs =
-		(struct memac_mdio_controller *)CONFIG_SYS_FM1_TGEC_MDIO_ADDR;
+		(struct memac_mdio_controller *)CFG_SYS_FM1_TGEC_MDIO_ADDR;
 	tgec_mdio_info.name = DEFAULT_FM_TGEC_MDIO_NAME;
 
 	/* Register the 10G MDIO bus */
board/freescale/p2041rdb/eth.c +2 -2
index 3e12c816abc4..c0d05539c5c0 100644
@@ -139,14 +139,14 @@ int board_eth_init(struct bd_info *bis)
 	initialize_lane_to_slot();
 
 	dtsec_mdio_info.regs =
-		(struct tsec_mii_mng *)CONFIG_SYS_FM1_DTSEC1_MDIO_ADDR;
+		(struct tsec_mii_mng *)CFG_SYS_FM1_DTSEC1_MDIO_ADDR;
 	dtsec_mdio_info.name = DEFAULT_FM_MDIO_NAME;
 
 	/* Register the real 1G MDIO bus */
 	fsl_pq_mdio_init(bis, &dtsec_mdio_info);
 
 	tgec_mdio_info.regs =
-		(struct tgec_mdio_controller *)CONFIG_SYS_FM1_TGEC_MDIO_ADDR;
+		(struct tgec_mdio_controller *)CFG_SYS_FM1_TGEC_MDIO_ADDR;
 	tgec_mdio_info.name = DEFAULT_FM_TGEC_MDIO_NAME;
 
 	/* Register the real 10G MDIO bus */
board/freescale/t102xrdb/eth_t102xrdb.c +2 -2
index ed6b36339f74..ad78f72f98c8 100644
@@ -41,7 +41,7 @@ int board_eth_init(struct bd_info *bis)
 	srds_s1 >>= FSL_CORENET2_RCWSR4_SRDS1_PRTCL_SHIFT;
 
 	dtsec_mdio_info.regs =
-		(struct memac_mdio_controller *)CONFIG_SYS_FM1_DTSEC_MDIO_ADDR;
+		(struct memac_mdio_controller *)CFG_SYS_FM1_DTSEC_MDIO_ADDR;
 
 	dtsec_mdio_info.name = DEFAULT_FM_MDIO_NAME;
 
@@ -49,7 +49,7 @@ int board_eth_init(struct bd_info *bis)
 	fm_memac_mdio_init(bis, &dtsec_mdio_info);
 
 	tgec_mdio_info.regs =
-		(struct memac_mdio_controller *)CONFIG_SYS_FM1_TGEC_MDIO_ADDR;
+		(struct memac_mdio_controller *)CFG_SYS_FM1_TGEC_MDIO_ADDR;
 	tgec_mdio_info.name = DEFAULT_FM_TGEC_MDIO_NAME;
 
[… more lines in the raw message]

Lines of this file are not shown. View the raw message.

board/freescale/t104xrdb/eth.c +1 -1
index 3906c8381e01..5eca9386f6eb 100644

Lines of this file are not shown. View the raw message.

board/freescale/t208xqds/eth_t208xqds.c +2 -2
index 62261f50ea94..569b193eab78 100644

Lines of this file are not shown. View the raw message.

board/freescale/t4rdb/eth.c +2 -2
index 241ee5a4a253..2e52543847bf 100644

Lines of this file are not shown. View the raw message.

board/logicpd/omap3som/omap3logic.c +2 -2
index 559192e9001e..86992829caf4 100644

Lines of this file are not shown. View the raw message.

board/renesas/blanche/blanche.c +1 -1
index ea090575fb20..8e1ae29e2219 100644

Lines of this file are not shown. View the raw message.

board/sysam/amcore/amcore.c +1 -1
index 429f886771b7..086421d9265d 100644

Lines of this file are not shown. View the raw message.

board/ti/evm/evm.c +2 -2
index a7f9a7eca167..a4d6a0138d9b 100644

Lines of this file are not shown. View the raw message.

cmd/ximg.c +3 -3
index 1c40fd27a054..60ed2c9f6f9e 100644

Lines of this file are not shown. View the raw message.

common/command.c +1 -1
index 41c91c6d8c87..b2799eaa034b 100644

Lines of this file are not shown. View the raw message.

doc/README.davinci +1 -1
index 326efa0a2d6d..f368f99a41e2 100644

Lines of this file are not shown. View the raw message.

doc/README.fec_mxc +1 -1
index 2ccd4288d281..a33f4a75742a 100644

Lines of this file are not shown. View the raw message.

doc/develop/environment.rst +1 -1
index 0b86fafbff7e..e1783462bb02 100644

Lines of this file are not shown. View the raw message.

doc/usage/netconsole.rst +1 -1
index 0156f0212d99..2aa3b9ccc59b 100644

Lines of this file are not shown. View the raw message.

drivers/crypto/fsl/jr.c +3 -3
index ee822edd6c8e..ceb66dd6270d 100644

Lines of this file are not shown. View the raw message.

drivers/crypto/fsl/jr.h +1 -1
index 3eb7be79da41..4e4c4af5805f 100644

Lines of this file are not shown. View the raw message.

drivers/ddr/fsl/ctrl_regs.c +5 -5
index 759921bc5824..8f8c2c864c3f 100644

Lines of this file are not shown. View the raw message.

drivers/ddr/fsl/options.c +3 -3
index 9555b9a29d45..7cff82345847 100644

Lines of this file are not shown. View the raw message.

drivers/fpga/virtex2.c +4 -4
index fc99a5f48314..3ded27f9b3ff 100644

Lines of this file are not shown. View the raw message.

drivers/fpga/zynqpl.c +3 -3
index 53dd780a6ca2..a2e3b305fa41 100644

Lines of this file are not shown. View the raw message.

drivers/gpio/mpc83xx_gpio.c +20 -20
index 276a3b350dc2..bf693c8d4578 100644

Lines of this file are not shown. View the raw message.

drivers/i2c/fsl_i2c.c +8 -8
index 147a4b91f0c5..d312f35f044f 100644

Lines of this file are not shown. View the raw message.

drivers/i2c/lpc32xx_i2c.c +8 -8
index 774129ad8ea5..496f4feec566 100644

Lines of this file are not shown. View the raw message.

drivers/i2c/mvtwsi.c +3 -3
index 2822749971af..93bbc6916e58 100644

Lines of this file are not shown. View the raw message.

drivers/i2c/octeon_i2c.c +2 -2
index e54ef18e5155..f2dea5626cbb 100644

Lines of this file are not shown. View the raw message.

drivers/misc/gpio_led.c +3 -3
index b913069849ac..30679f80cf15 100644

Lines of this file are not shown. View the raw message.

drivers/mtd/nand/raw/kmeter1_nand.c +6 -6
index 84564b2f70a5..dfe73d64e46a 100644

Lines of this file are not shown. View the raw message.

drivers/mtd/spi/fsl_espi_spl.c +2 -2
index dfc35d6eabf0..cdbdbd6ea581 100644

Lines of this file are not shown. View the raw message.

drivers/net/ag7xxx.c +15 -15
index a16c998b2ab9..da1f3f458080 100644

Lines of this file are not shown. View the raw message.

drivers/net/designware.c +9 -9
index ddaf7ed1d38a..e09ca3313dd3 100644

Lines of this file are not shown. View the raw message.

drivers/net/designware.h +9 -9
index 138c3c14bf52..9da4e902cb0d 100644

Lines of this file are not shown. View the raw message.

drivers/net/eepro100.c +12 -12
index 0a1fe5609106..38d96ab72b6e 100644

Lines of this file are not shown. View the raw message.

drivers/net/fec_mxc.c +4 -4
index ab52cc119f4e..006d27051ebe 100644

Lines of this file are not shown. View the raw message.

drivers/net/fm/fm.c +1 -1
index 055dd61fbe5a..fcb5cc89f18b 100644

Lines of this file are not shown. View the raw message.

drivers/net/mcfmii.c +6 -6
index 48dd558405c5..eae20654513e 100644

Lines of this file are not shown. View the raw message.

drivers/net/mt7628-eth.c +6 -6
index 50d066a8ba2f..0a9bdb3ddbd6 100644

Lines of this file are not shown. View the raw message.

drivers/net/mvpp2.c +1 -1
index 7e1922e1c485..1bad50d344c7 100644

Lines of this file are not shown. View the raw message.

drivers/net/netconsole.c +3 -3
index 1e52917ff2c3..151bc55e076b 100644

Lines of this file are not shown. View the raw message.

drivers/net/npcm750_eth.c +16 -16
index bd29a10def84..2028f4ae286e 100644

Lines of this file are not shown. View the raw message.

drivers/net/octeon/octeon_eth.c +3 -3
index fbb1afc08abc..659ba51ecb4a 100644

Lines of this file are not shown. View the raw message.

drivers/net/qe/dm_qe_uec.c +4 -4
index 8fec1c21e10f..6d1509d90cf0 100644

Lines of this file are not shown. View the raw message.

drivers/net/sun8i_emac.c +19 -19
index 9cca8fa4e0a1..e800a326b81e 100644

Lines of this file are not shown. View the raw message.

drivers/net/ti/davinci_emac.c +10 -10
index 2dfadbd82d5b..29d2fc9b54e9 100644

Lines of this file are not shown. View the raw message.

drivers/phy/phy-ti-am654.c +4 -4
index 82010e7c96e7..27a312227bc0 100644

Lines of this file are not shown. View the raw message.

drivers/pinctrl/nxp/pinctrl-imx.h +1 -1
index 947975ee72a7..fa4c084e2fc0 100644

Lines of this file are not shown. View the raw message.

drivers/pinctrl/nxp/pinctrl-imx7ulp.c +2 -2
index da0f6c9ba0e5..6da9ff7c5bce 100644

Lines of this file are not shown. View the raw message.

drivers/pinctrl/nxp/pinctrl-imx8ulp.c +2 -2
index 3f15f1dd4502..4e8fa08bc6e3 100644

Lines of this file are not shown. View the raw message.

drivers/pinctrl/nxp/pinctrl-mxs.c +3 -3
index 9a54b8bbe902..eb90e28d4b21 100644

Lines of this file are not shown. View the raw message.

drivers/pinctrl/nxp/pinctrl-mxs.h +3 -3
index a398e43cbebb..20d6dea33893 100644

Lines of this file are not shown. View the raw message.

drivers/pinctrl/pinctrl-zynqmp.c +4 -4
index 7c5a02db1b98..ee6529b3c295 100644

Lines of this file are not shown. View the raw message.

drivers/qe/qe.c +2 -2
index fb1f683f9bd4..2825dc6f9aa6 100644

Lines of this file are not shown. View the raw message.

drivers/ram/aspeed/sdram_ast2600.c +6 -6
index a2d7ca82fc01..18767554123f 100644

Lines of this file are not shown. View the raw message.

drivers/ram/octeon/octeon_ddr.c +4 -4
index bb21078df140..ff2899d74843 100644

Lines of this file are not shown. View the raw message.

drivers/ram/rockchip/dmc-rk3368.c +1 -1
index 6929a7e494ee..dd5b19174455 100644

Lines of this file are not shown. View the raw message.

drivers/serial/ns16550.c +6 -6
index 772dd6fef8f3..eab9537fbae5 100644

Lines of this file are not shown. View the raw message.

drivers/serial/serial_omap.c +3 -3
index 904f7d21bf03..26310b0b7464 100644

Lines of this file are not shown. View the raw message.

drivers/serial/usbtty.c +14 -14
index 07a59ec9607a..ecb6ba853df7 100644

Lines of this file are not shown. View the raw message.

drivers/serial/usbtty.h +9 -9
index 8c7e61b2ca27..b176a7961b8f 100644

Lines of this file are not shown. View the raw message.

drivers/spi/mxc_spi.c +3 -3
index ea9cc3d1f983..840660ffe9a3 100644

Lines of this file are not shown. View the raw message.

drivers/timer/mpc83xx_timer.c +3 -3
index 410bf723d6b4..7814cb6a5d61 100644

Lines of this file are not shown. View the raw message.

drivers/ufs/ufs.h +1 -1
index 069888fdd906..8a38832b05f8 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/ci_udc.c +5 -5
index d9a89a17b27e..b9258d735757 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/ci_udc.h +3 -3
index 95cc07992b41..bea2f9f3fe33 100644

Lines of this file are not shown. View the raw message.

drivers/usb/host/ehci-faraday.c +3 -3
index b61b5382df41..85a352696019 100644

Lines of this file are not shown. View the raw message.

drivers/usb/host/ehci-tegra.c +3 -3
index b02ee89c3eca..11d776747c04 100644

Lines of this file are not shown. View the raw message.

drivers/usb/musb-new/linux-compat.h +2 -2
index 6d9f19dfe6b3..8829567bfb68 100644

Lines of this file are not shown. View the raw message.

drivers/usb/musb-new/musb_core.c +2 -2
index fc7af7484e4c..a42d98ece9b1 100644

Lines of this file are not shown. View the raw message.

drivers/usb/musb-new/musb_core.h +1 -1
index 821d0e06f619..adfd81b85448 100644

Lines of this file are not shown. View the raw message.

drivers/usb/ulpi/omap-ulpi-viewport.c +1 -1
index 8b930e3fa919..8d71db04a2d7 100644

Lines of this file are not shown. View the raw message.

drivers/usb/ulpi/ulpi-viewport.c +1 -1
index 3bb152be8939..55a62808384d 100644

Lines of this file are not shown. View the raw message.

drivers/usb/ulpi/ulpi.c +1 -1
index dd0da0e841e5..b5d2c2c2d1c3 100644

Lines of this file are not shown. View the raw message.

include/command.h +2 -2
index 966fd23c639f..d58b6101a89a 100644

Lines of this file are not shown. View the raw message.

include/env_callback.h +3 -3
index 85e7fe25f8fe..a9a14f2a84a5 100644

Lines of this file are not shown. View the raw message.

include/fm_eth.h +14 -14
index 6012a449fd23..8b133e703b40 100644

Lines of this file are not shown. View the raw message.

include/fsl_ddr_sdram.h +8 -8
index a7272e4be705..c43f780e4cd1 100644

Lines of this file are not shown. View the raw message.

include/fsl_usb.h +21 -21

42 lines not on this page · raw message

include/usb/ulpi.h +2 -2
index 71642d257b67..126623cf9a82 100644

Lines of this file are not shown. View the raw message.

lib/gzip.c +7 -7
index c6c0ec880cfb..2595b2d04b42 100644

Lines of this file are not shown. View the raw message.

lib/time.c +3 -3
index 82350260eac4..42d15faf3758 100644

Lines of this file are not shown. View the raw message.

net/bootp.c +7 -7
index 7ac0093945c1..cae041988db2 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.25.1

Part of the diff is not shown here. View the raw message.

Reviewed-by on v1 18/19
#26 lore raw

Re: [PATCH 18/19] global: Finish CONFIG -> CFG migration

Quoted 141 lines · Tom Rini

At this point, the remaining places where we have a symbol that is defined as CONFIG_... are in fairly odd locations. While as much dead code has been removed as possible, some of these locations are simply less obvious at first. In other cases, this code is used, but was defined in such a way as to have been missed by earlier checks. Perform a rename of all such remaining symbols to be CFG_... rather than CONFIG_...

---
 README                                        |  24 +-
 arch/arm/cpu/armv8/fsl-layerscape/cpu.c       | 166 +++++-----
 .../arm/include/asm/arch-fsl-layerscape/cpu.h |  96 +++---
 .../include/asm/arch-rockchip/ddr_rk3288.h    |   2 +-
 .../include/asm/arch-rockchip/sdram_rk322x.h  |   2 +-
 arch/arm/include/asm/arch-sunxi/i2c.h         |   2 +-
 arch/arm/mach-omap2/fdt-common.c              |   4 +-
 arch/arm/mach-omap2/omap5/fdt.c               |   8 +-
 .../arm/mach-rmobile/include/mach/rcar-mstp.h |  96 +++---
 arch/arm/mach-rockchip/rk3036/sdram_rk3036.c  |   2 +-
 arch/arm/mach-tegra/tegra20/warmboot_avp.c    |   2 +-
 arch/arm/mach-tegra/tegra20/warmboot_avp.h    |   4 +-
 arch/m68k/cpu/mcf523x/interrupts.c            |   8 +-
 arch/m68k/cpu/mcf52x2/interrupts.c            |  14 +-
 arch/m68k/cpu/mcf530x/interrupts.c            |   2 +-
 arch/m68k/cpu/mcf532x/interrupts.c            |   8 +-
 arch/m68k/cpu/mcf5445x/interrupts.c           |   8 +-
 arch/m68k/include/asm/cache.h                 |  42 +--
 arch/m68k/include/asm/coldfire/intctrl.h      |   8 +-
 arch/m68k/include/asm/immap.h                 | 290 +++++++++---------
 arch/m68k/lib/cache.c                         |  28 +-
 arch/m68k/lib/interrupts.c                    |   2 +-
 arch/m68k/lib/time.c                          |  24 +-
 arch/mips/mach-mtmips/mt7621/spl/start.S      |   8 +-
 arch/powerpc/cpu/mpc83xx/bats/bats.h          | 128 ++++----
 arch/powerpc/cpu/mpc83xx/cpu_init.c           |  26 +-
 arch/powerpc/cpu/mpc83xx/hid/hid.h            |  12 +-
 arch/powerpc/cpu/mpc83xx/hrcw/hrcw.h          |   4 +-
 arch/powerpc/cpu/mpc83xx/lblaw/lblaw.h        |  32 +-
 arch/powerpc/cpu/mpc83xx/spd_sdram.c          |   6 +-
 arch/powerpc/cpu/mpc83xx/spl_minimal.c        |  10 +-
 arch/powerpc/cpu/mpc83xx/start.S              | 154 +++++-----
 arch/powerpc/cpu/mpc85xx/cpu_init.c           |  56 ++--
 arch/powerpc/cpu/mpc85xx/fdt.c                |  10 +-
 arch/powerpc/cpu/mpc85xx/liodn.c              |   6 +-
 arch/powerpc/cpu/mpc8xxx/fsl_pamu.c           |  16 +-
 arch/powerpc/include/asm/fsl_pamu.h           |   2 +-
 arch/powerpc/include/asm/fsl_secure_boot.h    |   8 +-
 arch/powerpc/lib/bootm.c                      |   6 +-
 arch/powerpc/lib/interrupts.c                 |   6 +-
 arch/riscv/include/asm/encoding.h             |   2 +-
 arch/x86/include/asm/acpi/chromeos.asl        |   4 +-
 board/alliedtelesis/x530/x530.c               |   6 +-
 board/armltd/vexpress64/vexpress64.c          |   2 +-
 .../compulab/imx8mm-cl-iot-gate/eeprom_spl.c  |   6 +-
 board/davinci/da8xxevm/da850evm.c             |   6 +-
 board/davinci/da8xxevm/omapl138_lcdk.c        |   4 +-
 board/eets/pdu001/board.c                     |   4 +-
 board/freescale/common/cadmus.c               |  12 +-
 board/freescale/common/fsl_chain_of_trust.c   |   6 +-
 board/freescale/common/pixis.c                |  30 +-
 board/freescale/ls1043aqds/eth.c              |   4 +-
 board/freescale/ls1043ardb/eth.c              |   4 +-
 board/freescale/ls1046afrwy/eth.c             |   2 +-
 board/freescale/ls1046aqds/eth.c              |   2 +-
 board/freescale/ls1046ardb/eth.c              |   4 +-
 board/freescale/p2041rdb/eth.c                |   4 +-
 board/freescale/t102xrdb/eth_t102xrdb.c       |   4 +-
 board/freescale/t104xrdb/eth.c                |   2 +-
 board/freescale/t208xqds/eth_t208xqds.c       |   4 +-
 board/freescale/t4rdb/eth.c                   |   4 +-
 board/logicpd/omap3som/omap3logic.c           |   4 +-
 board/renesas/blanche/blanche.c               |   2 +-
 board/sysam/amcore/amcore.c                   |   2 +-
 board/ti/evm/evm.c                            |   4 +-
 cmd/ximg.c                                    |   6 +-
 common/command.c                              |   2 +-
 doc/README.davinci                            |   2 +-
 doc/README.fec_mxc                            |   2 +-
 doc/develop/environment.rst                   |   2 +-
 doc/usage/netconsole.rst                      |   2 +-
 drivers/crypto/fsl/jr.c                       |   6 +-
 drivers/crypto/fsl/jr.h                       |   2 +-
 drivers/ddr/fsl/ctrl_regs.c                   |  10 +-
 drivers/ddr/fsl/options.c                     |   6 +-
 drivers/fpga/virtex2.c                        |   8 +-
 drivers/fpga/zynqpl.c                         |   6 +-
 drivers/gpio/mpc83xx_gpio.c                   |  40 +--
 drivers/i2c/fsl_i2c.c                         |  16 +-
 drivers/i2c/lpc32xx_i2c.c                     |  16 +-
 drivers/i2c/mvtwsi.c                          |   6 +-
 drivers/i2c/octeon_i2c.c                      |   4 +-
 drivers/misc/gpio_led.c                       |   6 +-
 drivers/mtd/nand/raw/kmeter1_nand.c           |  12 +-
 drivers/mtd/spi/fsl_espi_spl.c                |   4 +-
 drivers/net/ag7xxx.c                          |  30 +-
 drivers/net/designware.c                      |  18 +-
 drivers/net/designware.h                      |  18 +-
 drivers/net/eepro100.c                        |  24 +-
 drivers/net/fec_mxc.c                         |   8 +-
 drivers/net/fm/fm.c                           |   2 +-
 drivers/net/mcfmii.c                          |  12 +-
 drivers/net/mt7628-eth.c                      |  12 +-
 drivers/net/mvpp2.c                           |   2 +-
 drivers/net/netconsole.c                      |   6 +-
 drivers/net/npcm750_eth.c                     |  32 +-
 drivers/net/octeon/octeon_eth.c               |   6 +-
 drivers/net/qe/dm_qe_uec.c                    |   8 +-
 drivers/net/sun8i_emac.c                      |  38 +--
 drivers/net/ti/davinci_emac.c                 |  20 +-
 drivers/phy/phy-ti-am654.c                    |   8 +-
 drivers/pinctrl/nxp/pinctrl-imx.h             |   2 +-
 drivers/pinctrl/nxp/pinctrl-imx7ulp.c         |   4 +-
 drivers/pinctrl/nxp/pinctrl-imx8ulp.c         |   4 +-
 drivers/pinctrl/nxp/pinctrl-mxs.c             |   6 +-
 drivers/pinctrl/nxp/pinctrl-mxs.h             |   6 +-
 drivers/pinctrl/pinctrl-zynqmp.c              |   8 +-
 drivers/qe/qe.c                               |   4 +-
 drivers/ram/aspeed/sdram_ast2600.c            |  12 +-
 drivers/ram/octeon/octeon_ddr.c               |   8 +-
 drivers/ram/rockchip/dmc-rk3368.c             |   2 +-
 drivers/serial/ns16550.c                      |  12 +-
 drivers/serial/serial_omap.c                  |   6 +-
 drivers/serial/usbtty.c                       |  28 +-
 drivers/serial/usbtty.h                       |  18 +-
 drivers/spi/mxc_spi.c                         |   6 +-
 drivers/timer/mpc83xx_timer.c                 |   6 +-
 drivers/ufs/ufs.h                             |   2 +-
 drivers/usb/gadget/ci_udc.c                   |  10 +-
 drivers/usb/gadget/ci_udc.h                   |   6 +-
 drivers/usb/host/ehci-faraday.c               |   6 +-
 drivers/usb/host/ehci-tegra.c                 |   6 +-
 drivers/usb/musb-new/linux-compat.h           |   4 +-
 drivers/usb/musb-new/musb_core.c              |   4 +-
 drivers/usb/musb-new/musb_core.h              |   2 +-
 drivers/usb/ulpi/omap-ulpi-viewport.c         |   2 +-
 drivers/usb/ulpi/ulpi-viewport.c              |   2 +-
 drivers/usb/ulpi/ulpi.c                       |   2 +-
 include/command.h                             |   4 +-
 include/env_callback.h                        |   6 +-
Quoted 9 lines
 include/fm_eth.h                              |  28 +-
 include/fsl_ddr_sdram.h                       |  16 +-
 include/fsl_usb.h                             |  42 +--
 include/usb/ulpi.h                            |   4 +-
 lib/gzip.c                                    |  14 +-
 lib/time.c                                    |   6 +-
 net/bootp.c                                   |  14 +-
 137 files changed, 1087 insertions(+), 1087 deletions(-)
author
#27 lore raw

PATCH 19/19 CI: Make check for new defined CONFIG symbols even more robust

In reply to Tom Rini

Now that all remaining in-tree cases where we define or undef a CONFIG symbol have been migrated to Kconfig or renamed to CFG we can make the CI check more robust. We will exclude the doc, tools and arch/arm/dts directories from this check as they are special cases. Further, we can exclude the scripts/kconfig/lkc.h and include/linux/kconfig.h files as the CONFIG values they define are special tooling cases and not real symbols.

In the case of docs, the only places that currently fail this test are old documentation that should be rewritten so that we can remove this special case.

---
 .azure-pipelines.yml | 3 ++-
 .gitlab-ci.yml       | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
.azure-pipelines.yml +2 -1
index 02cd8e416914..d42a442b1eb1 100644
@@ -64,7 +64,8 @@ stages:
       # If grep succeeds and finds a match the test fails as we should
       # have no matches.
       - script: git grep -E '^#[[:blank:]]*(define|undef)[[:blank:]]*CONFIG_'
-                  include/configs `find arch -name config.h` && exit 1 || exit 0
+                  :^doc/ :^arch/arm/dts/ :^scripts/kconfig/lkc.h
+                  :^include/linux/kconfig.h :^tools/ && exit 1 || exit 0
 
   - job: cppcheck
     displayName: 'Static code analysis with cppcheck'
.gitlab-ci.yml +2 -1
index afd83948c1af..ff3920c0d5aa 100644
@@ -131,7 +131,8 @@ check for new CONFIG symbols outside Kconfig:
     # If grep succeeds and finds a match the test fails as we should
     # have no matches.
     - git grep -E '^#[[:blank:]]*(define|undef)[[:blank:]]*CONFIG_'
-        include/configs `find arch -name config.h` && exit 1 || exit 0
+        :^doc/ :^arch/arm/dts/ :^scripts/kconfig/lkc.h
+        :^include/linux/kconfig.h :^tools/ && exit 1 || exit 0
 
 # QA jobs for code analytics
 # static code analysis with cppcheck (we can add --enable=all later)
Signature · 1 line
2.25.1
Reviewed-by on v1 19/19
#28 lore raw

Re: [PATCH 19/19] CI: Make check for new defined CONFIG symbols even more robust

Quoted 13 lines · Tom Rini

Now that all remaining in-tree cases where we define or undef a CONFIG symbol have been migrated to Kconfig or renamed to CFG we can make the CI check more robust. We will exclude the doc, tools and arch/arm/dts directories from this check as they are special cases. Further, we can exclude the scripts/kconfig/lkc.h and include/linux/kconfig.h files as the CONFIG values they define are special tooling cases and not real symbols.

In the case of docs, the only places that currently fail this test are old documentation that should be rewritten so that we can remove this special case.

Quoted 6 lines
---
 .azure-pipelines.yml | 3 ++-
 .gitlab-ci.yml       | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
author
#29 lore raw
In reply to Tom Rini
Quoted 4 lines · Tom Rini

Remove some CONFIG symbols and related comments, etc, that are unused within the code itself at this point.

For the series (and v2 of #5), applied to u-boot/master, thanks!

Signature · 1 line
Tom