Skip to contentSkip to conversation

power: pmic: Guard non-DM_PMIC drivers with a check for POWER_LEGACY

PATCH In review Tom Rini 7 participants 537 messages Nov 19, 2022 – Dec 24, 2022 1 message not in the archive Page 1 of 8

Subsystems (59)
lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/38 power: pmic: Guard non-DM_PMIC drivers with a check for POWER_LEGACY

As we have more legacy PMIC drivers to move to Kconfig, guard them all with POWER_LEGACY or SPL_POWER_LEGACY. Do the same kind of check for building the drivers too. This also means that we need to resort the list slightly in the Makefile.

Cc Jaehoon Chung <[email protected]>
---
 drivers/power/pmic/Kconfig  |  5 ++++-
 drivers/power/pmic/Makefile | 10 ++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)
drivers/power/pmic/Kconfig +4 -1
index 628d3a94bcba..d30bb4d4e9cc 100644
@@ -393,10 +393,13 @@ config PMIC_TPS65217
 	only, and you can enable the regulator/charger drivers separately if
 	required.
 
+if POWER_LEGACY || SPL_POWER_LEGACY
+
 config POWER_MC34VR500
 	bool "Enable driver for Freescale MC34VR500 PMIC"
-	depends on !DM_PMIC
 	---help---
 	The MC34VR500 is used in conjunction with the FSL T1 and LS1 series
 	SoC. It provides 4 buck DC-DC convertors and 5 LDOs, and it is accessed
 	via an I2C interface.
+
+endif
drivers/power/pmic/Makefile +6 -4
index 58c6507c58c3..e78dc1e20535 100644
@@ -30,17 +30,19 @@ obj-$(CONFIG_$(SPL_)PMIC_PALMAS) += palmas.o
 obj-$(CONFIG_$(SPL_)PMIC_LP873X) += lp873x.o
 obj-$(CONFIG_$(SPL_)PMIC_LP87565) += lp87565.o
 obj-$(CONFIG_PMIC_STPMIC1) += stpmic1.o
+obj-$(CONFIG_PMIC_TPS65217) += pmic_tps65217.o
+obj-$(CONFIG_PMIC_TPS65219) += tps65219.o
+obj-$(CONFIG_PMIC_TPS65941) += tps65941.o
 
+ifeq ($(CONFIG_$(SPL_)POWER_LEGACY),y)
 obj-$(CONFIG_POWER_LTC3676) += pmic_ltc3676.o
 obj-$(CONFIG_POWER_MUIC_MAX8997) += muic_max8997.o
 obj-$(CONFIG_POWER_PCA9450) += pmic_pca9450.o
 obj-$(CONFIG_POWER_PFUZE100) += pmic_pfuze100.o
 obj-$(CONFIG_POWER_PFUZE3000) += pmic_pfuze3000.o
-obj-$(CONFIG_PMIC_TPS65217) += pmic_tps65217.o
-obj-$(CONFIG_POWER_TPS65218) += pmic_tps62362.o
+obj-$(CONFIG_POWER_TPS62362) += pmic_tps62362.o
 obj-$(CONFIG_POWER_TPS65218) += pmic_tps65218.o
 obj-$(CONFIG_POWER_TPS65910) += pmic_tps65910.o
 obj-$(CONFIG_POWER_HI6553) += pmic_hi6553.o
 obj-$(CONFIG_POWER_MC34VR500) += pmic_mc34vr500.o
-obj-$(CONFIG_PMIC_TPS65941) += tps65941.o
-obj-$(CONFIG_PMIC_TPS65219) += tps65219.o
+endif
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH 2/38 Convert CONFIG_FSL_CADMUS to Kconfig

This converts the following to Kconfig:
CONFIG_FSL_CADMUS

---
 board/freescale/mpc8548cds/Kconfig | 3 +++
 include/configs/MPC8548CDS.h       | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)
board/freescale/mpc8548cds/Kconfig +3 -0
index bd9153bc0d74..723ead51e5ce 100644
@@ -3,6 +3,9 @@ if TARGET_MPC8548CDS
 config PCI1
 	def_bool y
 
+config FSL_CADMUS
+	def_bool y
+
 config SYS_BOARD
 	default "mpc8548cds"
 
include/configs/MPC8548CDS.h +0 -2
index ff02c2cd8472..e41b8e0843a7 100644
@@ -217,8 +217,6 @@
  * 1111 1111 1111 0000 0000 1111 1111 0111 = fff00ff7
  */
 
-#define CONFIG_FSL_CADMUS
-
 #define CADMUS_BASE_ADDR 0xf8000000
 #ifdef CONFIG_PHYS_64BIT
 #define CADMUS_BASE_ADDR_PHYS	0xff8000000ull
Signature · 1 line
2.25.1
author
#2 lore raw

PATCH 3/38 Convert CONFIG_FSL_DEVICE_DISABLE to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_FSL_DEVICE_DISABLE

---
 arch/arm/cpu/armv7/ls102xa/Kconfig   | 4 ++++
 include/configs/km/pg-wcom-ls102xa.h | 1 -
 include/configs/ls1021aiot.h         | 2 --
 include/configs/ls1021aqds.h         | 2 --
 include/configs/ls1021atsn.h         | 2 --
 include/configs/ls1021atwr.h         | 2 --
 6 files changed, 4 insertions(+), 9 deletions(-)
arch/arm/cpu/armv7/ls102xa/Kconfig +4 -0
index e75a895e0086..369e68b8193b 100644
@@ -1,5 +1,6 @@
 config ARCH_LS1021A
 	bool
+	select FSL_DEVICE_DISABLE
 	select FSL_IFC if !QSPI_BOOT && !SD_BOOT_QSPI
 	select SYS_FSL_DDR_BE if SYS_FSL_DDR
 	select SYS_FSL_DDR_VER_50 if SYS_FSL_DDR
@@ -30,6 +31,9 @@ config ARCH_LS1021A
 menu "LS102xA architecture"
 	depends on ARCH_LS1021A
 
+config FSL_DEVICE_DISABLE
+	bool
+
 config LS1_DEEP_SLEEP
 	bool "Deep sleep"
 
include/configs/km/pg-wcom-ls102xa.h +0 -1
index 7307c495c38e..6ccb4f07e3be 100644
@@ -168,7 +168,6 @@
 
 #define CONFIG_HWCONFIG
 #define HWCONFIG_BUFFER_SIZE		256
-#define CONFIG_FSL_DEVICE_DISABLE
 
 /*
  * Miscellaneous configurable options
include/configs/ls1021aiot.h +0 -2
index b058308ecdbe..3063635592e2 100644
@@ -95,8 +95,6 @@
 #define CONFIG_HWCONFIG
 #define HWCONFIG_BUFFER_SIZE		256
 
-#define CONFIG_FSL_DEVICE_DISABLE
-
 #define CONFIG_EXTRA_ENV_SETTINGS	\
 	"bootargs=root=/dev/ram0 rw console=ttyS0,115200\0" \
 "initrd_high=0xffffffff\0"
include/configs/ls1021aqds.h +0 -2
index 5494b71e2b21..137d459c291e 100644
@@ -279,8 +279,6 @@
 #define CONFIG_HWCONFIG
 #define HWCONFIG_BUFFER_SIZE		256
 
-#define CONFIG_FSL_DEVICE_DISABLE
-
 #ifdef CONFIG_LPUART
 #define CONFIG_EXTRA_ENV_SETTINGS       \
 	"bootargs=root=/dev/ram0 rw console=ttyLP0,115200\0" \
include/configs/ls1021atsn.h +0 -2
index bc9eac700e98..052a15658d71 100644
@@ -70,8 +70,6 @@
 #define CONFIG_HWCONFIG
 #define HWCONFIG_BUFFER_SIZE		256
 
-#define CONFIG_FSL_DEVICE_DISABLE
-
 #define BOOT_TARGET_DEVICES(func) \
 	func(MMC, mmc, 0) \
 	func(USB, usb, 0) \
include/configs/ls1021atwr.h +0 -2
index f1ccb5fc0840..f39c7c088446 100644
@@ -160,8 +160,6 @@
 #define CONFIG_HWCONFIG
 #define HWCONFIG_BUFFER_SIZE		256
 
-#define CONFIG_FSL_DEVICE_DISABLE
-
 #define BOOT_TARGET_DEVICES(func) \
 	func(MMC, mmc, 0) \
 	func(USB, usb, 0) \
Signature · 1 line
2.25.1
author
#3 lore raw

PATCH 4/38 Convert CONFIG_FSL_IIM to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_FSL_IIM

---
 configs/m53menlo_defconfig  | 1 +
 configs/mx51evk_defconfig   | 1 +
 configs/mx53ppd_defconfig   | 1 +
 configs/usbarmory_defconfig | 1 +
 doc/README.fsl_iim          | 2 +-
 drivers/misc/Kconfig        | 4 ++++
 include/configs/m53menlo.h  | 3 ---
 include/configs/mx51evk.h   | 1 -
 include/configs/mx53ppd.h   | 2 --
 include/configs/usbarmory.h | 3 ---
 10 files changed, 9 insertions(+), 10 deletions(-)
configs/m53menlo_defconfig +1 -0
index b4ada56a36b7..a5760242be51 100644
@@ -80,6 +80,7 @@ CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_SYS_BOOTCOUNT_MAGIC=0x0B01C041
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_MXC=y
+CONFIG_FSL_IIM=y
 CONFIG_FSL_ESDHC_IMX=y
 CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
configs/mx51evk_defconfig +1 -0
index 89597c05748c..d76ebe8fd229 100644
@@ -40,6 +40,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="FEC0"
 CONFIG_ARP_TIMEOUT=200
+CONFIG_FSL_IIM=y
 CONFIG_FSL_ESDHC_IMX=y
 CONFIG_MTD=y
 CONFIG_PHYLIB=y
configs/mx53ppd_defconfig +1 -0
index 328f546c5b3f..ed4ebbbe3c27 100644
@@ -52,6 +52,7 @@ CONFIG_SYS_I2C_MXC=y
 CONFIG_I2C_MUX=y
 CONFIG_I2C_MUX_PCA954x=y
 CONFIG_MISC=y
+CONFIG_FSL_IIM=y
 CONFIG_I2C_EEPROM=y
 CONFIG_FSL_ESDHC_IMX=y
 CONFIG_MTD=y
configs/usbarmory_defconfig +1 -0
index 510e215bff3a..ed2bcc69fc50 100644
@@ -29,6 +29,7 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_MXC=y
+CONFIG_FSL_IIM=y
 CONFIG_FSL_ESDHC_IMX=y
 CONFIG_MTD=y
 CONFIG_PINCTRL=y
doc/README.fsl_iim +1 -1
index e087f5e0e4ff..78d3cb8b3efe 100644
@@ -45,4 +45,4 @@ Fuse operations:
 Configuration:
 
    CONFIG_FSL_IIM
-      Define this to enable the fsl_iim driver.
+      Enable this to enable the fsl_iim driver.
drivers/misc/Kconfig +4 -0
index a6da6e215dec..fb3bbb3b919f 100644
@@ -267,6 +267,10 @@ config DS4510
 	  and a configurable timer for the supervisor function. The device is
 	  connected over I2C.
 
+config FSL_IIM
+	bool "Enable FSL IC Identification Module (IIM) driver"
+	depends on ARCH_MX31 || ARCH_MX5
+
 config FSL_SEC_MON
 	bool "Enable FSL SEC_MON Driver"
 	help
include/configs/m53menlo.h +0 -3
index f87bbf7ccf32..eca86a94519a 100644
@@ -80,9 +80,6 @@
 #define CFG_SYS_LDB_CLOCK			33260000
 #define CONFIG_IMX_VIDEO_SKIP
 
-/* IIM Fuses */
-#define CONFIG_FSL_IIM
-
 /* Watchdog */
 
 /*
include/configs/mx51evk.h +0 -1
index 3c99b70a2bb1..6d9b954587ef 100644
@@ -17,7 +17,6 @@
 /*
  * Hardware drivers
  */
-#define CONFIG_FSL_IIM
 
 #define CONFIG_MXC_UART_BASE	UART1_BASE
 
include/configs/mx53ppd.h +0 -2
index 7160654eb30c..913bc1996d40 100644
@@ -102,8 +102,6 @@
 
 /* FLASH and environment organization */
 
-#define CONFIG_FSL_IIM
-
 /* Backlight Control */
 #define CONFIG_IMX6_PWM_PER_CLK 66666000
 
include/configs/usbarmory.h +0 -3
index da68d7a0da99..a2bc3cd23a5b 100644
@@ -27,9 +27,6 @@
 #define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS	0
 
-/* Fuse */
-#define CONFIG_FSL_IIM
-
 /* Linux boot */
 #define CONFIG_HOSTNAME		"usbarmory"
 
Signature · 1 line
2.25.1
author
#4 lore raw

PATCH 5/38 Convert CONFIG_FSL_LBC to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_FSL_LBC

---
 arch/powerpc/Kconfig              | 4 ++++
 arch/powerpc/include/asm/config.h | 8 --------
 2 files changed, 4 insertions(+), 8 deletions(-)
arch/powerpc/Kconfig +4 -0
index cf93a7b1dad0..0fc4ceda000d 100644
@@ -34,6 +34,10 @@ config MPC8xx
 
 endchoice
 
+config FSL_LBC
+	def_bool y
+	depends on (MPC85xx || MPC83xx) && !FSL_IFC
+
 config HIGH_BATS
 	bool "Enable high BAT registers"
 	help
arch/powerpc/include/asm/config.h +0 -8
index b0ad7d7aa728..983c6f70cfee 100644
@@ -32,14 +32,6 @@
 #define BPTR_VIRT_ADDR	0xfffff000
 #endif
 
-/* Since so many PPC SOCs have a semi-common LBC, define this here */
-#if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx) || \
-	defined(CONFIG_MPC83xx)
-#if !defined(CONFIG_FSL_IFC)
-#define CONFIG_FSL_LBC
-#endif
-#endif
-
 /* The TSEC driver uses the PHYLIB infrastructure */
 #if defined(CONFIG_TSEC_ENET) && defined(CONFIG_PHYLIB)
 #include <config_phylib_all_drivers.h>
Signature · 1 line
2.25.1
author
#5 lore raw

PATCH 6/38 Convert CONFIG_FSL_SERDES to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_FSL_SERDES

---
 arch/powerpc/cpu/mpc83xx/Kconfig  | 4 ++++
 arch/powerpc/cpu/mpc83xx/serdes.c | 4 ----
 configs/MPC837XERDB_defconfig     | 1 +
 include/configs/MPC837XERDB.h     | 1 -
 4 files changed, 5 insertions(+), 5 deletions(-)
arch/powerpc/cpu/mpc83xx/Kconfig +4 -0
index ec3405e9678f..563f52c5fdb3 100644
@@ -196,6 +196,10 @@ config 83XX_PCICLK
 config FSL_ELBC
 	bool
 
+config FSL_SERDES
+	bool "SerDes initialization"
+	depends on !MPC83XX_SERDES
+
 source "board/freescale/mpc837xerdb/Kconfig"
 source "board/gdsys/mpc8308/Kconfig"
 
arch/powerpc/cpu/mpc83xx/serdes.c +0 -4
index bb963ee5e2f4..d4848b2ec4d5 100644
@@ -8,8 +8,6 @@
  * Author: Li Yang <[email protected]>
  */
 
-#ifndef CONFIG_MPC83XX_SERDES
-
 #include <config.h>
 #include <common.h>
 #include <asm/io.h>
@@ -151,5 +149,3 @@ void fsl_setup_serdes(u32 offset, char proto, u32 rfcks, char vdd)
 	tmp |= FSL_SRDSRSTCTL_RST;
 	out_be32(regs + FSL_SRDSRSTCTL_OFFS, tmp);
 }
-
-#endif /* !CONFIG_MPC83XX_SERDES */
configs/MPC837XERDB_defconfig +1 -0
index 675b2de151c7..d97fa5aec521 100644
@@ -147,6 +147,7 @@ CONFIG_ACR_RPTCNT_4=y
 CONFIG_SPCR_TSECEP_3=y
 CONFIG_LCRR_DBYP_PLL_BYPASSED=y
 CONFIG_LCRR_CLKDIV_8=y
+CONFIG_FSL_SERDES=y
 CONFIG_SYS_MONITOR_LEN=524288
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
include/configs/MPC837XERDB.h +0 -1
index 85c080cf27a5..717320c34aeb 100644
@@ -160,7 +160,6 @@
 #define CFG_SYS_NS16550_COM2	(CONFIG_SYS_IMMR+0x4600)
 
 /* SERDES */
-#define CONFIG_FSL_SERDES
 #define CONFIG_FSL_SERDES1	0xe3000
 #define CONFIG_FSL_SERDES2	0xe3100
 
Signature · 1 line
2.25.1
author
#6 lore raw

PATCH 7/38 Convert CONFIG_HIKEY_GPIO et al to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_HIKEY_GPIO
CONFIG_TCA642X

---
 configs/hikey_defconfig      | 1 +
 configs/omap5_uevm_defconfig | 2 +-
 drivers/gpio/Kconfig         | 9 +++++++++
 include/configs/hikey.h      | 2 --
 include/configs/omap5_uevm.h | 1 -
 5 files changed, 11 insertions(+), 4 deletions(-)
configs/hikey_defconfig +1 -0
index 9eec9281849c..d023653815cd 100644
@@ -30,6 +30,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_HIKEY_GPIO=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_K3=y
 CONFIG_POWER_LEGACY=y
configs/omap5_uevm_defconfig +1 -1
index bd0ede759cb9..502990b0a8b9 100644
@@ -47,7 +47,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_SCSI_AHCI=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
-CONFIG_CMD_TCA642X=y
+CONFIG_TCA642X=y
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SPL_SYS_I2C_LEGACY=y
 CONFIG_SUPPORT_EMMC_BOOT=y
drivers/gpio/Kconfig +9 -0
index ff87fbfb397e..e007b38fac71 100644
@@ -169,6 +169,10 @@ config FXL6408_GPIO
 	  This driver supports the Fairchild FXL6408 device. FXL6408 is a
 	  fully configurable 8-bit I2C-controlled GPIO expander.
 
+config HIKEY_GPIO
+	bool "HI6220 GPIO driver"
+	depends on DM_GPIO
+
 config INTEL_BROADWELL_GPIO
 	bool "Intel Broadwell GPIO driver"
 	depends on DM
@@ -374,8 +378,13 @@ config XILINX_GPIO
 	help
 	  This config enable the Xilinx GPIO driver for Microblaze.
 
+config TCA642X
+	bool "TCA642x legacy GPIO driver"
+
 config CMD_TCA642X
 	bool "tca642x - Command to access tca642x state"
+	depends on TCA642X
+	default y
 	help
 	  DEPRECATED - This needs conversion to driver model
 
include/configs/hikey.h +0 -2
index c5ef2f99b0f4..eefdbd6ed11b 100644
@@ -32,8 +32,6 @@
 #define GICD_BASE			0xf6801000
 #define GICC_BASE			0xf6802000
 
-#define CONFIG_HIKEY_GPIO
-
 /* Initial environment variables */
 
 /*
include/configs/omap5_uevm.h +0 -1
index 1634db860640..d7fa2d43914a 100644
@@ -36,7 +36,6 @@
 #define CONFIG_HSMMC2_8BIT
 
 /* Required support for the TCA642X GPIO we have on the uEVM */
-#define CONFIG_TCA642X
 #define CFG_SYS_I2C_TCA642X_BUS_NUM 4
 #define CFG_SYS_I2C_TCA642X_ADDR 0x22
 
Signature · 1 line
2.25.1
author
#7 lore raw

PATCH 8/38 Convert CONFIG_POWER_LTC3676 et al to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_POWER_FSL
CONFIG_POWER_FSL_MC13892
CONFIG_POWER_HI6553
CONFIG_POWER_LTC3676
CONFIG_POWER_PFUZE100
CONFIG_POWER_PFUZE3000
CONFIG_POWER_SPI
CONFIG_POWER_TPS65090_EC
CONFIG_POWER_TPS65218
CONFIG_POWER_TPS65910

---
 board/freescale/common/Makefile           |  2 ++
 configs/am335x_baltos_defconfig           |  1 +
 configs/am335x_boneblack_vboot_defconfig  |  1 +
 configs/am335x_evm_defconfig              |  1 +
 configs/am335x_evm_spiboot_defconfig      |  1 +
 configs/am335x_hs_evm_defconfig           |  1 +
 configs/am335x_hs_evm_uart_defconfig      |  1 +
 configs/am335x_sl50_defconfig             |  1 +
 configs/am43xx_evm_defconfig              |  2 ++
 configs/am43xx_evm_qspiboot_defconfig     |  2 ++
 configs/am43xx_evm_rtconly_defconfig      |  2 ++
 configs/am43xx_evm_usbhost_boot_defconfig |  2 ++
 configs/am43xx_hs_evm_defconfig           |  2 ++
 configs/am43xx_hs_evm_qspi_defconfig      |  2 ++
 configs/cl-som-imx7_defconfig             |  1 +
 configs/cm_t43_defconfig                  |  1 +
 configs/gwventana_emmc_defconfig          |  2 ++
 configs/gwventana_gw5904_defconfig        |  2 ++
 configs/gwventana_nand_defconfig          |  2 ++
 configs/hikey_defconfig                   |  1 +
 configs/imx8mq_evk_defconfig              |  1 +
 configs/kontron_pitx_imx8m_defconfig      |  1 +
 configs/mx51evk_defconfig                 |  2 ++
 configs/mx53loco_defconfig                |  1 +
 configs/mx6sabreauto_defconfig            |  1 +
 configs/mx6sabresd_defconfig              |  1 +
 configs/novena_defconfig                  |  1 +
 configs/pcm051_rev3_defconfig             |  1 +
 configs/phycore-am335x-r2-regor_defconfig |  1 +
 configs/phycore-am335x-r2-wega_defconfig  |  1 +
 configs/pico-dwarf-imx7d_defconfig        |  1 +
 configs/pico-hobbit-imx7d_defconfig       |  1 +
 configs/pico-imx7d_bl33_defconfig         |  1 +
 configs/pico-imx7d_defconfig              |  1 +
 configs/pico-nymph-imx7d_defconfig        |  1 +
 configs/pico-pi-imx7d_defconfig           |  1 +
 configs/udoo_neo_defconfig                |  1 +
 configs/vining_2000_defconfig             |  1 +
 drivers/power/Kconfig                     | 21 ++++++++++++++++++
 drivers/power/pmic/Kconfig                | 27 +++++++++++++++++++++++
 drivers/power/pmic/Makefile               |  7 +++---
 drivers/power/power_fsl.c                 |  2 --
 include/configs/am335x_evm.h              |  3 ---
 include/configs/am335x_sl50.h             |  7 ------
 include/configs/am43xx_evm.h              |  8 -------
 include/configs/baltos.h                  |  3 ---
 include/configs/cl-som-imx7.h             |  1 -
 include/configs/cm_t43.h                  |  3 ---
 include/configs/el6x_common.h             |  1 -
 include/configs/gw_ventana.h              |  2 --
 include/configs/hikey.h                   |  2 --
 include/configs/imx8mq_evk.h              |  1 -
 include/configs/kontron_pitx_imx8m.h      |  1 -
 include/configs/mx51evk.h                 |  2 --
 include/configs/mx53loco.h                |  2 --
 include/configs/mx6sabreauto.h            |  1 -
 include/configs/mx6sabresd.h              |  1 -
 include/configs/novena.h                  |  1 -
 include/configs/peach-pi.h                |  2 --
 include/configs/phycore_am335x_r2.h       |  2 --
 include/configs/pico-imx7d.h              |  1 -
 include/configs/tqma6.h                   |  1 -
 include/configs/udoo_neo.h                |  1 -
 include/configs/vining_2000.h             |  1 -
 64 files changed, 101 insertions(+), 52 deletions(-)
board/freescale/common/Makefile +2 -0
index 377c6aa077dc..cc1371867d86 100644
@@ -61,7 +61,9 @@ obj-$(CONFIG_TARGET_P4080DS)		+= ics307_clk.o
 obj-$(CONFIG_TARGET_P5040DS)		+= ics307_clk.o
 obj-$(CONFIG_VSC_CROSSBAR)    += vsc3316_3308.o
 obj-$(CONFIG_ZM7300)		+= zm7300.o
+ifeq ($(CONFIG_$(SPL_)POWER_LEGACY),y)
 obj-$(CONFIG_POWER_PFUZE100)	+= pfuze.o
+endif
 obj-$(CONFIG_DM_PMIC_PFUZE100)	+= pfuze.o
 obj-$(CONFIG_POWER_MC34VR500)	+= mc34vr500.o
 ifneq (,$(filter $(SOC), imx8ulp imx9))
configs/am335x_baltos_defconfig +1 -0
index bd23b71b096e..9976cee81fcc 100644
@@ -79,6 +79,7 @@ CONFIG_PHY_SMSC=y
 CONFIG_DM_MDIO=y
 CONFIG_MII=y
 CONFIG_DRIVER_TI_CPSW=y
+CONFIG_SPL_POWER_TPS65910=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_OMAP3_SPI=y
configs/am335x_boneblack_vboot_defconfig +1 -0
index 66b7fb6e06d8..442783a9d02b 100644
@@ -76,6 +76,7 @@ CONFIG_DRIVER_TI_CPSW=y
 CONFIG_DM_PMIC=y
 # CONFIG_SPL_DM_PMIC is not set
 CONFIG_PMIC_TPS65217=y
+CONFIG_SPL_POWER_TPS65910=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_OMAP3_SPI=y
configs/am335x_evm_defconfig +1 -0
index f0fbe475b394..cee31676d440 100644
@@ -101,6 +101,7 @@ CONFIG_DRIVER_TI_CPSW=y
 CONFIG_DM_PMIC=y
 # CONFIG_SPL_DM_PMIC is not set
 CONFIG_PMIC_TPS65217=y
+CONFIG_SPL_POWER_TPS65910=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_OMAP3_SPI=y
configs/am335x_evm_spiboot_defconfig +1 -0
index 3d04e6fa934a..ae4a7018d39c 100644
@@ -88,6 +88,7 @@ CONFIG_DRIVER_TI_CPSW=y
 CONFIG_DM_PMIC=y
 # CONFIG_SPL_DM_PMIC is not set
 CONFIG_PMIC_TPS65217=y
+CONFIG_SPL_POWER_TPS65910=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_OMAP3_SPI=y
configs/am335x_hs_evm_defconfig +1 -0
index 8d3a4548d9a0..5dc9ba98fdea 100644
@@ -80,6 +80,7 @@ CONFIG_DRIVER_TI_CPSW=y
 CONFIG_DM_PMIC=y
 # CONFIG_SPL_DM_PMIC is not set
 CONFIG_PMIC_TPS65217=y
+CONFIG_SPL_POWER_TPS65910=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_OMAP3_SPI=y
configs/am335x_hs_evm_uart_defconfig +1 -0
index 7080b14c4671..68513c1b6a92 100644
@@ -81,6 +81,7 @@ CONFIG_DRIVER_TI_CPSW=y
 CONFIG_DM_PMIC=y
 # CONFIG_SPL_DM_PMIC is not set
 CONFIG_PMIC_TPS65217=y
+CONFIG_SPL_POWER_TPS65910=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_OMAP3_SPI=y
configs/am335x_sl50_defconfig +1 -0
index 65b20550c0c6..673824cfecf4 100644
@@ -75,6 +75,7 @@ CONFIG_PHY_SMSC=y
 CONFIG_MII=y
 CONFIG_DRIVER_TI_CPSW=y
 CONFIG_PMIC_TPS65217=y
+CONFIG_SPL_POWER_TPS65910=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_OMAP3_SPI=y
configs/am43xx_evm_defconfig +2 -0
index 2dfd936057f0..2faf1322f9ea 100644
@@ -88,6 +88,8 @@ CONFIG_DRIVER_TI_CPSW=y
 CONFIG_PHY=y
 CONFIG_SPL_PHY=y
 CONFIG_OMAP_USB2_PHY=y
+CONFIG_POWER_TPS65218=y
+CONFIG_POWER_TPS62362=y
 CONFIG_DM_SERIAL=y
 CONFIG_SPI=y
 CONFIG_TI_QSPI=y
configs/am43xx_evm_qspiboot_defconfig +2 -0
index 0b759c8c2c40..20e1a469aaa1 100644
@@ -53,6 +53,8 @@ CONFIG_SF_DEFAULT_SPEED=48000000
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_MII=y
 CONFIG_DRIVER_TI_CPSW=y
+CONFIG_POWER_TPS65218=y
+CONFIG_POWER_TPS62362=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_TI_QSPI=y
configs/am43xx_evm_rtconly_defconfig +2 -0
index 357da192b83b..4241070930f7 100644
@@ -72,6 +72,8 @@ CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_PHY_GIGE=y
 CONFIG_MII=y
 CONFIG_DRIVER_TI_CPSW=y
+CONFIG_POWER_TPS65218=y
+CONFIG_POWER_TPS62362=y
 CONFIG_DM_SERIAL=y
 CONFIG_SPI=y
 CONFIG_TI_QSPI=y
configs/am43xx_evm_usbhost_boot_defconfig +2 -0
index 0e58221c8203..91270d032bff 100644
@@ -91,6 +91,8 @@ CONFIG_DRIVER_TI_CPSW=y
 CONFIG_PHY=y
 CONFIG_SPL_PHY=y
 CONFIG_OMAP_USB2_PHY=y
+CONFIG_POWER_TPS65218=y
+CONFIG_POWER_TPS62362=y
 CONFIG_DM_SERIAL=y
 CONFIG_SPI=y
 CONFIG_TI_QSPI=y
configs/am43xx_hs_evm_defconfig +2 -0
index 2b5a7fb2599b..b6b74af735e7 100644
@@ -86,6 +86,8 @@ CONFIG_DRIVER_TI_CPSW=y
 CONFIG_PHY=y
 CONFIG_SPL_PHY=y
 CONFIG_OMAP_USB2_PHY=y
+CONFIG_POWER_TPS65218=y
+CONFIG_POWER_TPS62362=y
 CONFIG_DM_SERIAL=y
 CONFIG_SPI=y
 CONFIG_TI_QSPI=y
configs/am43xx_hs_evm_qspi_defconfig +2 -0
index 68a96518878b..3d3530d967c6 100644
@@ -55,6 +55,8 @@ CONFIG_SF_DEFAULT_SPEED=48000000
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_MII=y
 CONFIG_DRIVER_TI_CPSW=y
+CONFIG_POWER_TPS65218=y
+CONFIG_POWER_TPS62362=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_TI_QSPI=y
configs/cl-som-imx7_defconfig +1 -0
index f3ee559d21fc..3571dba6d2ae 100644
@@ -95,6 +95,7 @@ CONFIG_PHY_ATHEROS=y
 CONFIG_FEC_MXC=y
 CONFIG_MII=y
 CONFIG_POWER_LEGACY=y
+CONFIG_POWER_PFUZE3000=y
 CONFIG_DM_REGULATOR=y
 CONFIG_POWER_I2C=y
 CONFIG_MXC_UART=y
configs/cm_t43_defconfig +1 -0
index 0a5ce2046f1c..867ca3032058 100644
@@ -95,6 +95,7 @@ CONFIG_PHY_ATHEROS=y
 CONFIG_MII=y
 CONFIG_DRIVER_TI_CPSW=y
 CONFIG_POWER_LEGACY=y
+CONFIG_POWER_TPS65218=y
 CONFIG_POWER_I2C=y
 CONFIG_DM_SERIAL=y
 CONFIG_SPI=y
configs/gwventana_emmc_defconfig +2 -0
index cabe09e6d389..ce81b558ee21 100644
@@ -119,6 +119,8 @@ CONFIG_PCIE_IMX=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
 CONFIG_POWER_LEGACY=y
+CONFIG_POWER_LTC3676=y
+CONFIG_POWER_PFUZE100=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_POWER_I2C=y
configs/gwventana_gw5904_defconfig +2 -0
index f58abd9c5e57..3ef909a1ce30 100644
@@ -123,6 +123,8 @@ CONFIG_PCIE_IMX=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
 CONFIG_POWER_LEGACY=y
+CONFIG_POWER_LTC3676=y
+CONFIG_POWER_PFUZE100=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_POWER_I2C=y
configs/gwventana_nand_defconfig +2 -0
index a41b3c4c97ef..d3d4876658a0 100644
@@ -129,6 +129,8 @@ CONFIG_PCIE_IMX=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
 CONFIG_POWER_LEGACY=y
+CONFIG_POWER_LTC3676=y
+CONFIG_POWER_PFUZE100=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_POWER_I2C=y
configs/hikey_defconfig +1 -0
index d023653815cd..152459ece8dc 100644
@@ -34,6 +34,7 @@ CONFIG_HIKEY_GPIO=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_K3=y
 CONFIG_POWER_LEGACY=y
+CONFIG_POWER_HI6553=y
 CONFIG_CONS_INDEX=4
 CONFIG_USB=y
 CONFIG_USB_DWC2=y
configs/imx8mq_evk_defconfig +1 -0
index 274cdb948d7c..79a27dedb371 100644
@@ -88,6 +88,7 @@ CONFIG_PINCTRL_IMX8M=y
 CONFIG_SPL_POWER_LEGACY=y
 CONFIG_POWER_DOMAIN=y
 CONFIG_IMX8M_POWER_DOMAIN=y
+CONFIG_POWER_PFUZE100=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
configs/kontron_pitx_imx8m_defconfig +1 -0
index d2726b1c2002..898a0b45e85a 100644
@@ -95,6 +95,7 @@ CONFIG_PINCTRL_IMX8M=y
 CONFIG_SPL_POWER_LEGACY=y
 CONFIG_POWER_DOMAIN=y
 CONFIG_IMX8M_POWER_DOMAIN=y
+CONFIG_POWER_PFUZE100=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
configs/mx51evk_defconfig +2 -0
index d76ebe8fd229..774523bc84b8 100644
@@ -54,6 +54,8 @@ CONFIG_POWER_LEGACY=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_POWER_FSL=y
+CONFIG_POWER_SPI=y
 CONFIG_MXC_UART=y
 CONFIG_SPI=y
 CONFIG_MXC_SPI=y
configs/mx53loco_defconfig +1 -0
index 193120f71a46..08bcd35f0734 100644
@@ -58,6 +58,7 @@ CONFIG_POWER_LEGACY=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_POWER_FSL=y
 CONFIG_POWER_I2C=y
 CONFIG_MXC_UART=y
 CONFIG_USB=y
configs/mx6sabreauto_defconfig +1 -0
index 2aa15ce8c651..634473f30743 100644
@@ -95,6 +95,7 @@ CONFIG_MII=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
 CONFIG_POWER_LEGACY=y
+CONFIG_POWER_PFUZE100=y
 CONFIG_DM_REGULATOR=y
 CONFIG_POWER_I2C=y
 CONFIG_MXC_UART=y
configs/mx6sabresd_defconfig +1 -0
index 766ce0edc459..4f7d3704203e 100644
@@ -102,6 +102,7 @@ CONFIG_PCIE_IMX=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
 CONFIG_POWER_LEGACY=y
+CONFIG_POWER_PFUZE100=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_POWER_I2C=y
configs/novena_defconfig +1 -0
index f6690b4ac85f..5f761799a21f 100644
@@ -79,6 +79,7 @@ CONFIG_PCIE_IMX=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
 CONFIG_POWER_LEGACY=y
+CONFIG_POWER_PFUZE100=y
 CONFIG_POWER_I2C=y
 CONFIG_MXC_UART=y
 CONFIG_DM_THERMAL=y
configs/pcm051_rev3_defconfig +1 -0
index 373c609d2141..3ed55916d23d 100644
@@ -56,6 +56,7 @@ CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHY_SMSC=y
 CONFIG_MII=y
 CONFIG_DRIVER_TI_CPSW=y
+CONFIG_SPL_POWER_TPS65910=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_OMAP3_SPI=y
configs/phycore-am335x-r2-regor_defconfig +1 -0
index b6b5274f03ee..1b3167656852 100644
@@ -83,6 +83,7 @@ CONFIG_SYS_NAND_U_BOOT_OFFS=0x20000
 CONFIG_DM_SPI_FLASH=y
 CONFIG_MII=y
 CONFIG_DRIVER_TI_CPSW=y
+CONFIG_SPL_POWER_TPS65910=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_OMAP3_SPI=y
configs/phycore-am335x-r2-wega_defconfig +1 -0
index 5012049fed98..c5ffb4127470 100644
@@ -84,6 +84,7 @@ CONFIG_SYS_NAND_U_BOOT_OFFS_REDUND=0x100000
 CONFIG_DM_SPI_FLASH=y
 CONFIG_MII=y
 CONFIG_DRIVER_TI_CPSW=y
+CONFIG_SPL_POWER_TPS65910=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_OMAP3_SPI=y
configs/pico-dwarf-imx7d_defconfig +1 -0
index 821357827a79..46777e04fdb9 100644
@@ -81,6 +81,7 @@ CONFIG_MII=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX7=y
 CONFIG_POWER_LEGACY=y
+CONFIG_POWER_PFUZE3000=y
 CONFIG_POWER_I2C=y
 CONFIG_MXC_UART=y
 CONFIG_IMX_THERMAL=y
configs/pico-hobbit-imx7d_defconfig +1 -0
index 759866ce1195..fb354d1cdee7 100644
@@ -81,6 +81,7 @@ CONFIG_MII=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX7=y
 CONFIG_POWER_LEGACY=y
+CONFIG_POWER_PFUZE3000=y
 CONFIG_POWER_I2C=y
 CONFIG_MXC_UART=y
 CONFIG_IMX_THERMAL=y
configs/pico-imx7d_bl33_defconfig +1 -0
index 8631f81f3333..35e6f1d5493e 100644
@@ -77,6 +77,7 @@ CONFIG_MII=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX7=y
 CONFIG_POWER_LEGACY=y
+CONFIG_POWER_PFUZE3000=y
 CONFIG_POWER_I2C=y
 CONFIG_CONS_INDEX=4
 CONFIG_MXC_UART=y
configs/pico-imx7d_defconfig +1 -0
index a84954d22fd5..13cc97bb73cc 100644
@@ -81,6 +81,7 @@ CONFIG_MII=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX7=y
 CONFIG_POWER_LEGACY=y
+CONFIG_POWER_PFUZE3000=y
 CONFIG_POWER_I2C=y
 CONFIG_MXC_UART=y
 CONFIG_IMX_THERMAL=y
configs/pico-nymph-imx7d_defconfig +1 -0
index 821357827a79..46777e04fdb9 100644
@@ -81,6 +81,7 @@ CONFIG_MII=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX7=y
 CONFIG_POWER_LEGACY=y
+CONFIG_POWER_PFUZE3000=y
 CONFIG_POWER_I2C=y
 CONFIG_MXC_UART=y
 CONFIG_IMX_THERMAL=y
configs/pico-pi-imx7d_defconfig +1 -0
index dec428097472..6e92366beff0 100644
@@ -81,6 +81,7 @@ CONFIG_MII=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX7=y
 CONFIG_POWER_LEGACY=y
+CONFIG_POWER_PFUZE3000=y
 CONFIG_POWER_I2C=y
 CONFIG_MXC_UART=y
 CONFIG_IMX_THERMAL=y
configs/udoo_neo_defconfig +1 -0
index 95428e199359..f62a585b1c39 100644
@@ -57,6 +57,7 @@ CONFIG_MII=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
 CONFIG_POWER_LEGACY=y
+CONFIG_POWER_PFUZE3000=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_ANATOP=y
configs/vining_2000_defconfig +1 -0
index 3b5658ddc890..7f84209b6555 100644
@@ -89,6 +89,7 @@ CONFIG_PCIE_IMX=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
 CONFIG_POWER_LEGACY=y
+CONFIG_POWER_PFUZE100=y
 CONFIG_POWER_I2C=y
 CONFIG_PWM_IMX=y
 CONFIG_DM_SERIAL=y
drivers/power/Kconfig +21 -0
index bc47cf144dd0..5dbcde333ba5 100644
@@ -430,6 +430,10 @@ config PALMAS_POWER
 	bool "Palmas power support"
 	depends on OMAP54XX
 
+config POWER_FSL
+	bool "Power control (legacy) for Freescale / NXP platforms"
+	depends on POWER_LEGACY
+
 config POWER_I2C
 	bool "I2C-based power control for legacy power"
 	depends on POWER_LEGACY
@@ -440,6 +444,10 @@ config POWER_I2C
 	  Not to be used for new designs and existing ones should be moved to
 	  the new PMIC interface based on driver model.
 
+config POWER_SPI
+	bool "SPI-based power control for legacy power_fsl driver"
+	depends on POWER_FSL && !POWER_I2C
+
 config SPL_POWER_I2C
 	bool "I2C-based power control for legacy power"
 	depends on SPL_POWER_LEGACY
@@ -451,4 +459,17 @@ config SPL_POWER_I2C
 	  Not to be used for new designs and existing ones should be moved to
 	  the new PMIC interface based on driver model.
 
+choice
+	prompt "PMIC chip"
+	default POWER_FSL_MC13892
+	depends on POWER_FSL && POWER_I2C
+
+config POWER_FSL_MC13892
+	bool "MC13892"
+
+config POWER_FSL_MC34704
+	bool "MC34704"
+
+endchoice
+
 endif
drivers/power/pmic/Kconfig +27 -0
index d30bb4d4e9cc..d94048db5f7e 100644
@@ -393,8 +393,35 @@ config PMIC_TPS65217
 	only, and you can enable the regulator/charger drivers separately if
 	required.
 
+config POWER_TPS65218
+	bool "Enable legacy driver for TPS65218 PMIC"
+
+config POWER_TPS62362
+	bool "Enable legacy driver for TPS62362 PMIC"
+
+config SPL_POWER_TPS62362
+	bool "Enable legacy driver for TPS62362 PMIC in SPL"
+	default y if POWER_TPS62362
+	depends on SPL
+
+config SPL_POWER_TPS65910
+	bool "Enable legacy driver for TPS65910 PMIC in SPL"
+	depends on SPL
+
 if POWER_LEGACY || SPL_POWER_LEGACY
 
+config POWER_HI6553
+	bool "Enable legacy driver for HI6553 PMIC"
+
+config POWER_LTC3676
+	bool "Enable legacy driver for LTC3676 PMIC"
+
+config POWER_PFUZE100
+	bool "Enable legacy driver for PFUZE100 PMIC"
+
+config POWER_PFUZE3000
+	bool "Enable legacy driver for PFUZE3000 PMIC"
+
 config POWER_MC34VR500
 	bool "Enable driver for Freescale MC34VR500 PMIC"
 	---help---
drivers/power/pmic/Makefile +4 -3
index e78dc1e20535..c3180c582085 100644
@@ -33,6 +33,7 @@ obj-$(CONFIG_PMIC_STPMIC1) += stpmic1.o
 obj-$(CONFIG_PMIC_TPS65217) += pmic_tps65217.o
 obj-$(CONFIG_PMIC_TPS65219) += tps65219.o
 obj-$(CONFIG_PMIC_TPS65941) += tps65941.o
+obj-$(CONFIG_POWER_TPS65218) += pmic_tps65218.o
 
 ifeq ($(CONFIG_$(SPL_)POWER_LEGACY),y)
 obj-$(CONFIG_POWER_LTC3676) += pmic_ltc3676.o
@@ -40,9 +41,9 @@ obj-$(CONFIG_POWER_MUIC_MAX8997) += muic_max8997.o
 obj-$(CONFIG_POWER_PCA9450) += pmic_pca9450.o
 obj-$(CONFIG_POWER_PFUZE100) += pmic_pfuze100.o
 obj-$(CONFIG_POWER_PFUZE3000) += pmic_pfuze3000.o
-obj-$(CONFIG_POWER_TPS62362) += pmic_tps62362.o
-obj-$(CONFIG_POWER_TPS65218) += pmic_tps65218.o
-obj-$(CONFIG_POWER_TPS65910) += pmic_tps65910.o
 obj-$(CONFIG_POWER_HI6553) += pmic_hi6553.o
 obj-$(CONFIG_POWER_MC34VR500) += pmic_mc34vr500.o
 endif
+
+obj-$(CONFIG_$(SPL_)POWER_TPS62362) += pmic_tps62362.o
+obj-$(CONFIG_SPL_POWER_TPS65910) += pmic_tps65910.o
drivers/power/power_fsl.c +0 -2
index 7180b5127a5b..9bb7e39f2cc2 100644
@@ -49,8 +49,6 @@ int pmic_init(unsigned char bus)
 	p->interface = PMIC_I2C;
 	p->hw.i2c.addr = CFG_SYS_FSL_PMIC_I2C_ADDR;
 	p->hw.i2c.tx_num = FSL_PMIC_I2C_LENGTH;
-#else
-#error "You must select CONFIG_POWER_SPI or CONFIG_POWER_I2C"
 #endif
 
 	return 0;
include/configs/am335x_evm.h +0 -3
index 69b8b048ce39..755f7fae3e4f 100644
@@ -165,9 +165,6 @@
 #define CFG_SYS_NS16550_COM5		0x481a8000	/* UART4 */
 #define CFG_SYS_NS16550_COM6		0x481aa000	/* UART5 */
 
-/* PMIC support */
-#define CONFIG_POWER_TPS65910
-
 #ifdef CONFIG_MTD_RAW_NAND
 /* NAND: device related configs */
 /* NAND: driver related configs */
include/configs/am335x_sl50.h +0 -7
index 4af9edafca8f..342a068c855f 100644
@@ -43,11 +43,4 @@
 #define CFG_SYS_NS16550_COM5		0x481a8000	/* UART4 */
 #define CFG_SYS_NS16550_COM6		0x481aa000	/* UART5 */
 
-/* PMIC support */
-#define CONFIG_POWER_TPS65910
-
-/* SPL */
-
-/* Network. */
-
 #endif	/* ! __CONFIG_AM335X_SL50_H */
include/configs/am43xx_evm.h +0 -8
index bcdff2e98acd..7659c1cc0619 100644
@@ -16,14 +16,6 @@
 /* NS16550 Configuration */
 #define CFG_SYS_NS16550_CLK		48000000
 
-/* I2C Configuration */
-
-/* Power */
-#define CONFIG_POWER_TPS65218
-#define CONFIG_POWER_TPS62362
-
-/* SPL defines. */
-
 /* Enabling L2 Cache */
 #define CFG_SYS_PL310_BASE	0x48242000
 
include/configs/baltos.h +0 -3
index f29729d09bac..6f6552e6dc34 100644
@@ -188,9 +188,6 @@
 #define CFG_SYS_NS16550_COM5		0x481a8000	/* UART4 */
 #define CFG_SYS_NS16550_COM6		0x481aa000	/* UART5 */
 
-/* PMIC support */
-#define CONFIG_POWER_TPS65910
-
 /* SPL */
 #ifndef CONFIG_NOR_BOOT
 
include/configs/cl-som-imx7.h +0 -1
index b1f9470d9ca4..4aaa52f26980 100644
@@ -19,7 +19,6 @@
 #define IMX_FEC_BASE			ENET_IPS_BASE_ADDR
 
 /* PMIC */
-#define CONFIG_POWER_PFUZE3000
 #define CONFIG_POWER_PFUZE3000_I2C_ADDR	0x08
 
 #define CONFIG_PCA953X
include/configs/cm_t43.h +0 -3
index 8ad1cfb5ded3..fcc17fc6b7ce 100644
@@ -28,9 +28,6 @@
 					 42, 43, 44, 45, 46, 47, 48, 49, \
 					 50, 51, 52, 53, 54, 55, 56, 57, }
 
-/* Power */
-#define CONFIG_POWER_TPS65218
-
 /* Enabling L2 Cache */
 #define CFG_SYS_PL310_BASE		0x48242000
 
include/configs/el6x_common.h +0 -1
index 141f9913e639..89e071c0df66 100644
@@ -17,7 +17,6 @@
 #define CFG_SYS_FSL_USDHC_NUM	2
 
 /* PMIC */
-#define CONFIG_POWER_PFUZE100
 #define CONFIG_POWER_PFUZE100_I2C_ADDR	0x08
 
 /* Commands */
include/configs/gw_ventana.h +0 -2
index b855bbc25fb8..65283afd2a06 100644
@@ -30,9 +30,7 @@
 /*
  * PMIC
  */
-#define CONFIG_POWER_PFUZE100
 #define CONFIG_POWER_PFUZE100_I2C_ADDR	0x08
-#define CONFIG_POWER_LTC3676
 #define CONFIG_POWER_LTC3676_I2C_ADDR  0x3c
 
 /* Various command support */
include/configs/hikey.h +0 -2
index eefdbd6ed11b..d4280decc9f0 100644
@@ -13,8 +13,6 @@
 
 #include <linux/sizes.h>
 
-#define CONFIG_POWER_HI6553
-
 /* Physical Memory Map */
 
 /* CONFIG_TEXT_BASE needs to align with where ATF loads bl33.bin */
include/configs/imx8mq_evk.h +0 -1
index aa29e7884f9e..688c0bf70080 100644
@@ -18,7 +18,6 @@
 #define CONFIG_MALLOC_F_ADDR		0x182000
 /* For RAW image gives a error info not panic */
 
-#define CONFIG_POWER_PFUZE100
 #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
 #endif
 
include/configs/kontron_pitx_imx8m.h +0 -1
index 2abcb849a281..17c63d834107 100644
@@ -20,7 +20,6 @@
 /* For RAW image gives a error info not panic */
 
 
-#define CONFIG_POWER_PFUZE100
 #define CONFIG_POWER_PFUZE100_I2C_ADDR  0x08
 #endif
 
include/configs/mx51evk.h +0 -2
index 6d9b954587ef..d9d76d7c08da 100644
@@ -21,8 +21,6 @@
 #define CONFIG_MXC_UART_BASE	UART1_BASE
 
 /* PMIC Controller */
-#define CONFIG_POWER_SPI
-#define CONFIG_POWER_FSL
 #define CONFIG_FSL_PMIC_BUS	0
 #define CONFIG_FSL_PMIC_CS	0
 #define CONFIG_FSL_PMIC_CLK	2500000
include/configs/mx53loco.h +0 -2
index b52e70c95a04..d0107fcc8cb1 100644
@@ -22,8 +22,6 @@
 #define CONFIG_MXC_USB_FLAGS	0
 
 /* PMIC Controller */
-#define CONFIG_POWER_FSL
-#define CONFIG_POWER_FSL_MC13892
 #define CFG_SYS_DIALOG_PMIC_I2C_ADDR	0x48
 #define CFG_SYS_FSL_PMIC_I2C_ADDR	0x8
 
include/configs/mx6sabreauto.h +0 -1
index 1a2160cce594..f5f95a1bd1ce 100644
@@ -37,7 +37,6 @@
 /* DMA stuff, needed for GPMI/MXS NAND support */
 
 /* PMIC */
-#define CONFIG_POWER_PFUZE100
 #define CONFIG_POWER_PFUZE100_I2C_ADDR	0x08
 
 #endif                         /* __MX6SABREAUTO_CONFIG_H */
include/configs/mx6sabresd.h +0 -1
index 0d06b6dc4671..78a554d0ccba 100644
@@ -25,7 +25,6 @@
 #endif
 
 /* PMIC */
-#define CONFIG_POWER_PFUZE100
 #define CONFIG_POWER_PFUZE100_I2C_ADDR	0x08
 
 /* USB Configs */
include/configs/novena.h +0 -1
index 6f588f99c34b..16a89b97b06c 100644
@@ -50,7 +50,6 @@
 #endif
 
 /* PMIC */
-#define CONFIG_POWER_PFUZE100
 #define CONFIG_POWER_PFUZE100_I2C_ADDR	0x08
 
 /* UART */
include/configs/peach-pi.h +0 -2
index bfc0011fbf96..fb6eb572cfad 100644
@@ -22,8 +22,6 @@
 
 #define CFG_SYS_SDRAM_BASE	0x20000000
 
-#define CONFIG_POWER_TPS65090_EC
-
 /* DRAM Memory Banks */
 #define SDRAM_BANK_SIZE		(512UL << 20UL)	/* 512 MB */
 
include/configs/phycore_am335x_r2.h +0 -2
index 43a60825b575..f922491637d9 100644
@@ -79,8 +79,6 @@
 #define V_OSCK				25000000  /* Clock output from T2 */
 #define V_SCLK				V_OSCK
 
-#define CONFIG_POWER_TPS65910
-
 #ifdef CONFIG_MTD_RAW_NAND
 /* NAND: device related configs */
 /* NAND: driver related configs */
include/configs/pico-imx7d.h +0 -1
index 7028264d7220..83907b06ebb4 100644
@@ -98,7 +98,6 @@
 #define CFG_SYS_INIT_RAM_SIZE	IRAM_SIZE
 
 /* PMIC */
-#define CONFIG_POWER_PFUZE3000
 #define CONFIG_POWER_PFUZE3000_I2C_ADDR	0x08
 
 /* FLASH and environment organization */
include/configs/tqma6.h +0 -1
index 9c3454add463..7a1ad9544a30 100644
@@ -31,7 +31,6 @@
 #define CONFIG_I2C_MULTI_BUS
 
 #if !defined(CONFIG_DM_PMIC)
-#define CONFIG_POWER_PFUZE100
 #define CONFIG_POWER_PFUZE100_I2C_ADDR	0x08
 #define TQMA6_PFUZE100_I2C_BUS		2
 #endif
include/configs/udoo_neo.h +0 -1
index 0e0d5b5b3e4c..d4c92233acaa 100644
@@ -62,7 +62,6 @@
 #define CFG_SYS_INIT_RAM_SIZE	IRAM_SIZE
 
 /* PMIC */
-#define CONFIG_POWER_PFUZE3000
 #define CONFIG_POWER_PFUZE3000_I2C_ADDR	0x08
 #define PFUZE3000_I2C_BUS	0
 
include/configs/vining_2000.h +0 -1
index ab5cd5cf6365..1a71b300fc55 100644
@@ -31,7 +31,6 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC4_BASE_ADDR
 
 /* PMIC */
-#define CONFIG_POWER_PFUZE100
 #define CONFIG_POWER_PFUZE100_I2C_ADDR	0x08
 
 /* Network */
Signature · 1 line
2.25.1
author
#8 lore raw

PATCH 9/38 Convert CONFIG_HWCONFIG to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_HWCONFIG

---
 common/Kconfig                        | 4 ++++
 configs/MCR3000_defconfig             | 1 +
 configs/da850evm_defconfig            | 1 +
 configs/da850evm_direct_nor_defconfig | 1 +
 configs/da850evm_nand_defconfig       | 1 +
 configs/gazerbeam_defconfig           | 1 +
 configs/gwventana_emmc_defconfig      | 1 +
 configs/gwventana_gw5904_defconfig    | 1 +
 configs/gwventana_nand_defconfig      | 1 +
 configs/kmcoge5ne_defconfig           | 1 +
 configs/kmeter1_defconfig             | 1 +
 configs/kmopti2_defconfig             | 1 +
 configs/kmsupx5_defconfig             | 1 +
 configs/kmtepr2_defconfig             | 1 +
 configs/kontron_sl28_defconfig        | 1 +
 configs/legoev3_defconfig             | 1 +
 configs/socrates_defconfig            | 1 +
 configs/tuge1_defconfig               | 1 +
 configs/tuxx1_defconfig               | 1 +
 doc/README.hwconfig                   | 3 ---
 include/configs/MPC837XERDB.h         | 2 --
 include/configs/MPC8548CDS.h          | 2 --
 include/configs/P1010RDB.h            | 1 -
 include/configs/P2041RDB.h            | 2 --
 include/configs/T102xRDB.h            | 2 --
 include/configs/T104xRDB.h            | 2 --
 include/configs/T208xQDS.h            | 2 --
 include/configs/T208xRDB.h            | 2 --
 include/configs/T4240RDB.h            | 2 --
 include/configs/da850evm.h            | 1 -
 include/configs/gw_ventana.h          | 1 -
 include/configs/km/pg-wcom-ls102xa.h  | 1 -
 include/configs/kmcent2.h             | 2 --
 include/configs/legoev3.h             | 1 -
 include/configs/ls1012a_common.h      | 1 -
 include/configs/ls1021aiot.h          | 1 -
 include/configs/ls1021aqds.h          | 1 -
 include/configs/ls1021atsn.h          | 1 -
 include/configs/ls1021atwr.h          | 1 -
 include/configs/ls1028a_common.h      | 1 -
 include/configs/ls1043a_common.h      | 1 -
 include/configs/ls1046a_common.h      | 1 -
 include/configs/ls1088a_common.h      | 1 -
 include/configs/ls2080a_common.h      | 1 -
 include/configs/lx2160a_common.h      | 1 -
 include/configs/p1_p2_rdb_pc.h        | 1 -
 include/configs/qemu-ppce500.h        | 2 --
 47 files changed, 22 insertions(+), 40 deletions(-)
common/Kconfig +4 -0
index 21434c5cf16a..053e93eb1ab4 100644
@@ -676,6 +676,10 @@ config CLOCKS
 	bool "Call set_cpu_clk_info"
 	depends on ARM
 
+config HWCONFIG
+	bool "hwconfig infrastructure"
+	default y if PPC || ARCH_LS1021A || FSL_LSCH2 || FSL_LSCH3
+
 config SYS_FSL_CLK
 	bool
 	depends on ARCH_LS1021A || FSL_LSCH2 || FSL_LSCH3 || \
configs/MCR3000_defconfig +1 -0
index 6c41d7c88d1e..d8d6417d21e6 100644
@@ -29,6 +29,7 @@ CONFIG_AUTOBOOT_DELAY_STR="root"
 CONFIG_USE_BOOTCOMMAND=y
 CONFIG_BOOTCOMMAND="run flashboot"
 CONFIG_BOARD_EARLY_INIT_R=y
+# CONFIG_HWCONFIG is not set
 CONFIG_MISC_INIT_R=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_AUTO_COMPLETE is not set
configs/da850evm_defconfig +1 -0
index ec80edf293a6..9b1b61981789 100644
@@ -35,6 +35,7 @@ CONFIG_DEFAULT_FDT_FILE="da850-evm.dtb"
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_CLOCKS=y
+CONFIG_HWCONFIG=y
 CONFIG_MISC_INIT_R=y
 CONFIG_SPL_PAD_TO=0x8000
 CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
configs/da850evm_direct_nor_defconfig +1 -0
index 01cdc4f7843f..9332c8cb3ff5 100644
@@ -29,6 +29,7 @@ CONFIG_BOOTCOMMAND="run envboot; run mmcboot; "
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_CLOCKS=y
+CONFIG_HWCONFIG=y
 CONFIG_MISC_INIT_R=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PBSIZE=1050
configs/da850evm_nand_defconfig +1 -0
index 2e0f27b2cb19..a947dce4f5f6 100644
@@ -33,6 +33,7 @@ CONFIG_DEFAULT_FDT_FILE="da850-evm.dtb"
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_CLOCKS=y
+CONFIG_HWCONFIG=y
 CONFIG_SPL_PAD_TO=0x8000
 CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
 CONFIG_SPL_BSS_START_ADDR=0xc0000000
configs/gazerbeam_defconfig +1 -0
index 3974e3d2bd32..d2946971b482 100644
@@ -131,6 +131,7 @@ CONFIG_DISPLAY_CPUINFO=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_BOARD_EARLY_INIT_R=y
+# CONFIG_HWCONFIG is not set
 CONFIG_LAST_STAGE_INIT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_CBSIZE=1024
configs/gwventana_emmc_defconfig +1 -0
index ce81b558ee21..b275247d25d4 100644
@@ -39,6 +39,7 @@ CONFIG_USE_PREBOOT=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_BOARD_EARLY_INIT_F=y
+CONFIG_HWCONFIG=y
 CONFIG_MISC_INIT_R=y
 CONFIG_PCI_INIT_R=y
 CONFIG_SPL_BOARD_INIT=y
configs/gwventana_gw5904_defconfig +1 -0
index 3ef909a1ce30..6169042c7e6a 100644
@@ -39,6 +39,7 @@ CONFIG_USE_PREBOOT=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_BOARD_EARLY_INIT_F=y
+CONFIG_HWCONFIG=y
 CONFIG_MISC_INIT_R=y
 CONFIG_PCI_INIT_R=y
 CONFIG_SPL_BOARD_INIT=y
configs/gwventana_nand_defconfig +1 -0
index d3d4876658a0..6d57ad49a13c 100644
@@ -39,6 +39,7 @@ CONFIG_USE_PREBOOT=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_BOARD_EARLY_INIT_F=y
+CONFIG_HWCONFIG=y
 CONFIG_MISC_INIT_R=y
 CONFIG_PCI_INIT_R=y
 CONFIG_SPL_BOARD_INIT=y
configs/kmcoge5ne_defconfig +1 -0
index 298ff16b7eb4..71d196533f7e 100644
@@ -167,6 +167,7 @@ CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n"
 CONFIG_AUTOBOOT_STOP_STR=" "
 CONFIG_BOARD_EARLY_INIT_R=y
+# CONFIG_HWCONFIG is not set
 CONFIG_LAST_STAGE_INIT=y
 CONFIG_MISC_INIT_R=y
 CONFIG_HUSH_PARSER=y
configs/kmeter1_defconfig +1 -0
index 9386f2c51216..66ec936cce4a 100644
@@ -137,6 +137,7 @@ CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n"
 CONFIG_AUTOBOOT_STOP_STR=" "
 CONFIG_BOARD_EARLY_INIT_R=y
+# CONFIG_HWCONFIG is not set
 CONFIG_LAST_STAGE_INIT=y
 CONFIG_MISC_INIT_R=y
 CONFIG_HUSH_PARSER=y
configs/kmopti2_defconfig +1 -0
index 173306668fb2..3ba334c2401c 100644
@@ -150,6 +150,7 @@ CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n"
 CONFIG_AUTOBOOT_STOP_STR=" "
 CONFIG_BOARD_EARLY_INIT_R=y
+# CONFIG_HWCONFIG is not set
 CONFIG_LAST_STAGE_INIT=y
 CONFIG_MISC_INIT_R=y
 CONFIG_HUSH_PARSER=y
configs/kmsupx5_defconfig +1 -0
index c281611dd4c5..4a02e5e88fc1 100644
@@ -130,6 +130,7 @@ CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n"
 CONFIG_AUTOBOOT_STOP_STR=" "
 CONFIG_BOARD_EARLY_INIT_R=y
+# CONFIG_HWCONFIG is not set
 CONFIG_LAST_STAGE_INIT=y
 CONFIG_MISC_INIT_R=y
 CONFIG_HUSH_PARSER=y
configs/kmtepr2_defconfig +1 -0
index e099f74de1c2..55158864ea33 100644
@@ -150,6 +150,7 @@ CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n"
 CONFIG_AUTOBOOT_STOP_STR=" "
 CONFIG_BOARD_EARLY_INIT_R=y
+# CONFIG_HWCONFIG is not set
 CONFIG_LAST_STAGE_INIT=y
 CONFIG_MISC_INIT_R=y
 CONFIG_HUSH_PARSER=y
configs/kontron_sl28_defconfig +1 -0
index f044334e80e6..9b90ed478cc4 100644
@@ -39,6 +39,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_BOOTDELAY=10
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOARD_LATE_INIT=y
+# CONFIG_HWCONFIG is not set
 CONFIG_PCI_INIT_R=y
 CONFIG_SPL_MAX_SIZE=0x20000
 CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
configs/legoev3_defconfig +1 -0
index 98e37f18b4f2..90c1b94b0214 100644
@@ -23,6 +23,7 @@ CONFIG_BOOTCOMMAND="if mmc rescan; then if run loadbootscr; then run bootscript;
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_BOARD_LATE_INIT=y
 CONFIG_CLOCKS=y
+CONFIG_HWCONFIG=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_BOOTM_NETBSD is not set
 # CONFIG_BOOTM_PLAN9 is not set
configs/socrates_defconfig +1 -0
index b89c348e5a52..ab52ea26a089 100644
@@ -23,6 +23,7 @@ CONFIG_USE_PREBOOT=y
 CONFIG_PREBOOT="echo;echo Welcome on the ABB Socrates Board;echo"
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_BOARD_EARLY_INIT_R=y
+# CONFIG_HWCONFIG is not set
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PBSIZE=276
 CONFIG_CMD_REGINFO=y
configs/tuge1_defconfig +1 -0
index 3b8560f3e061..894a79df59e9 100644
@@ -130,6 +130,7 @@ CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n"
 CONFIG_AUTOBOOT_STOP_STR=" "
 CONFIG_BOARD_EARLY_INIT_R=y
+# CONFIG_HWCONFIG is not set
 CONFIG_LAST_STAGE_INIT=y
 CONFIG_MISC_INIT_R=y
 CONFIG_HUSH_PARSER=y
configs/tuxx1_defconfig +1 -0
index 04ce0b3afecc..6e66e6ce3052 100644
@@ -152,6 +152,7 @@ CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n"
 CONFIG_AUTOBOOT_STOP_STR=" "
 CONFIG_BOARD_EARLY_INIT_R=y
+# CONFIG_HWCONFIG is not set
 CONFIG_LAST_STAGE_INIT=y
 CONFIG_MISC_INIT_R=y
 CONFIG_HUSH_PARSER=y
doc/README.hwconfig +0 -3
index b6ddb438cfa7..5408a22bb6a4 100644
@@ -1,6 +1,3 @@
-To enable this feature just define CONFIG_HWCONFIG in your board
-config file.
-
 This implements a simple hwconfig infrastructure: an
 interface for software knobs to control hardware.
 
include/configs/MPC837XERDB.h +0 -2
index 717320c34aeb..2796adbdcd8f 100644
@@ -14,8 +14,6 @@
  * High Level Configuration Options
  */
 
-#define CONFIG_HWCONFIG
-
 /*
  * On-board devices
  */
include/configs/MPC8548CDS.h +0 -2
index e41b8e0843a7..75ac26957078 100644
@@ -122,8 +122,6 @@
 #define CFG_SYS_FLASH_BANKS_LIST \
 	{CFG_SYS_FLASH_BASE_PHYS + 0x800000, CFG_SYS_FLASH_BASE_PHYS}
 
-#define CONFIG_HWCONFIG			/* enable hwconfig */
-
 /*
  * SDRAM on the Local Bus
  */
include/configs/P1010RDB.h +0 -1
index a8af0a101c84..0a1b932e94e8 100644
@@ -96,7 +96,6 @@
 #endif
 #endif
 
-#define CONFIG_HWCONFIG
 /*
  * These can be toggled for performance analysis, otherwise use default.
  */
include/configs/P2041RDB.h +0 -2
index 1e02855fefd8..acbd43419f2e 100644
@@ -132,8 +132,6 @@
 
 #define CFG_SYS_FLASH_BANKS_LIST	{CFG_SYS_FLASH_BASE_PHYS + 0x8000000}
 
-#define CONFIG_HWCONFIG
-
 /* define to use L1 as initial stack */
 #define CONFIG_L1_INIT_RAM
 #define CFG_SYS_INIT_RAM_ADDR	0xffd00000	/* Initial L1 address */
include/configs/T102xRDB.h +0 -2
index b5fb0a9b529e..e394237daf08 100644
@@ -270,8 +270,6 @@
 #define CFG_SYS_CS1_FTIM3		CFG_SYS_NAND_FTIM3
 #endif
 
-#define CONFIG_HWCONFIG
-
 /* define to use L1 as initial stack */
 #define CONFIG_L1_INIT_RAM
 #define CFG_SYS_INIT_RAM_ADDR	0xfdd00000	/* Initial L1 address */
include/configs/T104xRDB.h +0 -2
index bee4b704a24f..f681a2182298 100644
@@ -248,8 +248,6 @@
 #define CFG_SYS_CS1_FTIM3		CFG_SYS_NAND_FTIM3
 #endif
 
-#define CONFIG_HWCONFIG
-
 /* define to use L1 as initial stack */
 #define CONFIG_L1_INIT_RAM
 #define CFG_SYS_INIT_RAM_ADDR	0xfdd00000	/* Initial L1 address */
include/configs/T208xQDS.h +0 -2
index be8c30db26a7..a93e05dd4d2d 100644
@@ -246,8 +246,6 @@
 #define CFG_SYS_CS2_FTIM3		CFG_SYS_NAND_FTIM3
 #endif
 
-#define CONFIG_HWCONFIG
-
 /* define to use L1 as initial stack */
 #define CONFIG_L1_INIT_RAM
 #define CFG_SYS_INIT_RAM_ADDR	0xfdd00000 /* Initial L1 address */
include/configs/T208xRDB.h +0 -2
index 795873f42336..cf65a0da1883 100644
@@ -211,8 +211,6 @@
 #define CFG_SYS_CS1_FTIM3		CFG_SYS_NAND_FTIM3
 #endif
 
-#define CONFIG_HWCONFIG
-
 /* define to use L1 as initial stack */
 #define CONFIG_L1_INIT_RAM
 #define CFG_SYS_INIT_RAM_ADDR	0xfdd00000 /* Initial L1 address */
include/configs/T4240RDB.h +0 -2
index ffd56454939e..b51762264ade 100644
@@ -70,8 +70,6 @@
 #define CFG_SYS_FLASH_BASE	0xe0000000
 #define CFG_SYS_FLASH_BASE_PHYS	(0xf00000000ull | CFG_SYS_FLASH_BASE)
 
-#define CONFIG_HWCONFIG
-
 /* define to use L1 as initial stack */
 #define CONFIG_L1_INIT_RAM
 #define CFG_SYS_INIT_RAM_ADDR	0xfdd00000	/* Initial L1 address */
include/configs/da850evm.h +0 -1
index 578277fc75c1..a818a4b39f83 100644
@@ -137,7 +137,6 @@
  * Linux Information
  */
 #define LINUX_BOOT_PARAM_ADDR	(PHYS_SDRAM_1 + 0x100)
-#define CONFIG_HWCONFIG		/* enable hwconfig */
 
 #define DEFAULT_LINUX_BOOT_ENV \
 	"loadaddr=0xc0700000\0" \
include/configs/gw_ventana.h +0 -1
index 65283afd2a06..6c5ca0a52057 100644
@@ -45,7 +45,6 @@
 #define CONFIG_IMX_VIDEO_SKIP
 
 /* Miscellaneous configurable options */
-#define CONFIG_HWCONFIG
 
 /* Memory configuration */
 
include/configs/km/pg-wcom-ls102xa.h +0 -1
index 6ccb4f07e3be..bbd2b36c45af 100644
@@ -166,7 +166,6 @@
 
 #define CONFIG_SMP_PEN_ADDR		0x01ee0200
 
-#define CONFIG_HWCONFIG
 #define HWCONFIG_BUFFER_SIZE		256
 
 /*
include/configs/kmcent2.h +0 -2
index e152714b1169..89c5a24ee901 100644
@@ -309,8 +309,6 @@
 #define CFG_SYS_CS2_FTIM2	SYS_QRIO_FTIM2
 #define CFG_SYS_CS2_FTIM3	SYS_QRIO_FTIM3
 
-#define CONFIG_HWCONFIG
-
 /* define to use L1 as initial stack */
 #define CFG_SYS_INIT_RAM_ADDR	0xfdd00000	/* Initial L1 address */
 #define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH	0xf
include/configs/legoev3.h +0 -1
index 2664982715f1..abe470fe890b 100644
@@ -48,7 +48,6 @@
  * Linux Information
  */
 #define LINUX_BOOT_PARAM_ADDR	(PHYS_SDRAM_1 + 0x100)
-#define CONFIG_HWCONFIG		/* enable hwconfig */
 #define CONFIG_SETUP_INITRD_TAG
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"bootenvfile=uEnv.txt\0" \
include/configs/ls1012a_common.h +0 -1
index 7598e54ed2b1..9e4f949016ef 100644
@@ -24,7 +24,6 @@
 
 #define CFG_SYS_NS16550_CLK          (get_serial_clock())
 
-#define CONFIG_HWCONFIG
 #define HWCONFIG_BUFFER_SIZE		128
 
 #define BOOT_TARGET_DEVICES(func) \
include/configs/ls1021aiot.h +0 -1
index 3063635592e2..a9680149807c 100644
@@ -92,7 +92,6 @@
 #define CONFIG_PEN_ADDR_BIG_ENDIAN
 #define CONFIG_SMP_PEN_ADDR		0x01ee0200
 
-#define CONFIG_HWCONFIG
 #define HWCONFIG_BUFFER_SIZE		256
 
 #define CONFIG_EXTRA_ENV_SETTINGS	\
include/configs/ls1021aqds.h +0 -1
index 137d459c291e..34d4c2fdeccc 100644
@@ -276,7 +276,6 @@
 #define CONFIG_PEN_ADDR_BIG_ENDIAN
 #define CONFIG_SMP_PEN_ADDR		0x01ee0200
 
-#define CONFIG_HWCONFIG
 #define HWCONFIG_BUFFER_SIZE		256
 
 #ifdef CONFIG_LPUART
include/configs/ls1021atsn.h +0 -1
index 052a15658d71..a5b7364435dd 100644
@@ -67,7 +67,6 @@
 /* PCIe */
 #define FSL_PCIE_COMPAT			"fsl,ls1021a-pcie"
 
-#define CONFIG_HWCONFIG
 #define HWCONFIG_BUFFER_SIZE		256
 
 #define BOOT_TARGET_DEVICES(func) \
include/configs/ls1021atwr.h +0 -1
index f39c7c088446..059941e713a1 100644
@@ -157,7 +157,6 @@
 #define CONFIG_PEN_ADDR_BIG_ENDIAN
 #define CONFIG_SMP_PEN_ADDR		0x01ee0200
 
-#define CONFIG_HWCONFIG
 #define HWCONFIG_BUFFER_SIZE		256
 
 #define BOOT_TARGET_DEVICES(func) \
include/configs/ls1028a_common.h +0 -1
index bdd3951e85f4..b190bfe9c8e0 100644
@@ -34,7 +34,6 @@
 
 /* Physical Memory Map */
 
-#define CONFIG_HWCONFIG
 #define HWCONFIG_BUFFER_SIZE		128
 
 #define BOOT_TARGET_DEVICES(func) \
include/configs/ls1043a_common.h +0 -1
index b4048744b1ea..a3fa92d1ff47 100644
@@ -110,7 +110,6 @@
 
 /* Miscellaneous configurable options */
 
-#define CONFIG_HWCONFIG
 #define HWCONFIG_BUFFER_SIZE		128
 
 #ifndef SPL_NO_MISC
include/configs/ls1046a_common.h +0 -1
index cac30e4679eb..4ed5481c3e74 100644
@@ -74,7 +74,6 @@
 
 /* Miscellaneous configurable options */
 
-#define CONFIG_HWCONFIG
 #define HWCONFIG_BUFFER_SIZE		128
 
 #define BOOT_TARGET_DEVICES(func) \
include/configs/ls1088a_common.h +0 -1
index bacc84f629ae..57429d4bbe32 100644
@@ -114,7 +114,6 @@ unsigned long long get_qixis_addr(void);
 
 /* Physical Memory Map */
 
-#define CONFIG_HWCONFIG
 #define HWCONFIG_BUFFER_SIZE		128
 
 #ifndef SPL_NO_ENV
include/configs/ls2080a_common.h +0 -1
index 18defd5e5a63..e82456fd8148 100644
@@ -107,7 +107,6 @@ unsigned long long get_qixis_addr(void);
 /* Physical Memory Map */
 /* fixme: these need to be checked against the board */
 
-#define CONFIG_HWCONFIG
 #define HWCONFIG_BUFFER_SIZE		128
 
 /* Initial environment variables */
include/configs/lx2160a_common.h +0 -1
index bbee9df404a1..ff85d966e661 100644
@@ -84,7 +84,6 @@
 
 #define COUNTER_FREQUENCY_REAL		(get_board_sys_clk() / 4)
 
-#define CONFIG_HWCONFIG
 #define HWCONFIG_BUFFER_SIZE		128
 
 /* Initial environment variables */
include/configs/p1_p2_rdb_pc.h +0 -1
index e8b752785b4d..eda2d43d0c1f 100644
@@ -112,7 +112,6 @@
 #define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
 #endif
 
-#define CONFIG_HWCONFIG
 /*
  * These can be toggled for performance analysis, otherwise use default.
  */
include/configs/qemu-ppce500.h +0 -2
index aa9cae017d9a..d1b20da24a86 100644
@@ -33,8 +33,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void);
 #define CFG_SYS_DDR_SDRAM_BASE	0x00000000
 #define CFG_SYS_SDRAM_BASE		CFG_SYS_DDR_SDRAM_BASE
 
-#define CONFIG_HWCONFIG
-
 #define CFG_SYS_INIT_RAM_ADDR		0x00100000
 #define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH	0x0
 #define CFG_SYS_INIT_RAM_ADDR_PHYS_LOW	0x00100000
Signature · 1 line
2.25.1
author
#9 lore raw

PATCH 10/38 arm920t: Remove unused imx code

In reply to Tom Rini

This code is currently unused, remove it.

---
 arch/arm/cpu/arm920t/imx/Makefile  |   8 ---
 arch/arm/cpu/arm920t/imx/generic.c |  76 ----------------------
 arch/arm/cpu/arm920t/imx/speed.c   |  86 -------------------------
 arch/arm/cpu/arm920t/imx/timer.c   | 100 -----------------------------
 4 files changed, 270 deletions(-)
 delete mode 100644 arch/arm/cpu/arm920t/imx/Makefile
 delete mode 100644 arch/arm/cpu/arm920t/imx/generic.c
 delete mode 100644 arch/arm/cpu/arm920t/imx/speed.c
 delete mode 100644 arch/arm/cpu/arm920t/imx/timer.c
arch/arm/cpu/arm920t/imx/Makefile deleted +0 -8
deleted file mode 100644
index 04bc1295929c..000000000000
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2000-2006
-# Wolfgang Denk, DENX Software Engineering, [email protected].
-
-obj-y	+= generic.o
-obj-y	+= speed.o
-obj-y	+= timer.o
arch/arm/cpu/arm920t/imx/generic.c deleted +0 -76

76 lines not on this page · raw message

arch/arm/cpu/arm920t/imx/speed.c deleted +0 -86

86 lines not on this page · raw message

arch/arm/cpu/arm920t/imx/timer.c deleted +0 -100

100 lines not on this page · raw message

Signature · 1 line
2.25.1
author
#10 lore raw

PATCH 11/38 pwm: imx: Remove unused references to CONFIG_IMX6_PWM_PER_CLK

In reply to Tom Rini

On platforms that use DM_PWM, we do not need to define this value anymore, so remove it from config files.

---
For the record, vining_2000 does not use DM_PWM and requires board-specific updates as well to switch, so we're going this path for the moment.

---
 include/configs/aristainetos2.h | 2 --
 include/configs/ge_b1x5v2.h     | 3 ---
 include/configs/ge_bx50v3.h     | 2 --
 include/configs/mx53ppd.h       | 3 ---
 4 files changed, 10 deletions(-)
include/configs/aristainetos2.h +0 -2
index c1eec5d06ccb..b1ec8ef269c6 100644
@@ -424,8 +424,6 @@
 /* check this console not needed, after test remove it */
 #define CONFIG_IMX_VIDEO_SKIP
 
-#define CONFIG_IMX6_PWM_PER_CLK	66000000
-
 #define CONFIG_ENV_FLAGS_LIST_STATIC "ethaddr:mw,serial#:sw,board_type:sw," \
 		"sysnum:dw,panel:sw,ipaddr:iw,serverip:iw"
 
include/configs/ge_b1x5v2.h +0 -3
index 97fe76cfa8ec..a8a6229f526f 100644
@@ -12,9 +12,6 @@
 
 #include "mx6_common.h"
 
-/* PWM */
-#define CONFIG_IMX6_PWM_PER_CLK		66000000
-
 /* UART */
 #define CONFIG_MXC_UART_BASE		UART3_BASE
 
include/configs/ge_bx50v3.h +0 -2
index cbaf03c2a226..705cb763a66d 100644
@@ -106,6 +106,4 @@
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP
 
-#define CONFIG_IMX6_PWM_PER_CLK	66000000
-
 #endif	/* __GE_BX50V3_CONFIG_H */
include/configs/mx53ppd.h +0 -3
index 913bc1996d40..963dd92dd709 100644
@@ -102,9 +102,6 @@
 
 /* FLASH and environment organization */
 
-/* Backlight Control */
-#define CONFIG_IMX6_PWM_PER_CLK 66666000
-
 #define CONFIG_IMX_VIDEO_SKIP
 
 #endif				/* __CONFIG_H */
Signature · 1 line
2.25.1
author
#11 lore raw

PATCH 12/38 Convert CONFIG_IMX_VIDEO_SKIP et al to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_IMX_VIDEO_SKIP
CONFIG_IMX_HDMI

---
 configs/aristainetos2c_defconfig     |  1 +
 configs/aristainetos2ccslb_defconfig |  1 +
 configs/cm_fx6_defconfig             |  1 +
 configs/ge_b1x5v2_defconfig          |  1 +
 configs/ge_bx50v3_defconfig          |  2 ++
 configs/gwventana_emmc_defconfig     |  2 ++
 configs/gwventana_gw5904_defconfig   |  2 ++
 configs/gwventana_nand_defconfig     |  2 ++
 configs/imx6dl_icore_nand_defconfig  |  1 +
 configs/imx6q_icore_nand_defconfig   |  1 +
 configs/imx6qdl_icore_mmc_defconfig  |  1 +
 configs/imx6qdl_icore_nand_defconfig |  1 +
 configs/m53menlo_defconfig           |  1 +
 configs/marsboard_defconfig          |  2 ++
 configs/mx53cx9020_defconfig         |  1 +
 configs/mx53ppd_defconfig            |  1 +
 configs/mx6cuboxi_defconfig          |  2 ++
 configs/mx6qsabrelite_defconfig      |  2 ++
 configs/mx6sabreauto_defconfig       |  2 ++
 configs/mx6sabresd_defconfig         |  2 ++
 configs/nitrogen6dl2g_defconfig      |  2 ++
 configs/nitrogen6dl_defconfig        |  2 ++
 configs/nitrogen6q2g_defconfig       |  2 ++
 configs/nitrogen6q_defconfig         |  2 ++
 configs/nitrogen6s1g_defconfig       |  2 ++
 configs/nitrogen6s_defconfig         |  2 ++
 configs/novena_defconfig             |  2 ++
 configs/pico-imx6_defconfig          |  2 ++
 configs/riotboard_defconfig          |  2 ++
 configs/tbs2910_defconfig            |  2 ++
 configs/wandboard_defconfig          |  2 ++
 drivers/video/imx/Kconfig            |  7 +++++++
 include/configs/apalis_imx6.h        |  2 --
 include/configs/aristainetos2.h      |  4 ----
 include/configs/cm_fx6.h             |  3 ---
 include/configs/colibri_imx6.h       |  4 ----
 include/configs/embestmx6boards.h    |  4 ----
 include/configs/ge_b1x5v2.h          |  3 ---
 include/configs/ge_bx50v3.h          |  4 ----
 include/configs/gw_ventana.h         |  4 ----
 include/configs/imx6-engicam.h       | 10 ----------
 include/configs/m53menlo.h           |  1 -
 include/configs/mx53cx9020.h         |  3 ---
 include/configs/mx53ppd.h            |  2 --
 include/configs/mx6cuboxi.h          |  4 ----
 include/configs/mx6sabre_common.h    |  4 ----
 include/configs/nitrogen6x.h         |  4 ----
 include/configs/novena.h             |  4 ----
 include/configs/pico-imx6.h          |  4 ----
 include/configs/tbs2910.h            |  4 ----
 include/configs/wandboard.h          |  4 ----
 51 files changed, 58 insertions(+), 72 deletions(-)
configs/aristainetos2c_defconfig +1 -0
index 5ff29548b0d7..4c7ded9d22fd 100644
@@ -118,6 +118,7 @@ CONFIG_VIDEO_LOGO=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_DISPLAY=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_BMP_16BPP=y
configs/aristainetos2ccslb_defconfig +1 -0
index 0a208543dfe4..a23c77af8973 100644
@@ -118,6 +118,7 @@ CONFIG_VIDEO_LOGO=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_DISPLAY=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_BMP_16BPP=y
configs/cm_fx6_defconfig +1 -0
index ea7596611c5e..217752cbd4dc 100644
@@ -116,6 +116,7 @@ CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
 CONFIG_VIDEO=y
 CONFIG_VIDEO_LOGO=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_HDMI=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SOURCE=y
 CONFIG_FDT_FIXUP_PARTITIONS=y
configs/ge_b1x5v2_defconfig +1 -0
index 180a6a8568e9..353942dd787b 100644
@@ -133,6 +133,7 @@ CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_VIDEO=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
 CONFIG_WATCHDOG_TIMEOUT_MSECS=30000
 CONFIG_IMX_WATCHDOG=y
 CONFIG_BCH=y
configs/ge_bx50v3_defconfig +2 -0
index d9fbdbd64018..e35788fd850a 100644
@@ -98,6 +98,8 @@ CONFIG_VIDEO=y
 # CONFIG_VIDEO_BPP32 is not set
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
 CONFIG_WATCHDOG_TIMEOUT_MSECS=8000
 CONFIG_IMX_WATCHDOG=y
 CONFIG_BCH=y
configs/gwventana_emmc_defconfig +2 -0
index b275247d25d4..f999b4477553 100644
@@ -163,6 +163,8 @@ CONFIG_SYS_WHITE_ON_BLACK=y
 # CONFIG_PANEL is not set
 CONFIG_I2C_EDID=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_HIDE_LOGO_VERSION=y
configs/gwventana_gw5904_defconfig +2 -0
index 6169042c7e6a..4c6291f0c51a 100644
@@ -167,6 +167,8 @@ CONFIG_SYS_WHITE_ON_BLACK=y
 # CONFIG_PANEL is not set
 CONFIG_I2C_EDID=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_HIDE_LOGO_VERSION=y
configs/gwventana_nand_defconfig +2 -0
index 6d57ad49a13c..4e062e477e8c 100644
@@ -173,6 +173,8 @@ CONFIG_SYS_WHITE_ON_BLACK=y
 # CONFIG_PANEL is not set
 CONFIG_I2C_EDID=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_HIDE_LOGO_VERSION=y
configs/imx6dl_icore_nand_defconfig +1 -0
index fe4866e2f512..759bbf9b34e5 100644
@@ -74,6 +74,7 @@ CONFIG_VIDEO_LOGO=y
 # CONFIG_VIDEO_BPP32 is not set
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_BMP_16BPP=y
configs/imx6q_icore_nand_defconfig +1 -0
index 2cb995e7ae1d..c7d31d502ba2 100644
@@ -75,6 +75,7 @@ CONFIG_VIDEO_LOGO=y
 # CONFIG_VIDEO_BPP32 is not set
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_BMP_16BPP=y
configs/imx6qdl_icore_mmc_defconfig +1 -0
index 9f6d29a268b4..f5a7e9697863 100644
@@ -98,6 +98,7 @@ CONFIG_VIDEO_LOGO=y
 # CONFIG_VIDEO_BPP32 is not set
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_BMP_16BPP=y
configs/imx6qdl_icore_nand_defconfig +1 -0
index 2cb995e7ae1d..c7d31d502ba2 100644
@@ -75,6 +75,7 @@ CONFIG_VIDEO_LOGO=y
 # CONFIG_VIDEO_BPP32 is not set
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_BMP_16BPP=y
configs/m53menlo_defconfig +1 -0
index a5760242be51..e332de2aa9e0 100644
@@ -122,6 +122,7 @@ CONFIG_VIDEO_LOGO=y
 # CONFIG_VIDEO_BPP32 is not set
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_SPLASH_SOURCE=y
configs/marsboard_defconfig +2 -0
index a6cffa2db65f..27c5ebe000f4 100644
@@ -67,6 +67,8 @@ CONFIG_VIDEO_LOGO=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 # CONFIG_PANEL is not set
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_BMP_16BPP=y
configs/mx53cx9020_defconfig +1 -0
index b34f2e7e6b4c..c20c6a40a1d7 100644
@@ -40,3 +40,4 @@ CONFIG_VIDEO=y
 # CONFIG_VIDEO_BPP32 is not set
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
configs/mx53ppd_defconfig +1 -0
index ed4ebbbe3c27..d8cb654a59fd 100644
@@ -81,6 +81,7 @@ CONFIG_USB_ETHER_SMSC95XX=y
 CONFIG_VIDEO=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
 CONFIG_WATCHDOG_TIMEOUT_MSECS=8000
 CONFIG_IMX_WATCHDOG=y
 CONFIG_BCH=y
configs/mx6cuboxi_defconfig +2 -0
index 0904bd11013c..a9957aba7c2a 100644
@@ -84,6 +84,8 @@ CONFIG_VIDEO_LOGO=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 # CONFIG_PANEL is not set
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_BMP_16BPP=y
configs/mx6qsabrelite_defconfig +2 -0
index becf36e01c6b..6869b903b7f1 100644
@@ -89,6 +89,8 @@ CONFIG_VIDEO=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_I2C_EDID=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_VIDEO_BMP_GZIP=y
configs/mx6sabreauto_defconfig +2 -0
index 634473f30743..8e94a84409df 100644
@@ -120,6 +120,8 @@ CONFIG_VIDEO_LOGO=y
 # CONFIG_VIDEO_BPP32 is not set
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_BMP_16BPP=y
configs/mx6sabresd_defconfig +2 -0
index 4f7d3704203e..9472e032c814 100644
@@ -125,6 +125,8 @@ CONFIG_VIDEO_LOGO=y
 # CONFIG_VIDEO_BPP32 is not set
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_BMP_16BPP=y
configs/nitrogen6dl2g_defconfig +2 -0
index 3ec4df14a864..87ca8487fbd1 100644
@@ -94,6 +94,8 @@ CONFIG_VIDEO=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_I2C_EDID=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_VIDEO_BMP_GZIP=y
configs/nitrogen6dl_defconfig +2 -0
index 6a6510e12e23..1bdd2f02e9d0 100644
@@ -94,6 +94,8 @@ CONFIG_VIDEO=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_I2C_EDID=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_VIDEO_BMP_GZIP=y
configs/nitrogen6q2g_defconfig +2 -0
index e2acce8757e5..dc010b02a91f 100644
@@ -97,6 +97,8 @@ CONFIG_VIDEO=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_I2C_EDID=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_VIDEO_BMP_GZIP=y
configs/nitrogen6q_defconfig +2 -0
index ceb843f15e07..fe3291d22b7f 100644
@@ -97,6 +97,8 @@ CONFIG_VIDEO=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_I2C_EDID=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_VIDEO_BMP_GZIP=y
configs/nitrogen6s1g_defconfig +2 -0
index bb0d6f5439fe..b31652495f23 100644
@@ -94,6 +94,8 @@ CONFIG_VIDEO=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_I2C_EDID=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_VIDEO_BMP_GZIP=y
configs/nitrogen6s_defconfig +2 -0
index 0232d0c9d767..eb11959e4ae4 100644
@@ -94,6 +94,8 @@ CONFIG_VIDEO=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_I2C_EDID=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_VIDEO_BMP_GZIP=y
configs/novena_defconfig +2 -0
index 5f761799a21f..3999ae1c829d 100644
@@ -99,5 +99,7 @@ CONFIG_VIDEO_LOGO=y
 # CONFIG_VIDEO_BPP32 is not set
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_BMP_16BPP=y
configs/pico-imx6_defconfig +2 -0
index 9b3f76d8e5d8..a6ed013f8b6b 100644
@@ -99,6 +99,8 @@ CONFIG_VIDEO_LOGO=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 # CONFIG_PANEL is not set
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_BMP_16BPP=y
configs/riotboard_defconfig +2 -0
index 1bf40270e833..9f8fbc85c8ab 100644
@@ -84,6 +84,8 @@ CONFIG_VIDEO_LOGO=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 # CONFIG_PANEL is not set
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_BMP_16BPP=y
configs/tbs2910_defconfig +2 -0
index 4c5b98bc656b..0df8a6890021 100644
@@ -114,6 +114,8 @@ CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDCONSOLE_AS_LCD=y
 CONFIG_I2C_EDID=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
 CONFIG_VIDEO_BMP_RLE8=y
 # CONFIG_GZIP is not set
 CONFIG_OF_LIBFDT_ASSUME_MASK=0xff
configs/wandboard_defconfig +2 -0
index 525f55ee00c6..a6baff1e24c9 100644
@@ -83,6 +83,8 @@ CONFIG_VIDEO_LOGO=y
 # CONFIG_VIDEO_BPP32 is not set
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_BMP_16BPP=y
drivers/video/imx/Kconfig +7 -0
index afe950b6df76..34e8b640595b 100644
@@ -6,3 +6,10 @@ config VIDEO_IPUV3
 	  This enables framebuffer driver for i.MX processors working
 	  on the IPUv3(Image Processing Unit) internal graphic processor.
 
+config IMX_VIDEO_SKIP
+	bool "Enable calling board_video_skip function"
+	depends on VIDEO_IPUV3
+
+config IMX_HDMI
+	bool "Enable HDMI support in IPUv3"
+	depends on VIDEO_IPUV3
include/configs/apalis_imx6.h +0 -2
index c9375b4d162a..a3c86545f077 100644
@@ -32,8 +32,6 @@
 #define CONFIG_USBD_HS
 
 /* Framebuffer and LCD */
-#define CONFIG_IMX_HDMI
-#define CONFIG_IMX_VIDEO_SKIP
 
 /* Command definition */
 
include/configs/aristainetos2.h +0 -4
index b1ec8ef269c6..6faf544d21b6 100644
@@ -420,10 +420,6 @@
 
 /* UBI support */
 
-/* Framebuffer */
-/* check this console not needed, after test remove it */
-#define CONFIG_IMX_VIDEO_SKIP
-
 #define CONFIG_ENV_FLAGS_LIST_STATIC "ethaddr:mw,serial#:sw,board_type:sw," \
 		"sysnum:dw,panel:sw,ipaddr:iw,serverip:iw"
 
include/configs/cm_fx6.h +0 -3
index d5c039579759..9df8baa8a969 100644
@@ -143,9 +143,6 @@
 
 /* misc */
 
-/* Display */
-#define CONFIG_IMX_HDMI
-
 /* EEPROM */
 
 #endif	/* __CONFIG_CM_FX6_H */
include/configs/colibri_imx6.h +0 -4
index c6a79debd6ba..60a3862a4d12 100644
@@ -28,10 +28,6 @@
 /* Client */
 #define CONFIG_USBD_HS
 
-/* Framebuffer and LCD */
-#define CONFIG_IMX_HDMI
-#define CONFIG_IMX_VIDEO_SKIP
-
 /* Command definition */
 
 #undef CONFIG_IPADDR
include/configs/embestmx6boards.h +0 -4
index 29b7748e7865..22e0fa5aabfd 100644
@@ -43,10 +43,6 @@
 #define CFG_SYS_FSL_USDHC_NUM	2
 #endif
 
-/* Framebuffer */
-#define CONFIG_IMX_HDMI
-#define CONFIG_IMX_VIDEO_SKIP
-
 #include "mx6_common.h"
 
 /* 256M RAM (minimum), 32M uncompressed kernel, 16M compressed kernel, 1M fdt,
include/configs/ge_b1x5v2.h +0 -3
index a8a6229f526f..1458b187de28 100644
@@ -28,9 +28,6 @@
 #define CONFIG_MXC_USB_FLAGS		0
 #define CONFIG_USBD_HS
 
-/* Video */
-#define CONFIG_IMX_VIDEO_SKIP
-
 /* Memory */
 #define PHYS_SDRAM		       MMDC0_ARB_BASE_ADDR
 
include/configs/ge_bx50v3.h +0 -4
index 705cb763a66d..f62b8f175e1f 100644
@@ -102,8 +102,4 @@
 
 #define CFG_SYS_FSL_USDHC_NUM	3
 
-/* Framebuffer */
-#define CONFIG_IMX_HDMI
-#define CONFIG_IMX_VIDEO_SKIP
-
 #endif	/* __GE_BX50V3_CONFIG_H */
include/configs/gw_ventana.h +0 -4
index 6c5ca0a52057..4d0a78c6269c 100644
@@ -40,10 +40,6 @@
 #define CONFIG_MXC_USB_FLAGS      0
 #define CONFIG_USBD_HS
 
-/* Framebuffer and LCD */
-#define CONFIG_IMX_HDMI
-#define CONFIG_IMX_VIDEO_SKIP
-
 /* Miscellaneous configurable options */
 
 /* Memory configuration */
include/configs/imx6-engicam.h +0 -10
index 1f30798550c6..36b6b95b84de 100644
@@ -132,14 +132,4 @@
 /* MTD device */
 #endif
 
-/* Falcon Mode */
-#ifdef CONFIG_SPL_OS_BOOT
-/* MMC support: args@1MB kernel@2MB */
-#endif
-
-/* Framebuffer */
-#ifdef CONFIG_VIDEO_IPUV3
-# define CONFIG_IMX_VIDEO_SKIP
-#endif
-
 #endif /* __IMX6_ENGICAM_CONFIG_H */
include/configs/m53menlo.h +0 -1
index eca86a94519a..66591390d903 100644
@@ -78,7 +78,6 @@
 
 /* LVDS display */
 #define CFG_SYS_LDB_CLOCK			33260000
-#define CONFIG_IMX_VIDEO_SKIP
 
 /* Watchdog */
 
include/configs/mx53cx9020.h +0 -3
index 2bc462cc37ef..cd806cb698e9 100644
@@ -66,7 +66,4 @@
 
 /* environment organization */
 
-/* Framebuffer and LCD */
-#define CONFIG_IMX_VIDEO_SKIP
-
 #endif /* __CONFIG_H */
include/configs/mx53ppd.h +0 -2
index 963dd92dd709..9464d6e44aea 100644
@@ -102,6 +102,4 @@
 
 /* FLASH and environment organization */
 
-#define CONFIG_IMX_VIDEO_SKIP
-
 #endif				/* __CONFIG_H */
include/configs/mx6cuboxi.h +0 -4
index 12741c08de58..f7f209c20b59 100644
@@ -14,10 +14,6 @@
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC2_BASE_ADDR
 
-/* Framebuffer */
-#define CONFIG_IMX_HDMI
-#define CONFIG_IMX_VIDEO_SKIP
-
 /* USB */
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 
include/configs/mx6sabre_common.h +0 -4
index 5e95e430c49f..6294fd1e2c42 100644
@@ -145,10 +145,6 @@
 
 /* Environment organization */
 
-/* Framebuffer */
-#define CONFIG_IMX_HDMI
-#define CONFIG_IMX_VIDEO_SKIP
-
 #define CONFIG_USBD_HS
 
 #endif                         /* __MX6QSABRE_COMMON_CONFIG_H */
include/configs/nitrogen6x.h +0 -4
index dd7f9513199c..5020b3bb71db 100644
@@ -26,10 +26,6 @@
 #define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS	0
 
-/* Framebuffer and LCD */
-#define CONFIG_IMX_HDMI
-#define CONFIG_IMX_VIDEO_SKIP
-
 #ifdef CONFIG_CMD_MMC
 #define DISTRO_BOOT_DEV_MMC(func) func(MMC, mmc, 0) func(MMC, mmc, 1)
 #else
include/configs/novena.h +0 -4
index 16a89b97b06c..4e46dfc526ce 100644
@@ -63,10 +63,6 @@
 #define CONFIG_USBD_HS
 #endif
 
-/* Video output */
-#define CONFIG_IMX_HDMI
-#define CONFIG_IMX_VIDEO_SKIP
-
 /* Extra U-Boot environment. */
 #define CONFIG_EXTRA_ENV_SETTINGS					\
 	"fdt_high=0xffffffff\0"						\
include/configs/pico-imx6.h +0 -4
index 9e6c210c40b4..6d7873daa0ad 100644
@@ -100,8 +100,4 @@
 /* Ethernet Configuration */
 #define CONFIG_FEC_MXC_PHYADDR		1
 
-/* Framebuffer */
-#define CONFIG_IMX_HDMI
-#define CONFIG_IMX_VIDEO_SKIP
-
 #endif			       /* __CONFIG_H * */
include/configs/tbs2910.h +0 -4
index f6544f6226c7..fcc967494220 100644
@@ -20,10 +20,6 @@
 
 #define CFG_SYS_BOOTMAPSZ		0x10000000
 
-/* Framebuffer */
-#define CONFIG_IMX_HDMI
-#define CONFIG_IMX_VIDEO_SKIP
-
 /* PCI */
 #ifdef CONFIG_CMD_PCI
 #define CONFIG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(7, 12)
include/configs/wandboard.h +0 -4
index 23027b1d3d9e..6923009d4598 100644
@@ -20,10 +20,6 @@
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS		0
 
-/* Framebuffer */
-#define CONFIG_IMX_HDMI
-#define CONFIG_IMX_VIDEO_SKIP
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc0\0" \
 	"splashpos=m,m\0" \
Signature · 1 line
2.25.1
author
#12 lore raw

PATCH 13/38 mpc8548cds: Migrate CONFIG_INTERRUPTS to Kconfig

In reply to Tom Rini

Only this platform sets this option, define it in the board Kconfig file.

---
 board/freescale/mpc8548cds/Kconfig | 3 +++
 include/configs/MPC8548CDS.h       | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)
board/freescale/mpc8548cds/Kconfig +3 -0
index 723ead51e5ce..bb0a0758964c 100644
@@ -6,6 +6,9 @@ config PCI1
 config FSL_CADMUS
 	def_bool y
 
+config INTERRUPTS
+	def_bool y
+
 config SYS_BOARD
 	default "mpc8548cds"
 
include/configs/MPC8548CDS.h +0 -2
index 75ac26957078..83eb18c3b7ac 100644
@@ -13,8 +13,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_INTERRUPTS		/* enable pci, srio, ddr interrupts */
-
 #ifndef __ASSEMBLY__
 #include <linux/stringify.h>
 #endif
Signature · 1 line
2.25.1
author
#13 lore raw

PATCH 14/38 Convert CONFIG_IODELAY_RECALIBRATION to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_IODELAY_RECALIBRATION

---
 arch/arm/mach-omap2/omap5/Kconfig | 4 ++++
 include/configs/am57xx_evm.h      | 2 --
 include/configs/dra7xx_evm.h      | 2 --
 3 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/mach-omap2/omap5/Kconfig +4 -0
index 18a66764224d..0787d192b696 100644
@@ -1,7 +1,11 @@
 if OMAP54XX
 
+config IODELAY_RECALIBRATION
+	bool
+
 config DRA7XX
 	bool
+	select IODELAY_RECALIBRATION
 	select SYS_OMAP_ABE_SYSCK
 	help
 	  DRA7xx is an OMAP based SOC with Dual Core A-15s.
include/configs/am57xx_evm.h +0 -2
index 340a8ce6dc88..dacfd41ccedf 100644
@@ -14,8 +14,6 @@
 #include <environment/ti/dfu.h>
 #include <linux/sizes.h>
 
-#define CONFIG_IODELAY_RECALIBRATION
-
 #define CFG_SYS_NS16550_COM1		UART1_BASE	/* Base EVM has UART0 */
 #define CFG_SYS_NS16550_COM2		UART2_BASE	/* UART2 */
 #define CFG_SYS_NS16550_COM3		UART3_BASE	/* UART3 */
include/configs/dra7xx_evm.h +0 -2
index 8217712e3904..ac3fcacc68ed 100644
@@ -13,8 +13,6 @@
 
 #include <environment/ti/dfu.h>
 
-#define CONFIG_IODELAY_RECALIBRATION
-
 #define CONFIG_VERY_BIG_RAM
 #define CONFIG_MAX_MEM_MAPPED		0x80000000
 
Signature · 1 line
2.25.1
author
#14 lore raw

PATCH 15/38 Convert CONFIG_IOMUX_SHARE_CONF_REG et al to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_IOMUX_LPSR
CONFIG_IOMUX_SHARE_CONF_REG

---
 arch/arm/Kconfig                           | 1 +
 arch/arm/include/asm/arch-vf610/imx-regs.h | 3 ---
 arch/arm/mach-imx/Kconfig                  | 6 ++++++
 arch/arm/mach-imx/mx6/Kconfig              | 3 +++
 arch/arm/mach-imx/mx7/Kconfig              | 1 +
 include/configs/colibri-imx6ull.h          | 1 -
 include/configs/mx6sllevk.h                | 2 --
 include/configs/mx6ullevk.h                | 2 --
 include/configs/mx7_common.h               | 3 ---
 9 files changed, 11 insertions(+), 11 deletions(-)
arch/arm/Kconfig +1 -0
index 7866e8f3c4d9..11dddba9a36b 100644
@@ -1245,6 +1245,7 @@ config ARCH_VF610
 	bool "Freescale Vybrid"
 	select CPU_V7A
 	select GPIO_EXTRA_HEADER
+	select IOMUX_SHARE_CONF_REG
 	select MACH_IMX
 	select SYS_FSL_ERRATUM_ESDHC111
 	imply CMD_MTDPARTS
arch/arm/include/asm/arch-vf610/imx-regs.h +0 -3
index 97211f4b12af..fa3a97824faa 100644
@@ -103,9 +103,6 @@
 
 #define QSPI0_AMBA_BASE		0x20000000
 
-/* MUX mode and PAD ctrl are in one register */
-#define CONFIG_IOMUX_SHARE_CONF_REG
-
 #define FEC_QUIRK_ENET_MAC
 #define I2C_QUIRK_REG
 
arch/arm/mach-imx/Kconfig +6 -0
index b72b6af4340a..ee5f1996a830 100644
@@ -195,3 +195,9 @@ config IMX_CONTAINER_CFG
 	help
 	  This is to specific the cfg file for generating container
 	  image which will be loaded by SPL.
+
+config IOMUX_LPSR
+	bool
+
+config IOMUX_SHARE_CONF_REG
+	bool
arch/arm/mach-imx/mx6/Kconfig +3 -0
index 752c57f52db0..e6b0ee757933 100644
@@ -168,6 +168,7 @@ config TARGET_COLIBRI_IMX6ULL
 	select BOARD_LATE_INIT
 	select DM
 	select DM_THERMAL
+	select IOMUX_LPSR
 
 config TARGET_DART_6UL
 	bool "Variscite imx6ULL dart(DART-SOM-6ULL)"
@@ -396,6 +397,7 @@ config TARGET_MX6SLLEVK
 	select BOARD_LATE_INIT
 	select DM
 	select DM_THERMAL
+	select IOMUX_LPSR
 	imply CMD_DM
 
 config TARGET_MX6SXSABRESD
@@ -464,6 +466,7 @@ config TARGET_MX6ULL_14X14_EVK
 	select BOARD_LATE_INIT
 	select DM
 	select DM_THERMAL
+	select IOMUX_LPSR
 	imply CMD_DM
 
 config TARGET_MX6ULZ_SMM_M2
arch/arm/mach-imx/mx7/Kconfig +1 -0
index 3c388183bc28..0bb18f652009 100644
@@ -6,6 +6,7 @@ config MX7
 	select ARCH_SUPPORT_PSCI
 	select CPU_V7_HAS_NONSEC
 	select CPU_V7_HAS_VIRT
+	select IOMUX_LPSR
 	select ROM_UNIFIED_SECTIONS
 	select SYSCOUNTER_TIMER
 	imply CMD_FUSE
include/configs/colibri-imx6ull.h +0 -1
index 12dc946fc782..c0c3b4e0359a 100644
@@ -11,7 +11,6 @@
 #define __COLIBRI_IMX6ULL_CONFIG_H
 
 #include "mx6_common.h"
-#define CONFIG_IOMUX_LPSR
 
 #define PHYS_SDRAM_SIZE			SZ_1G
 
include/configs/mx6sllevk.h +0 -2
index 6632e4ea29ce..8731f6a3e4ad 100644
@@ -92,8 +92,6 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC1_BASE_ADDR
 #define CFG_SYS_FSL_USDHC_NUM	3
 
-#define CONFIG_IOMUX_LPSR
-
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
include/configs/mx6ullevk.h +0 -2
index 4154d328dedf..0e986093f35a 100644
@@ -108,8 +108,6 @@
 
 /* environment organization */
 
-#define CONFIG_IOMUX_LPSR
-
 #ifdef CONFIG_CMD_NET
 #define CONFIG_FEC_ENET_DEV		1
 #endif
include/configs/mx7_common.h +0 -3
index 4704276a74de..d5af6990107d 100644
@@ -17,9 +17,6 @@
 #define CONFIG_MXC_GPT_HCLK
 #define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */
 
-/* Enable iomux-lpsr support */
-#define CONFIG_IOMUX_LPSR
-
 /* Miscellaneous configurable options */
 
 /* UART */
Signature · 1 line
2.25.1
author
#15 lore raw

PATCH 16/38 sandbox: Move CONFIG_IO_TRACE to Kconfig

In reply to Tom Rini

This is only used on sandbox, so select it there.

---
 arch/Kconfig              | 1 +
 common/Kconfig            | 3 +++
 include/configs/sandbox.h | 2 --
 3 files changed, 4 insertions(+), 2 deletions(-)
arch/Kconfig +1 -0
index ae397166979b..51d46a45fef1 100644
@@ -146,6 +146,7 @@ config SANDBOX
 	select DM_SPI
 	select DM_SPI_FLASH
 	select GZIP_COMPRESSED
+	select IO_TRACE
 	select LZO
 	select OF_BOARD_SETUP
 	select PCI_ENDPOINT
common/Kconfig +3 -0
index 053e93eb1ab4..8c71d3c972bf 100644
@@ -1086,3 +1086,6 @@ config FDT_SIMPLEFB
 	  These functions can be used by board to indicate to the OS
 	  the presence of the simple frame buffer with associated reserved
 	  memory
+
+config IO_TRACE
+	bool
include/configs/sandbox.h +0 -2
index f69fd0ed39c3..3a5af4b3b609 100644
@@ -6,8 +6,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_IO_TRACE
-
 #define CONFIG_MALLOC_F_ADDR		0x0010000
 
 /* GUIDs for capsule updatable firmware images */
Signature · 1 line
2.25.1
author
#17 lore raw

PATCH 17/38 arm: lpc32xx: Remove unused hsuart driver

In reply to Tom Rini

This driver is not enabled in any config currently, remove it.

Cc Trevor Woerner <[email protected]>

---
I ran in to this as CONFIG_LPC32XX_HSUART is not in Kconfig, so doing that migration would be another path forward here.

---
 arch/arm/include/asm/arch-lpc32xx/config.h |   8 --
 arch/arm/mach-lpc32xx/devices.c            |  16 ---
 drivers/serial/Makefile                    |   1 -
 drivers/serial/lpc32xx_hsuart.c            | 112 ---------------------
 include/dm/platform_data/lpc32xx_hsuart.h  |  18 ----
 5 files changed, 155 deletions(-)
 delete mode 100644 drivers/serial/lpc32xx_hsuart.c
 delete mode 100644 include/dm/platform_data/lpc32xx_hsuart.h
arch/arm/include/asm/arch-lpc32xx/config.h +0 -8
index 3ad78cb1e645..41160384a4dc 100644
@@ -11,14 +11,6 @@
 
 /* Basic CPU architecture */
 
-/* UART configuration */
-#if	(CONFIG_CONS_INDEX == 1) || (CONFIG_CONS_INDEX == 2) || \
-	(CONFIG_CONS_INDEX == 7)
-#if !defined(CONFIG_LPC32XX_HSUART)
-#define CONFIG_LPC32XX_HSUART
-#endif
-#endif
-
 #if !defined(CFG_SYS_NS16550_CLK)
 #define CFG_SYS_NS16550_CLK		13000000
 #endif
arch/arm/mach-lpc32xx/devices.c +0 -16
index 3fcf8facb411..6a67a3591aa6 100644
@@ -6,7 +6,6 @@
 #include <common.h>
 #include <dm.h>
 #include <ns16550.h>
-#include <dm/platform_data/lpc32xx_hsuart.h>
 
 #include <asm/arch/clk.h>
 #include <asm/arch/uart.h>
@@ -53,26 +52,11 @@ static const struct ns16550_plat lpc32xx_uart[] = {
 	  .clock = CFG_SYS_NS16550_CLK, .fcr = UART_FCR_DEFVAL, },
 };
 
-#if defined(CONFIG_LPC32XX_HSUART)
-static const struct lpc32xx_hsuart_plat lpc32xx_hsuart[] = {
-	{ HS_UART1_BASE, },
-	{ HS_UART2_BASE, },
-	{ HS_UART7_BASE, },
-};
-#endif
-
 U_BOOT_DRVINFOS(lpc32xx_uarts) = {
-#if defined(CONFIG_LPC32XX_HSUART)
-	{ "lpc32xx_hsuart", &lpc32xx_hsuart[0], },
-	{ "lpc32xx_hsuart", &lpc32xx_hsuart[1], },
-#endif
 	{ "ns16550_serial", &lpc32xx_uart[0], },
 	{ "ns16550_serial", &lpc32xx_uart[1], },
 	{ "ns16550_serial", &lpc32xx_uart[2], },
 	{ "ns16550_serial", &lpc32xx_uart[3], },
-#if defined(CONFIG_LPC32XX_HSUART)
-	{ "lpc32xx_hsuart", &lpc32xx_hsuart[2], },
-#endif
 };
 #endif
 
drivers/serial/Makefile +0 -1
index eb7b8f23ee90..a26eb16634a0 100644
@@ -38,7 +38,6 @@ obj-$(CONFIG_COREBOOT_SERIAL) += serial_coreboot.o
 obj-$(CONFIG_CORTINA_UART) += serial_cortina.o
 obj-$(CONFIG_DEBUG_SBI_CONSOLE) += serial_sbi.o
 obj-$(CONFIG_EFI_APP) += serial_efi.o
-obj-$(CONFIG_LPC32XX_HSUART) += lpc32xx_hsuart.o
 obj-$(CONFIG_MCFUART) += serial_mcf.o
 obj-$(CONFIG_SYS_NS16550) += ns16550.o
 obj-$(CONFIG_S5P_SERIAL) += serial_s5p.o
drivers/serial/lpc32xx_hsuart.c deleted +0 -112

112 lines not on this page · raw message

include/dm/platform_data/lpc32xx_hsuart.h deleted +0 -18
deleted file mode 100644
index 6f41e0e734a5..000000000000
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (c) 2015 Vladimir Zapolskiy <[email protected]>
- */
-
-#ifndef _LPC32XX_HSUART_PLAT_H
-#define _LPC32XX_HSUART_PLAT_H
-
-/**
- * struct lpc32xx_hsuart_plat - NXP LPC32xx HSUART platform data
- *
- * @base:               Base register address
- */
-struct lpc32xx_hsuart_plat {
-	unsigned long base;
-};
-
-#endif
Signature · 1 line
2.25.1
author
#18 lore raw

PATCH 18/38 arm: ls102xa: Migrate LS102XA_STREAM_ID

In reply to Tom Rini

This symbol appears to be globally used in the architecture, select it.

---
 arch/arm/cpu/armv7/ls102xa/Kconfig   | 4 ++++
 include/configs/km/pg-wcom-ls102xa.h | 6 ------
 include/configs/ls1021aiot.h         | 2 --
 include/configs/ls1021aqds.h         | 2 --
 include/configs/ls1021atsn.h         | 2 --
 include/configs/ls1021atwr.h         | 2 --
 6 files changed, 4 insertions(+), 14 deletions(-)
arch/arm/cpu/armv7/ls102xa/Kconfig +4 -0
index 369e68b8193b..7e138e0cc5be 100644
@@ -2,6 +2,7 @@ config ARCH_LS1021A
 	bool
 	select FSL_DEVICE_DISABLE
 	select FSL_IFC if !QSPI_BOOT && !SD_BOOT_QSPI
+	select LS102XA_STREAM_ID
 	select SYS_FSL_DDR_BE if SYS_FSL_DDR
 	select SYS_FSL_DDR_VER_50 if SYS_FSL_DDR
 	select SYS_FSL_IFC_BE
@@ -37,6 +38,9 @@ config FSL_DEVICE_DISABLE
 config LS1_DEEP_SLEEP
 	bool "Deep sleep"
 
+config LS102XA_STREAM_ID
+	bool
+
 config MAX_CPUS
 	int "Maximum number of CPUs permitted for LS102xA"
 	default 2
include/configs/km/pg-wcom-ls102xa.h +0 -6
index bbd2b36c45af..c1174b87ab7a 100644
@@ -168,12 +168,6 @@
 
 #define HWCONFIG_BUFFER_SIZE		256
 
-/*
- * Miscellaneous configurable options
- */
-
-#define CONFIG_LS102XA_STREAM_ID
-
 /*
  * Environment
  */
include/configs/ls1021aiot.h +0 -2
index a9680149807c..024a71852753 100644
@@ -103,8 +103,6 @@
  */
 #define CFG_SYS_BOOTMAPSZ		(256 << 20)
 
-#define CONFIG_LS102XA_STREAM_ID
-
 #include <asm/fsl_secure_boot.h>
 
 #endif
include/configs/ls1021aqds.h +0 -2
index 34d4c2fdeccc..5a91cc3efec0 100644
@@ -295,8 +295,6 @@
  */
 #define CFG_SYS_BOOTMAPSZ		(256 << 20)
 
-#define CONFIG_LS102XA_STREAM_ID
-
 /*
  * Environment
  */
include/configs/ls1021atsn.h +0 -2
index a5b7364435dd..5612c60ae904 100644
@@ -140,8 +140,6 @@
 /* Miscellaneous configurable options */
 #define CFG_SYS_BOOTMAPSZ		(256 << 20)
 
-#define CONFIG_LS102XA_STREAM_ID
-
 /* Environment */
 
 #endif
include/configs/ls1021atwr.h +0 -2
index 059941e713a1..3c4c207edd06 100644
@@ -297,8 +297,6 @@
  */
 #define CFG_SYS_BOOTMAPSZ		(256 << 20)
 
-#define CONFIG_LS102XA_STREAM_ID
-
 /*
  * Environment
  */
Signature · 1 line
2.25.1
author
#19 lore raw

PATCH 19/38 arm: samsung: Move CONFIG_MISC_COMMON to Kconfig

In reply to Tom Rini

This option controls using board/samsung/common/misc.c, so add a Kconfig file there as well and select it from the boards which use this functionality.

---
 arch/arm/Kconfig                    | 1 +
 arch/arm/mach-exynos/Kconfig        | 5 +++++
 arch/arm/mach-s5pc1xx/Kconfig       | 1 +
 board/samsung/common/Kconfig        | 2 ++
 include/configs/odroid.h            | 6 ------
 include/configs/odroid_xu3.h        | 1 -
 include/configs/s5p_goni.h          | 2 --
 include/configs/s5pc210_universal.h | 3 ---
 include/configs/trats.h             | 3 ---
 include/configs/trats2.h            | 3 ---
 10 files changed, 9 insertions(+), 18 deletions(-)
 create mode 100644 board/samsung/common/Kconfig
arch/arm/Kconfig +1 -0
index 11dddba9a36b..1268bff5c54b 100644
@@ -2342,6 +2342,7 @@ source "board/hisilicon/poplar/Kconfig"
 source "board/isee/igep003x/Kconfig"
 source "board/kontron/sl28/Kconfig"
 source "board/myir/mys_6ulx/Kconfig"
+source "board/samsung/common/Kconfig"
 source "board/siemens/common/Kconfig"
 source "board/seeed/npi_imx6ull/Kconfig"
 source "board/socionext/developerbox/Kconfig"
arch/arm/mach-exynos/Kconfig +5 -0
index 84102908561e..29e35e443c6a 100644
@@ -67,10 +67,12 @@ config TARGET_SMDKV310
 	select SUPPORT_SPL
 
 config TARGET_TRATS
+	select MISC_COMMON
 	bool "Exynos4210 Trats board"
 
 config TARGET_S5PC210_UNIVERSAL
 	bool "EXYNOS4210 Universal C210 board"
+	select MISC_COMMON
 
 config TARGET_ORIGEN
 	bool "Exynos4412 Origen board"
@@ -79,9 +81,11 @@ config TARGET_ORIGEN
 
 config TARGET_TRATS2
 	bool "Exynos4412 Trat2 board"
+	select MISC_COMMON
 
 config TARGET_ODROID
 	bool "Exynos4412 Odroid board"
+	select MISC_COMMON
 
 endchoice
 endif
@@ -113,6 +117,7 @@ config TARGET_ODROID_XU3
 	bool "Exynos5422 Odroid board"
 	select EXYNOS5_DT
 	select EXYNOS5420
+	select MISC_COMMON
 	select OF_CONTROL
 
 config TARGET_ARNDALE
arch/arm/mach-s5pc1xx/Kconfig +1 -0
index 8cffced5512b..b6a4b0b653fb 100644
@@ -9,6 +9,7 @@ config TARGET_S5P_GONI
 	select OF_CONTROL
 	select BLK
 	select DM_MMC
+	select MISC_COMMON
 
 config TARGET_SMDKC100
 	bool "Support smdkc100 board"
board/samsung/common/Kconfig new file +2 -0
new file mode 100644
index 000000000000..849aeff61344
@@ -0,0 +1,2 @@
+config MISC_COMMON
+	bool
include/configs/odroid.h +0 -6
index 8b00a2792150..f252b349437c 100644
@@ -143,10 +143,4 @@
 	"kernel_addr_r=0x41000000\0" \
 	BOOTENV
 
-/*
- * Supported Odroid boards: X3, U3
- * TODO: Add Odroid X support
- */
-#define CONFIG_MISC_COMMON
-
 #endif	/* __CONFIG_H */
include/configs/odroid_xu3.h +0 -1
index d2d7fca54450..5bbe7aadcb25 100644
@@ -57,7 +57,6 @@
 	"params.bin raw 0x1880 0x20\0"
 
 /* Enable: board/samsung/common/misc.c to use set_dfu_alt_info() */
-#define CONFIG_MISC_COMMON
 #define CONFIG_SET_DFU_ALT_BUF_LEN	(SZ_1K)
 
 /* Set soc_rev, soc_id, board_rev, board_name, fdtfile */
include/configs/s5p_goni.h +0 -2
index 3d49d52b381c..fdade1ee66fa 100644
@@ -61,8 +61,6 @@
 
 #define COMMON_BOOT	"${console} ${meminfo} ${mtdparts}"
 
-#define CONFIG_MISC_COMMON
-
 #define CONFIG_EXTRA_ENV_SETTINGS					\
 	"updateb=" \
 		"onenand erase 0x0 0x100000;" \
include/configs/s5pc210_universal.h +0 -3
index 06be9c0f6528..80d3fc9258cc 100644
@@ -95,9 +95,6 @@ void universal_spi_sda(int bit);
 int universal_spi_read(void);
 #endif
 
-/* Common misc for Samsung */
-#define CONFIG_MISC_COMMON
-
 /* Download menu - definitions for check keys */
 #ifndef __ASSEMBLY__
 
include/configs/trats.h +0 -3
index 5bd0ca2a9645..ec18842bbe8c 100644
@@ -125,9 +125,6 @@
 
 /* GPT */
 
-/* Common misc for Samsung */
-#define CONFIG_MISC_COMMON
-
 /* Download menu - definitions for check keys */
 #ifndef __ASSEMBLY__
 
include/configs/trats2.h +0 -3
index cef563696bde..0aa331e39359 100644
@@ -115,9 +115,6 @@
 
 /* GPT */
 
-/* Common misc for Samsung */
-#define CONFIG_MISC_COMMON
-
 /* Download menu - definitions for check keys */
 #ifndef __ASSEMBLY__
 
Signature · 1 line
2.25.1
Reviewed-by on v1 19/38
#20 lore raw

Re: [PATCH 19/38] arm: samsung: Move CONFIG_MISC_COMMON to Kconfig

Quoted 6 lines · Tom Rini

This option controls using board/samsung/common/misc.c, so add a Kconfig file there as well and select it from the boards which use this functionality.

Quoted 13 lines
---
 arch/arm/Kconfig                    | 1 +
 arch/arm/mach-exynos/Kconfig        | 5 +++++
 arch/arm/mach-s5pc1xx/Kconfig       | 1 +
 board/samsung/common/Kconfig        | 2 ++
 include/configs/odroid.h            | 6 ------
 include/configs/odroid_xu3.h        | 1 -
 include/configs/s5p_goni.h          | 2 --
 include/configs/s5pc210_universal.h | 3 ---
 include/configs/trats.h             | 3 ---
 include/configs/trats2.h            | 3 ---
 10 files changed, 9 insertions(+), 18 deletions(-)
 create mode 100644 board/samsung/common/Kconfig
Reviewed-by
#21 lore raw

Re: [PATCH 19/38] arm: samsung: Move CONFIG_MISC_COMMON to Kconfig

Hi,

Quoted 21 lines · Simon Glass
Quoted 6 lines · Tom Rini

This option controls using board/samsung/common/misc.c, so add a Kconfig file there as well and select it from the boards which use this functionality.

Quoted 13 lines
---
 arch/arm/Kconfig                    | 1 +
 arch/arm/mach-exynos/Kconfig        | 5 +++++
 arch/arm/mach-s5pc1xx/Kconfig       | 1 +
 board/samsung/common/Kconfig        | 2 ++
 include/configs/odroid.h            | 6 ------
 include/configs/odroid_xu3.h        | 1 -
 include/configs/s5p_goni.h          | 2 --
 include/configs/s5pc210_universal.h | 3 ---
 include/configs/trats.h             | 3 ---
 include/configs/trats2.h            | 3 ---
 10 files changed, 9 insertions(+), 18 deletions(-)
 create mode 100644 board/samsung/common/Kconfig
Quoted 2 lines
Signature · 2 lines
Thanks,
Minkyu Kang.
author
#22 lore raw

PATCH 20/38 arm: Remove unused mx27 code

In reply to Tom Rini

We no longer have any i.MX27 platforms, remove the remaining support code.

---
 arch/arm/cpu/arm926ejs/Makefile        |   1 -
 arch/arm/cpu/arm926ejs/mx27/Makefile   |   7 -
 arch/arm/cpu/arm926ejs/mx27/generic.c  | 378 -------------------------
 arch/arm/cpu/arm926ejs/mx27/relocate.S |  50 ----
 arch/arm/cpu/arm926ejs/mx27/reset.c    |  41 ---
 arch/arm/cpu/arm926ejs/mx27/timer.c    | 166 -----------
 arch/arm/lib/asm-offsets.c             |  29 +-
 drivers/gpio/mxc_gpio.c                |  12 +-
 drivers/mtd/nand/raw/mxc_nand.c        |   3 +-
 drivers/mtd/nand/raw/mxc_nand.h        |   2 +-
 drivers/net/fec_mxc.c                  |   3 -
 drivers/spi/mxc_spi.c                  |   8 -
 include/configs/imx27lite-common.h     | 134 ---------
 13 files changed, 9 insertions(+), 825 deletions(-)
 delete mode 100644 arch/arm/cpu/arm926ejs/mx27/Makefile
 delete mode 100644 arch/arm/cpu/arm926ejs/mx27/generic.c
 delete mode 100644 arch/arm/cpu/arm926ejs/mx27/relocate.S
 delete mode 100644 arch/arm/cpu/arm926ejs/mx27/reset.c
 delete mode 100644 arch/arm/cpu/arm926ejs/mx27/timer.c
 delete mode 100644 include/configs/imx27lite-common.h
arch/arm/cpu/arm926ejs/Makefile +0 -1
index 7f1436d76e1c..7e7ad4f35d7e 100644
@@ -12,7 +12,6 @@ extra-y	:=
 endif
 endif
 
-obj-$(CONFIG_MX27) += mx27/
 obj-$(if $(filter mxs,$(SOC)),y) += mxs/
 obj-$(if $(filter spear,$(SOC)),y) += spear/
 obj-$(CONFIG_ARCH_SUNXI) += sunxi/
arch/arm/cpu/arm926ejs/mx27/Makefile deleted +0 -7
deleted file mode 100644
index ac5ebaf5ef8c..000000000000
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2000-2006
-# Wolfgang Denk, DENX Software Engineering, [email protected].
-#
-
-obj-y	+= generic.o timer.o reset.o relocate.o
arch/arm/cpu/arm926ejs/mx27/generic.c deleted +0 -378

378 lines not on this page · raw message

arch/arm/cpu/arm926ejs/mx27/relocate.S deleted +0 -50

50 lines not on this page · raw message

arch/arm/cpu/arm926ejs/mx27/reset.c deleted +0 -41

41 lines not on this page · raw message

arch/arm/cpu/arm926ejs/mx27/timer.c deleted +0 -166

166 lines not on this page · raw message

arch/arm/lib/asm-offsets.c +1 -28
index 22fd541f9a28..6de0ce915245 100644
@@ -15,8 +15,7 @@
 #include <linux/kbuild.h>
 #include <linux/arm-smccc.h>
 
-#if defined(CONFIG_MX27) \
-	|| defined(CONFIG_MX51) || defined(CONFIG_MX53)
+#if defined(CONFIG_MX51) || defined(CONFIG_MX53)
 #include <asm/arch/imx-regs.h>
 #endif
 
@@ -35,32 +34,6 @@ int main(void)
 	 * code. Is it better to define the macros directly in headers?
 	 */
 
-#if defined(CONFIG_MX27)
-	DEFINE(AIPI1_PSR0, IMX_AIPI1_BASE + offsetof(struct aipi_regs, psr0));
-	DEFINE(AIPI1_PSR1, IMX_AIPI1_BASE + offsetof(struct aipi_regs, psr1));
-	DEFINE(AIPI2_PSR0, IMX_AIPI2_BASE + offsetof(struct aipi_regs, psr0));
-	DEFINE(AIPI2_PSR1, IMX_AIPI2_BASE + offsetof(struct aipi_regs, psr1));
-
-	DEFINE(CSCR, IMX_PLL_BASE + offsetof(struct pll_regs, cscr));
-	DEFINE(MPCTL0, IMX_PLL_BASE + offsetof(struct pll_regs, mpctl0));
-	DEFINE(SPCTL0, IMX_PLL_BASE + offsetof(struct pll_regs, spctl0));
-	DEFINE(PCDR0, IMX_PLL_BASE + offsetof(struct pll_regs, pcdr0));
-	DEFINE(PCDR1, IMX_PLL_BASE + offsetof(struct pll_regs, pcdr1));
-	DEFINE(PCCR0, IMX_PLL_BASE + offsetof(struct pll_regs, pccr0));
-	DEFINE(PCCR1, IMX_PLL_BASE + offsetof(struct pll_regs, pccr1));
-
-	DEFINE(ESDCTL0_ROF, offsetof(struct esdramc_regs, esdctl0));
-	DEFINE(ESDCFG0_ROF, offsetof(struct esdramc_regs, esdcfg0));
-	DEFINE(ESDCTL1_ROF, offsetof(struct esdramc_regs, esdctl1));
-	DEFINE(ESDCFG1_ROF, offsetof(struct esdramc_regs, esdcfg1));
-	DEFINE(ESDMISC_ROF, offsetof(struct esdramc_regs, esdmisc));
-
-	DEFINE(GPCR, IMX_SYSTEM_CTL_BASE +
-		offsetof(struct system_control_regs, gpcr));
-	DEFINE(FMCR, IMX_SYSTEM_CTL_BASE +
-		offsetof(struct system_control_regs, fmcr));
-#endif
-
 #if defined(CONFIG_MX51) || defined(CONFIG_MX53)
 	/* Round up to make sure size gives nice stack alignment */
 	DEFINE(CLKCTL_CCMR, offsetof(struct clkctl, ccr));
drivers/gpio/mxc_gpio.c +6 -6
index 03471db9e80e..1dec4e35e0a7 100644
@@ -44,13 +44,13 @@ static unsigned long gpio_ports[] = {
 	[0] = GPIO1_BASE_ADDR,
 	[1] = GPIO2_BASE_ADDR,
 	[2] = GPIO3_BASE_ADDR,
-#if defined(CONFIG_MX27) || defined(CONFIG_MX51) || \
+#if defined(CONFIG_MX51) || \
 		defined(CONFIG_MX53) || defined(CONFIG_MX6) || \
 		defined(CONFIG_MX7) || defined(CONFIG_IMX8M) || \
 		defined(CONFIG_ARCH_IMX8) || defined(CONFIG_IMXRT1050)
 	[3] = GPIO4_BASE_ADDR,
 #endif
-#if defined(CONFIG_MX27) || defined(CONFIG_MX53) || defined(CONFIG_MX6) || \
+#if defined(CONFIG_MX53) || defined(CONFIG_MX6) || \
 		defined(CONFIG_MX7) || defined(CONFIG_IMX8M) || \
 		defined(CONFIG_ARCH_IMX8) || defined(CONFIG_IMXRT1050)
 	[4] = GPIO5_BASE_ADDR,
@@ -352,12 +352,12 @@ static const struct mxc_gpio_plat mxc_plat[] = {
 	{ 0, (struct gpio_regs *)GPIO1_BASE_ADDR },
 	{ 1, (struct gpio_regs *)GPIO2_BASE_ADDR },
 	{ 2, (struct gpio_regs *)GPIO3_BASE_ADDR },
-#if defined(CONFIG_MX27) || defined(CONFIG_MX51) || \
+#if defined(CONFIG_MX51) || \
 		defined(CONFIG_MX53) || defined(CONFIG_MX6) || \
 		defined(CONFIG_IMX8M) || defined(CONFIG_ARCH_IMX8)
 	{ 3, (struct gpio_regs *)GPIO4_BASE_ADDR },
 #endif
-#if defined(CONFIG_MX27) || defined(CONFIG_MX53) || defined(CONFIG_MX6) || \
+#if defined(CONFIG_MX53) || defined(CONFIG_MX6) || \
 		defined(CONFIG_IMX8M) || defined(CONFIG_ARCH_IMX8)
 	{ 4, (struct gpio_regs *)GPIO5_BASE_ADDR },
 #ifndef CONFIG_IMX8M
@@ -376,12 +376,12 @@ U_BOOT_DRVINFOS(mxc_gpios) = {
 	{ "gpio_mxc", &mxc_plat[0] },
 	{ "gpio_mxc", &mxc_plat[1] },
 	{ "gpio_mxc", &mxc_plat[2] },
-#if defined(CONFIG_MX27) || defined(CONFIG_MX51) || \
+#if defined(CONFIG_MX51) || \
 		defined(CONFIG_MX53) || defined(CONFIG_MX6) || \
 		defined(CONFIG_IMX8M) || defined(CONFIG_ARCH_IMX8)
 	{ "gpio_mxc", &mxc_plat[3] },
 #endif
-#if defined(CONFIG_MX27) || defined(CONFIG_MX53) || defined(CONFIG_MX6) || \
+#if defined(CONFIG_MX53) || defined(CONFIG_MX6) || \
 		defined(CONFIG_IMX8M) || defined(CONFIG_ARCH_IMX8)
 	{ "gpio_mxc", &mxc_plat[4] },
 #ifndef CONFIG_IMX8M
drivers/mtd/nand/raw/mxc_nand.c +1 -2
index fa903e324c59..8aa5f7342131 100644
@@ -12,8 +12,7 @@
 #include <linux/err.h>
 #include <linux/mtd/rawnand.h>
 #include <asm/io.h>
-#if defined(CONFIG_MX27) || \
-	defined(CONFIG_MX51) || defined(CONFIG_MX53)
+#if defined(CONFIG_MX51) || defined(CONFIG_MX53)
 #include <asm/arch/imx-regs.h>
 #endif
 #include "mxc_nand.h"
drivers/mtd/nand/raw/mxc_nand.h +1 -1
index 771f61e24919..084fac705a12 100644
@@ -24,7 +24,7 @@
  *	Reading or writing a 2K or 4K page requires only 1 FDI/FDO cycle.
  *	Also some of registers are moved and/or changed meaning as seen below.
  */
-#if defined(CONFIG_MX27) || defined(CONFIG_MX31)
+#if defined(CONFIG_MX31)
 #define MXC_NFC_V1
 #define is_mxc_nfc_1()		1
 #define is_mxc_nfc_21()		0
drivers/net/fec_mxc.c +0 -3
index bbc4434ddb9e..a61a1fc75738 100644
@@ -251,9 +251,6 @@ static int miiphy_restart_aneg(struct eth_device *dev)
 	 * Wake up from sleep if necessary
 	 * Reset PHY, then delay 300ns
 	 */
-#ifdef CONFIG_MX27
-	fec_mdio_write(eth, fec->phy_id, MII_DCOUNTER, 0x00FF);
-#endif
 	fec_mdio_write(eth, fec->phy_id, MII_BMCR, BMCR_RESET);
 	udelay(1000);
 
drivers/spi/mxc_spi.c +0 -8
index 5adfdf8b5fc6..ea9cc3d1f983 100644
@@ -91,14 +91,6 @@ struct cspi_regs {
 #define MXC_CSPICON_CTL		20 /* inactive state of SCLK */
 #endif
 
-#ifdef CONFIG_MX27
-/* i.MX27 has a completely wrong register layout and register definitions in the
- * datasheet, the correct one is in the Freescale's Linux driver */
-
-#error "i.MX27 CSPI not supported due to drastic differences in register definitions" \
-"See linux mxc_spi driver from Freescale for details."
-#endif
-
 __weak int board_spi_cs_gpio(unsigned bus, unsigned cs)
 {
 	return -1;
include/configs/imx27lite-common.h deleted +0 -134

134 lines not on this page · raw message

Signature · 1 line
2.25.1
author
#23 lore raw

PATCH 21/38 Convert CONFIG_MXS_OCOTP to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_MXS_OCOTP

---
 drivers/misc/Kconfig  | 8 ++++++++
 include/configs/mxs.h | 5 -----
 2 files changed, 8 insertions(+), 5 deletions(-)
drivers/misc/Kconfig +8 -0
index fb3bbb3b919f..122d605a537d 100644
@@ -330,6 +330,14 @@ config MXC_OCOTP
 	  Programmable memory pages that are stored on the some
 	  Freescale i.MX processors.
 
+config MXS_OCOTP
+	bool "Enable MXS OCOTP Driver"
+	depends on ARCH_MX23 || ARCH_MX28
+	help
+	  If you say Y here, you will get support for the One Time
+	  Programmable memory pages that are stored on the
+	  Freescale i.MXS family of processors.
+
 config NPCM_HOST
 	bool "Enable support espi or LPC for Host"
 	depends on REGMAP && SYSCON
include/configs/mxs.h +0 -5
index 5df080ade4a2..30f27e7f0c19 100644
@@ -86,11 +86,6 @@
 #define CFG_SYS_NAND_BASE		0x60000000
 #endif
 
-/* OCOTP */
-#ifdef CONFIG_CMD_FUSE
-#define CONFIG_MXS_OCOTP
-#endif
-
 /* SPI */
 #ifdef CONFIG_CMD_SPI
 #define CONFIG_SPI_HALF_DUPLEX
Signature · 1 line
2.25.1
author
#24 lore raw

PATCH 22/38 Convert CONFIG_NAND_KMETER1 et al to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_NAND_ECC_BCH
CONFIG_NAND_KIRKWOOD
CONFIG_NAND_KMETER1

---
 arch/arm/mach-kirkwood/include/mach/config.h |  1 -
 configs/kmcoge5ne_defconfig                  |  1 +
 drivers/mtd/nand/raw/Kconfig                 | 13 +++++++++++++
 include/configs/km/km-mpc83xx.h              |  1 -
 include/configs/kmcoge5ne.h                  |  2 --
 5 files changed, 14 insertions(+), 4 deletions(-)
arch/arm/mach-kirkwood/include/mach/config.h +0 -1
index a2781e25a23b..a6de7676294b 100644
@@ -34,7 +34,6 @@
  * NAND configuration
  */
 #ifdef CONFIG_CMD_NAND
-#define CONFIG_NAND_KIRKWOOD
 #define CFG_SYS_NAND_BASE		0xD8000000	/* MV_DEFADR_NANDF */
 #define NAND_ALLOW_ERASE_ALL		1
 #endif
configs/kmcoge5ne_defconfig +1 -0
index 71d196533f7e..c2a17c6212f1 100644
@@ -235,6 +235,7 @@ CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_MTD_RAW_NAND=y
+CONFIG_NAND_KMETER1=y
 CONFIG_DM_ETH_PHY=y
 CONFIG_QE_UEC=y
 # CONFIG_PCI is not set
drivers/mtd/nand/raw/Kconfig +13 -0
index eb37b6275998..338a3562a4ac 100644
@@ -225,6 +225,19 @@ config NAND_FSL_IFC
 	help
 	  Enable the Freescale Integrated Flash Controller NAND driver.
 
+config NAND_KIRKWOOD
+	bool "Support for Kirkwood NAND controller"
+	depends on ARCH_KIRKWOOD
+	default y
+
+config NAND_ECC_BCH
+	bool
+
+config NAND_KMETER1
+	bool "Support KMETER1 NAND controller"
+	depends on VENDOR_KM
+	select NAND_ECC_BCH
+
 config NAND_LPC32XX_MLC
 	bool "Support LPC32XX_MLC controller"
 	select SYS_NAND_SELF_INIT
include/configs/km/km-mpc83xx.h +0 -1
index e6a3613b7a24..840a4d5401f5 100644
@@ -57,7 +57,6 @@
 		{1, {I2C_NULL_HOP} } }
 
 #if defined(CONFIG_CMD_NAND)
-#define CONFIG_NAND_KMETER1
 #define CFG_SYS_NAND_BASE		CFG_SYS_KMBEC_FPGA_BASE
 #endif
 
include/configs/kmcoge5ne.h +0 -2
index 2be996aaaf08..c24d6ad8bc2d 100644
@@ -9,8 +9,6 @@
 #define __CONFIG_H
 
 #define CONFIG_HOSTNAME		"kmcoge5ne"
-#define CONFIG_NAND_ECC_BCH
-#define CONFIG_NAND_KMETER1
 #define NAND_MAX_CHIPS				1
 #define CFG_SYS_NAND_BASE CFG_SYS_KMBEC_FPGA_BASE /* PRIO_BASE_ADDRESS */
 
Signature · 1 line
2.25.1
author
#25 lore raw

PATCH 23/38 Convert CONFIG_PCA953X to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_PCA953X

Cc Uri Mashiach <[email protected]>

---
The only user of the non-DM GPIO driver here is the cl-som-imx7, and in turn also the "pca953x" command. I think with a dts resync the DM GPIO driver should just work however?

---
 README                         | 2 --
 configs/cl-som-imx7_defconfig  | 1 +
 drivers/gpio/Kconfig           | 4 ++++
 include/configs/cl-som-imx7.h  | 1 -
 include/configs/imx8qxp_mek.h  | 4 ----
 include/configs/mx6sabreauto.h | 1 -
 6 files changed, 5 insertions(+), 8 deletions(-)
README +0 -2
index 0a7635d1a24d..eb76c73ac3d0 100644
@@ -483,8 +483,6 @@ The following options need to be configured:
 		must also be configured. See I2C Support, below.
 
 - GPIO Support:
-		CONFIG_PCA953X		- use NXP's PCA953X series I2C GPIO
-
 		The CFG_SYS_I2C_PCA953X_WIDTH option specifies a list of
 		chip-ngpio pairs that tell the PCA953X driver the number of
 		pins supported by a particular chip.
configs/cl-som-imx7_defconfig +1 -0
index 3571dba6d2ae..d1a044e3f7ba 100644
@@ -74,6 +74,7 @@ CONFIG_ETHPRIME="FEC"
 CONFIG_SPL_DM=y
 CONFIG_BOUNCE_BUFFER=y
 CONFIG_CMD_PCA953X=y
+CONFIG_PCA953X=y
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SPL_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_MXC=y
drivers/gpio/Kconfig +4 -0
index e007b38fac71..1e4b50ef72b5 100644
@@ -520,6 +520,10 @@ config SPL_DM_PCA953X
 	  Now, max 24 bits chips and PCA953X compatible chips are
 	  supported
 
+config PCA953X
+	bool "NXP's PCA953X series I2C GPIO (legacy driver)"
+	depends on !DM_PCA953X
+
 config MPC8XXX_GPIO
 	bool "Freescale MPC8XXX GPIO driver"
 	depends on DM_GPIO
include/configs/cl-som-imx7.h +0 -1
index 4aaa52f26980..5c9004cbd93a 100644
@@ -21,7 +21,6 @@
 /* PMIC */
 #define CONFIG_POWER_PFUZE3000_I2C_ADDR	0x08
 
-#define CONFIG_PCA953X
 #define CFG_SYS_I2C_PCA953X_ADDR	0x20
 #define CFG_SYS_I2C_PCA953X_WIDTH	{ {0x20, 16} }
 
include/configs/imx8qxp_mek.h +0 -4
index 19f1dba04706..d75b8bf0c18f 100644
@@ -110,10 +110,6 @@
 /* LPDDR4 board total DDR is 3GB */
 #define PHYS_SDRAM_2_SIZE		0x40000000	/* 1 GB */
 
-#ifndef CONFIG_DM_PCA953X
-#define CONFIG_PCA953X
-#endif
-
 /* Misc configuration */
 
 #endif /* __IMX8QXP_MEK_H */
include/configs/mx6sabreauto.h +0 -1
index f5f95a1bd1ce..888da7ce365f 100644
@@ -15,7 +15,6 @@
 #define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS	0
 
-#define CONFIG_PCA953X
 #define CFG_SYS_I2C_PCA953X_WIDTH	{ {0x30, 8}, {0x32, 8}, {0x34, 8} }
 
 #include "mx6sabre_common.h"
Signature · 1 line
2.25.1
author
#26 lore raw

PATCH 24/38 Convert CONFIG_RTC_DS1337 et al to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_RTC_DS1337
CONFIG_RTC_DS1337_NOOSC
CONFIG_RTC_DS1338
CONFIG_RTC_DS1374
CONFIG_RTC_DS3231
CONFIG_RTC_MC13XXX
CONFIG_RTC_MXS
CONFIG_RTC_PT7C4338

---
 README                                        | 22 ----------
 configs/MPC837XERDB_defconfig                 |  1 +
 configs/P1010RDB-PA_36BIT_NAND_defconfig      |  1 +
 configs/P1010RDB-PA_36BIT_NOR_defconfig       |  1 +
 configs/P1010RDB-PA_36BIT_SDCARD_defconfig    |  1 +
 configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig  |  1 +
 configs/P1010RDB-PA_NAND_defconfig            |  1 +
 configs/P1010RDB-PA_NOR_defconfig             |  1 +
 configs/P1010RDB-PA_SDCARD_defconfig          |  1 +
 configs/P1010RDB-PA_SPIFLASH_defconfig        |  1 +
 configs/P1010RDB-PB_36BIT_NAND_defconfig      |  1 +
 configs/P1010RDB-PB_36BIT_NOR_defconfig       |  1 +
 configs/P1010RDB-PB_36BIT_SDCARD_defconfig    |  1 +
 configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig  |  1 +
 configs/P1010RDB-PB_NAND_defconfig            |  1 +
 configs/P1010RDB-PB_NOR_defconfig             |  1 +
 configs/P1010RDB-PB_SDCARD_defconfig          |  1 +
 configs/P1010RDB-PB_SPIFLASH_defconfig        |  1 +
 configs/P1020RDB-PC_36BIT_NAND_defconfig      |  1 +
 configs/P1020RDB-PC_36BIT_SDCARD_defconfig    |  1 +
 configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig  |  1 +
 configs/P1020RDB-PC_36BIT_defconfig           |  1 +
 configs/P1020RDB-PC_NAND_defconfig            |  1 +
 configs/P1020RDB-PC_SDCARD_defconfig          |  1 +
 configs/P1020RDB-PC_SPIFLASH_defconfig        |  1 +
 configs/P1020RDB-PC_defconfig                 |  1 +
 configs/P1020RDB-PD_NAND_defconfig            |  1 +
 configs/P1020RDB-PD_SDCARD_defconfig          |  1 +
 configs/P1020RDB-PD_SPIFLASH_defconfig        |  1 +
 configs/P1020RDB-PD_defconfig                 |  1 +
 configs/P2020RDB-PC_36BIT_NAND_defconfig      |  1 +
 configs/P2020RDB-PC_36BIT_SDCARD_defconfig    |  1 +
 configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig  |  1 +
 configs/P2020RDB-PC_36BIT_defconfig           |  1 +
 configs/P2020RDB-PC_NAND_defconfig            |  1 +
 configs/P2020RDB-PC_SDCARD_defconfig          |  1 +
 configs/P2020RDB-PC_SPIFLASH_defconfig        |  1 +
 configs/P2020RDB-PC_defconfig                 |  1 +
 configs/T1024RDB_NAND_defconfig               |  1 +
 configs/T1024RDB_SDCARD_defconfig             |  1 +
 configs/T1024RDB_SPIFLASH_defconfig           |  1 +
 configs/T1024RDB_defconfig                    |  1 +
 configs/T1042D4RDB_NAND_defconfig             |  1 +
 configs/T1042D4RDB_SDCARD_defconfig           |  1 +
 configs/T1042D4RDB_SPIFLASH_defconfig         |  1 +
 configs/T1042D4RDB_defconfig                  |  1 +
 configs/eb_cpu5282_defconfig                  |  1 +
 configs/eb_cpu5282_internal_defconfig         |  1 +
 configs/ls2080aqds_SECURE_BOOT_defconfig      |  1 +
 configs/ls2080aqds_defconfig                  |  1 +
 configs/ls2080aqds_nand_defconfig             |  1 +
 configs/ls2080aqds_qspi_defconfig             |  1 +
 configs/ls2080aqds_sdcard_defconfig           |  1 +
 configs/ls2080ardb_SECURE_BOOT_defconfig      |  1 +
 configs/ls2080ardb_defconfig                  |  1 +
 configs/ls2080ardb_nand_defconfig             |  1 +
 configs/ls2088aqds_tfa_defconfig              |  1 +
 configs/ls2088ardb_qspi_SECURE_BOOT_defconfig |  1 +
 configs/ls2088ardb_qspi_defconfig             |  1 +
 configs/ls2088ardb_tfa_SECURE_BOOT_defconfig  |  1 +
 configs/ls2088ardb_tfa_defconfig              |  1 +
 configs/mx28evk_defconfig                     |  1 +
 configs/mx51evk_defconfig                     |  1 +
 configs/qemu-ppce500_defconfig                |  1 +
 configs/work_92105_defconfig                  |  1 +
 drivers/rtc/Kconfig                           | 42 ++++++++++++++++++-
 include/configs/MPC837XERDB.h                 |  1 -
 include/configs/P1010RDB.h                    |  1 -
 include/configs/T102xRDB.h                    |  2 -
 include/configs/T104xRDB.h                    |  2 -
 include/configs/eb_cpu5282.h                  |  1 -
 include/configs/ls1012aqds.h                  |  1 -
 include/configs/ls1046afrwy.h                 |  1 -
 include/configs/ls1088aqds.h                  |  1 -
 include/configs/ls1088ardb.h                  |  3 --
 include/configs/ls2080aqds.h                  |  2 -
 include/configs/ls2080ardb.h                  |  2 -
 include/configs/lx2160a_common.h              |  1 -
 include/configs/mx28evk.h                     |  5 ---
 include/configs/mx51evk.h                     |  1 -
 include/configs/p1_p2_rdb_pc.h                |  1 -
 include/configs/qemu-ppce500.h                |  3 --
 include/configs/tqma6_wru4.h                  |  2 -
 include/configs/work_92105.h                  |  2 -
 84 files changed, 105 insertions(+), 55 deletions(-)
README +0 -22
index eb76c73ac3d0..dd43a0c08d4a 100644
@@ -460,28 +460,6 @@ The following options need to be configured:
 		to 0 disables calling WATCHDOG_RESET() from the timer
 		interrupt.
 
-- Real-Time Clock:
-
-		When CONFIG_CMD_DATE is selected, the type of the RTC
-		has to be selected, too. Define exactly one of the
-		following options:
-
-		CONFIG_RTC_PCF8563	- use Philips PCF8563 RTC
-		CONFIG_RTC_MC13XXX	- use MC13783 or MC13892 RTC
-		CONFIG_RTC_MC146818	- use MC146818 RTC
-		CONFIG_RTC_DS1307	- use Maxim, Inc. DS1307 RTC
-		CONFIG_RTC_DS1337	- use Maxim, Inc. DS1337 RTC
-		CONFIG_RTC_DS1338	- use Maxim, Inc. DS1338 RTC
-		CONFIG_RTC_DS1339	- use Maxim, Inc. DS1339 RTC
-		CONFIG_RTC_ISL1208	- use Intersil ISL1208 RTC
-		CONFIG_RTC_MAX6900	- use Maxim, Inc. MAX6900 RTC
-		CONFIG_RTC_DS1337_NOOSC	- Turn off the OSC output for DS1337
-		CONFIG_SYS_RV3029_TCR	- enable trickle charger on
-					  RV3029 RTC.
-
-		Note that if the RTC uses I2C, then the I2C interface
-		must also be configured. See I2C Support, below.
-
 - GPIO Support:
 		The CFG_SYS_I2C_PCA953X_WIDTH option specifies a list of
 		chip-ngpio pairs that tell the PCA953X driver the number of
configs/MPC837XERDB_defconfig +1 -0
index d97fa5aec521..b6263ec03ff6 100644
@@ -207,6 +207,7 @@ CONFIG_DM_ETH_PHY=y
 CONFIG_RGMII=y
 CONFIG_MII=y
 CONFIG_TSEC_ENET=y
+CONFIG_RTC_DS1374=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
configs/P1010RDB-PA_36BIT_NAND_defconfig +1 -0
index 0690582cdfee..874451900e7e 100644
@@ -129,6 +129,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPL_NS16550_MIN_FUNCTIONS=y
 CONFIG_SPI=y
configs/P1010RDB-PA_36BIT_NOR_defconfig +1 -0
index dcf74f5d6af5..34639e5091ab 100644
@@ -93,6 +93,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
configs/P1010RDB-PA_36BIT_SDCARD_defconfig +1 -0
index 230c6d02831c..08c185c5f5fe 100644
@@ -114,6 +114,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig +1 -0
index 982420db74c4..dcf4c0d103e5 100644
@@ -116,6 +116,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
configs/P1010RDB-PA_NAND_defconfig +1 -0
index 785f2d86f189..78c159a3093a 100644
@@ -128,6 +128,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPL_NS16550_MIN_FUNCTIONS=y
 CONFIG_SPI=y
configs/P1010RDB-PA_NOR_defconfig +1 -0
index 537d8bf576b0..0b2c38512278 100644
@@ -92,6 +92,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
configs/P1010RDB-PA_SDCARD_defconfig +1 -0
index dd9120970bab..012e8f69626e 100644
@@ -113,6 +113,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
configs/P1010RDB-PA_SPIFLASH_defconfig +1 -0
index ff7cfa246159..b21372458ba3 100644
@@ -115,6 +115,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
configs/P1010RDB-PB_36BIT_NAND_defconfig +1 -0
index 696cb7e77fbe..ab7c4d3e9758 100644
@@ -132,6 +132,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPL_NS16550_MIN_FUNCTIONS=y
 CONFIG_SPI=y
configs/P1010RDB-PB_36BIT_NOR_defconfig +1 -0
index 92a7e0966936..f878af0b360d 100644
@@ -95,6 +95,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
configs/P1010RDB-PB_36BIT_SDCARD_defconfig +1 -0
index 84e2d3c587a4..38bdbda7481a 100644
@@ -116,6 +116,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig +1 -0
index b883b81e0cd8..956274358ad7 100644
@@ -118,6 +118,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
configs/P1010RDB-PB_NAND_defconfig +1 -0
index ee8c2bebd4b2..46f53983801b 100644
@@ -131,6 +131,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPL_NS16550_MIN_FUNCTIONS=y
 CONFIG_SPI=y
configs/P1010RDB-PB_NOR_defconfig +1 -0
index 3e16470608e5..7239747d7e38 100644
@@ -94,6 +94,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
configs/P1010RDB-PB_SDCARD_defconfig +1 -0
index e985f8cd75d0..529e54c221ac 100644
@@ -115,6 +115,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
configs/P1010RDB-PB_SPIFLASH_defconfig +1 -0
index 9f4ae14e0b23..e066a9db747d 100644
@@ -117,6 +117,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
configs/P1020RDB-PC_36BIT_NAND_defconfig +1 -0
index f2eb7ed737b7..46816999e7a6 100644
@@ -142,6 +142,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPL_NS16550_MIN_FUNCTIONS=y
 CONFIG_SPI=y
configs/P1020RDB-PC_36BIT_SDCARD_defconfig +1 -0
index 3b3cf1ee7a5e..4ce423ea739c 100644
@@ -124,6 +124,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig +1 -0
index aba5b9cedd43..d7b2d3780907 100644
@@ -126,6 +126,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
configs/P1020RDB-PC_36BIT_defconfig +1 -0
index ce0ba0e37574..d67b31aafcda 100644
@@ -104,6 +104,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
configs/P1020RDB-PC_NAND_defconfig +1 -0
index 1f12338bc35d..6d1193e051d2 100644
@@ -141,6 +141,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPL_NS16550_MIN_FUNCTIONS=y
 CONFIG_SPI=y
configs/P1020RDB-PC_SDCARD_defconfig +1 -0
index 25eb5d5da74a..25c04754acba 100644
@@ -123,6 +123,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
configs/P1020RDB-PC_SPIFLASH_defconfig +1 -0
index 054320f356cd..d865102dc6f2 100644
@@ -125,6 +125,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
configs/P1020RDB-PC_defconfig +1 -0
index aae886b75c4e..28bc16c97e43 100644
@@ -103,6 +103,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
configs/P1020RDB-PD_NAND_defconfig +1 -0
index 4682677471ad..20384bb054d6 100644
@@ -144,6 +144,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPL_NS16550_MIN_FUNCTIONS=y
 CONFIG_SPI=y
configs/P1020RDB-PD_SDCARD_defconfig +1 -0
index dc82da81b816..bffecea2634e 100644
@@ -126,6 +126,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
configs/P1020RDB-PD_SPIFLASH_defconfig +1 -0
index 7b80edeeeb92..a87afd3bb08c 100644
@@ -128,6 +128,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
configs/P1020RDB-PD_defconfig +1 -0
index 5fecb6684735..c0111b4acd05 100644
@@ -106,6 +106,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
configs/P2020RDB-PC_36BIT_NAND_defconfig +1 -0
index d917c5470b1b..169e54cd1b7e 100644
@@ -147,6 +147,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPL_NS16550_MIN_FUNCTIONS=y
 CONFIG_SPI=y
configs/P2020RDB-PC_36BIT_SDCARD_defconfig +1 -0
index fd143b610b98..ff3388b68bd2 100644
@@ -129,6 +129,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig +1 -0
index edb8b9958eae..234bc80a3aff 100644
@@ -131,6 +131,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
configs/P2020RDB-PC_36BIT_defconfig +1 -0
index b1dbca6e7ea3..0691cbcc217b 100644
@@ -109,6 +109,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
configs/P2020RDB-PC_NAND_defconfig +1 -0
index 89d366c96a43..bfaa79af6abd 100644
@@ -146,6 +146,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPL_NS16550_MIN_FUNCTIONS=y
 CONFIG_SPI=y
configs/P2020RDB-PC_SDCARD_defconfig +1 -0
index b5394d05b7ff..2d00717e538a 100644
@@ -128,6 +128,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
configs/P2020RDB-PC_SPIFLASH_defconfig +1 -0
index 431ca31302c9..9edbb04b3802 100644
@@ -130,6 +130,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
configs/P2020RDB-PC_defconfig +1 -0
index 1ee46f9fbe9f..2c7dd633e556 100644
@@ -108,6 +108,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
configs/T1024RDB_NAND_defconfig +1 -0
index 2aada043e83a..8f5d603974df 100644
@@ -129,6 +129,7 @@ CONFIG_PCIE_FSL=y
 CONFIG_SYS_QE_FW_ADDR=0x200000
 CONFIG_SYS_QE_FMAN_FW_IN_NAND=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_DS1337=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
configs/T1024RDB_SDCARD_defconfig +1 -0
index e5661b0b6052..3fb54800d967 100644
@@ -123,6 +123,7 @@ CONFIG_PCIE_FSL=y
 CONFIG_SYS_QE_FW_ADDR=0x124000
 CONFIG_SYS_QE_FMAN_FW_IN_MMC=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_DS1337=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
configs/T1024RDB_SPIFLASH_defconfig +1 -0
index 320f22e348ea..ee8667e49c85 100644
@@ -126,6 +126,7 @@ CONFIG_PCIE_FSL=y
 CONFIG_SYS_QE_FW_ADDR=0x130000
 CONFIG_SYS_QE_FMAN_FW_IN_SPIFLASH=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_DS1337=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
configs/T1024RDB_defconfig +1 -0
index 1f571b6e6fa0..f8144f07bfde 100644
@@ -98,6 +98,7 @@ CONFIG_PCIE_FSL=y
 CONFIG_SYS_QE_FW_ADDR=0xEFE00000
 CONFIG_SYS_QE_FMAN_FW_IN_NOR=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_DS1337=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
configs/T1042D4RDB_NAND_defconfig +1 -0
index 4088d40de30d..8a9094b56118 100644
@@ -129,6 +129,7 @@ CONFIG_U_QE=y
 CONFIG_SYS_QE_FW_ADDR=0x380000
 CONFIG_SYS_QE_FMAN_FW_IN_NAND=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_DS1337=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
configs/T1042D4RDB_SDCARD_defconfig +1 -0
index 5a6f9a8d248f..25d18b71bcf3 100644
@@ -123,6 +123,7 @@ CONFIG_U_QE=y
 CONFIG_SYS_QE_FW_ADDR=0x124000
 CONFIG_SYS_QE_FMAN_FW_IN_MMC=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_DS1337=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
configs/T1042D4RDB_SPIFLASH_defconfig +1 -0
index 2d03b4eb1424..8189abb4c5e6 100644
@@ -126,6 +126,7 @@ CONFIG_U_QE=y
 CONFIG_SYS_QE_FW_ADDR=0x130000
 CONFIG_SYS_QE_FMAN_FW_IN_SPIFLASH=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_DS1337=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
configs/T1042D4RDB_defconfig +1 -0
index 8f283fa8fd26..9e68b434687b 100644
@@ -98,6 +98,7 @@ CONFIG_U_QE=y
 CONFIG_SYS_QE_FW_ADDR=0xEFF10000
 CONFIG_SYS_QE_FMAN_FW_IN_NOR=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_DS1337=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
configs/eb_cpu5282_defconfig +1 -0
index f904bb313bb5..a831c1c5d2aa 100644
@@ -52,4 +52,5 @@ CONFIG_SYS_FLASH_CFI=y
 CONFIG_SYS_MAX_FLASH_SECT=128
 CONFIG_MCFFEC=y
 CONFIG_MII=y
+CONFIG_RTC_DS1338=y
 CONFIG_MCFUART=y
configs/eb_cpu5282_internal_defconfig +1 -0
index 2ce6ff91403e..6a673c918110 100644
@@ -50,4 +50,5 @@ CONFIG_SYS_FLASH_CFI=y
 CONFIG_SYS_MAX_FLASH_SECT=128
 CONFIG_MCFFEC=y
 CONFIG_MII=y
+CONFIG_RTC_DS1338=y
 CONFIG_MCFUART=y
configs/ls2080aqds_SECURE_BOOT_defconfig +1 -0
index 817ae8d728b3..5649ebb49586 100644
@@ -95,6 +95,7 @@ CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_RTC_ENABLE_32KHZ_OUTPUT=y
+CONFIG_RTC_DS3231=y
 CONFIG_DM_SCSI=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
configs/ls2080aqds_defconfig +1 -0
index b3e75847cca3..936c5ede5177 100644
@@ -98,6 +98,7 @@ CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_RTC_ENABLE_32KHZ_OUTPUT=y
+CONFIG_RTC_DS3231=y
 CONFIG_DM_SCSI=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
configs/ls2080aqds_nand_defconfig +1 -0
index effcd33629b8..4479256bd57a 100644
@@ -111,6 +111,7 @@ CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_RTC_ENABLE_32KHZ_OUTPUT=y
+CONFIG_RTC_DS3231=y
 CONFIG_DM_SCSI=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
configs/ls2080aqds_qspi_defconfig +1 -0
index eb57948414df..4c0113978e08 100644
@@ -91,6 +91,7 @@ CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_RTC_ENABLE_32KHZ_OUTPUT=y
+CONFIG_RTC_DS3231=y
 CONFIG_DM_SCSI=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
configs/ls2080aqds_sdcard_defconfig +1 -0
index e5702b815923..2b31cf4dec5d 100644
@@ -105,6 +105,7 @@ CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_RTC_ENABLE_32KHZ_OUTPUT=y
+CONFIG_RTC_DS3231=y
 CONFIG_DM_SCSI=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
configs/ls2080ardb_SECURE_BOOT_defconfig +1 -0
index face1e05320a..a8a66b966c7b 100644
@@ -92,6 +92,7 @@ CONFIG_NVME_PCI=y
 CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
+CONFIG_RTC_DS3231=y
 CONFIG_DM_SCSI=y
 CONFIG_CONS_INDEX=2
 CONFIG_SYS_NS16550=y
configs/ls2080ardb_defconfig +1 -0
index ba6f5090d471..97428bcd821a 100644
@@ -95,6 +95,7 @@ CONFIG_NVME_PCI=y
 CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
+CONFIG_RTC_DS3231=y
 CONFIG_DM_SCSI=y
 CONFIG_CONS_INDEX=2
 CONFIG_SYS_NS16550=y
configs/ls2080ardb_nand_defconfig +1 -0
index 500029003031..20f686b016ea 100644
@@ -114,6 +114,7 @@ CONFIG_NVME_PCI=y
 CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
+CONFIG_RTC_DS3231=y
 CONFIG_DM_SCSI=y
 CONFIG_CONS_INDEX=2
 CONFIG_SYS_NS16550=y
configs/ls2088aqds_tfa_defconfig +1 -0
index 9c6012460b37..ce42840255a3 100644
@@ -111,6 +111,7 @@ CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_ENABLE_32KHZ_OUTPUT=y
+CONFIG_RTC_DS3231=y
 CONFIG_DM_SCSI=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
configs/ls2088ardb_qspi_SECURE_BOOT_defconfig +1 -0
index 6e1fe901ff4a..eb74e76eff6b 100644
@@ -80,6 +80,7 @@ CONFIG_MII=y
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
+CONFIG_RTC_DS3231=y
 CONFIG_DM_SCSI=y
 CONFIG_CONS_INDEX=2
 CONFIG_SYS_NS16550=y
configs/ls2088ardb_qspi_defconfig +1 -0
index 8441814f13f5..4cd2ef0f01ff 100644
@@ -87,6 +87,7 @@ CONFIG_MII=y
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
+CONFIG_RTC_DS3231=y
 CONFIG_DM_SCSI=y
 CONFIG_CONS_INDEX=2
 CONFIG_SYS_NS16550=y
configs/ls2088ardb_tfa_SECURE_BOOT_defconfig +1 -0
index dc9a47463f49..db93759b25de 100644
@@ -98,6 +98,7 @@ CONFIG_NVME_PCI=y
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_DS3231=y
 CONFIG_DM_SCSI=y
 CONFIG_CONS_INDEX=2
 CONFIG_SYS_NS16550=y
configs/ls2088ardb_tfa_defconfig +1 -0
index 361098568097..bb620cd0eb3a 100644
@@ -106,6 +106,7 @@ CONFIG_NVME_PCI=y
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_DS3231=y
 CONFIG_DM_SCSI=y
 CONFIG_CONS_INDEX=2
 CONFIG_SYS_NS16550=y
configs/mx28evk_defconfig +1 -0
index 996dd5c97071..dad8839a6c10 100644
@@ -61,6 +61,7 @@ CONFIG_PINCTRL_MXS=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_RTC_MXS=y
 CONFIG_CONS_INDEX=0
 CONFIG_SPI=y
 CONFIG_USB=y
configs/mx51evk_defconfig +1 -0
index 774523bc84b8..b173648c8ebc 100644
@@ -56,6 +56,7 @@ CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
 CONFIG_POWER_FSL=y
 CONFIG_POWER_SPI=y
+CONFIG_RTC_MC13XXX=y
 CONFIG_MXC_UART=y
 CONFIG_SPI=y
 CONFIG_MXC_SPI=y
configs/qemu-ppce500_defconfig +1 -0
index d6ff4ac2c299..cdad1b099500 100644
@@ -52,6 +52,7 @@ CONFIG_E1000=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCI_MPC85XX=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
 CONFIG_SYSRESET=y
configs/work_92105_defconfig +1 -0
index 127bbf715fce..167a07860fda 100644
@@ -72,6 +72,7 @@ CONFIG_SYS_NAND_U_BOOT_OFFS=0x40000
 CONFIG_PHYLIB=y
 CONFIG_PHY_ADDR_ENABLE=y
 CONFIG_PHY_SMSC=y
+CONFIG_RTC_DS1374=y
 CONFIG_SPECIFY_CONSOLE_INDEX=y
 CONFIG_CONS_INDEX=5
 CONFIG_SYS_NS16550=y
drivers/rtc/Kconfig +41 -1

68 lines not on this page · raw message

include/configs/MPC837XERDB.h +0 -1
index 2796adbdcd8f..de63a0f1993f 100644
@@ -167,7 +167,6 @@
 /*
  * Config on-board RTC
  */
-#define CONFIG_RTC_DS1374	/* use ds1374 rtc via i2c */
 #define CFG_SYS_I2C_RTC_ADDR	0x68 /* at address 0x68 */
 
 /*
include/configs/P1010RDB.h +0 -1
index 0a1b932e94e8..c0805f979be7 100644
@@ -341,7 +341,6 @@ extern unsigned long get_sdram_size(void);
 /* enable read and write access to EEPROM */
 
 /* RTC */
-#define CONFIG_RTC_PT7C4338
 #define CFG_SYS_I2C_RTC_ADDR	0x68
 
 /*
include/configs/T102xRDB.h +0 -2
index e394237daf08..623d4cf5562d 100644
@@ -311,8 +311,6 @@
 /*
  * RTC configuration
  */
-#define RTC
-#define CONFIG_RTC_DS1337	1
 #define CFG_SYS_I2C_RTC_ADDR	0x68
 
 /*
include/configs/T104xRDB.h +0 -2
index f681a2182298..d3fd10526bd9 100644
@@ -285,8 +285,6 @@
 /*
  * RTC configuration
  */
-#define RTC
-#define CONFIG_RTC_DS1337               1
 #define CFG_SYS_I2C_RTC_ADDR         0x68
 
 /*DVI encoder*/
include/configs/eb_cpu5282.h +0 -1
index 426155dbdbf1..21eab9b3a479 100644
@@ -150,7 +150,6 @@
  */
 
 #ifdef CONFIG_CMD_DATE
-#define CONFIG_RTC_DS1338
 #define CONFIG_I2C_RTC_ADDR		0x68
 #endif
 
include/configs/ls1012aqds.h +0 -1
index e772c019077d..495bb3911b3a 100644
@@ -46,7 +46,6 @@
 /*
 * RTC configuration
 */
-#define RTC
 #define CFG_SYS_I2C_RTC_ADDR         0x51  /* Channel 3*/
 
 
include/configs/ls1046afrwy.h +0 -1
index 58ae0fb0a6c1..1759d25f3a39 100644
@@ -66,7 +66,6 @@
 #define I2C_MUX_CH_RTC				0x1 /* Channel 0*/
 
 /* RTC */
-#define RTC
 #define CFG_SYS_I2C_RTC_ADDR		0x51  /* Channel 0 I2C bus 0*/
 #define CFG_SYS_RTC_BUS_NUM			0
 
include/configs/ls1088aqds.h +0 -1
index d84622f32259..a35045d640ff 100644
@@ -280,7 +280,6 @@
 /*
 * RTC configuration
 */
-#define RTC
 #define CFG_SYS_I2C_RTC_ADDR         0x51  /* Channel 3*/
 
 #ifdef CONFIG_FSL_DSPI
include/configs/ls1088ardb.h +0 -3
index 187b3072f02e..7bc4fc6a6652 100644
@@ -186,13 +186,10 @@
 #define I2C_MUX_CH_DEFAULT		0x8
 #define I2C_MUX_CH5			0xD
 
-#ifndef SPL_NO_RTC
 /*
 * RTC configuration
 */
-#define RTC
 #define CFG_SYS_I2C_RTC_ADDR         0x51  /* Channel 3*/
-#endif
 
 #ifndef SPL_NO_ENV
 /* Initial environment variables */
include/configs/ls2080aqds.h +0 -2
index 067587b53c5d..924d4057d936 100644
@@ -227,8 +227,6 @@
 /*
  * RTC configuration
  */
-#define RTC
-#define CONFIG_RTC_DS3231               1
 #define CFG_SYS_I2C_RTC_ADDR         0x68
 
 /* Initial environment variables */
include/configs/ls2080ardb.h +0 -2
index 32a119487234..c50b6030680c 100644
@@ -210,11 +210,9 @@
 /*
  * RTC configuration
  */
-#define RTC
 #ifdef CONFIG_TARGET_LS2081ARDB
 #define CFG_SYS_I2C_RTC_ADDR         0x51
 #else
-#define CONFIG_RTC_DS3231               1
 #define CFG_SYS_I2C_RTC_ADDR         0x68
 #endif
 
include/configs/lx2160a_common.h +0 -1
index ff85d966e661..a469c83fa4eb 100644
@@ -74,7 +74,6 @@
 #define I2C_MUX_CH_DEFAULT		0x8
 
 /* RTC */
-#define RTC
 #define CFG_SYS_I2C_RTC_ADDR		0x51  /* Channel 3*/
 
 /* Qixis */
include/configs/mx28evk.h +0 -5
index bc8c89337043..c740d8533274 100644
@@ -17,11 +17,6 @@
 
 /* UBI and NAND partitioning */
 
-/* RTC */
-#ifdef	CONFIG_CMD_DATE
-#define	CONFIG_RTC_MXS
-#endif
-
 /* Extra Environment */
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"ubifs_file=filesystem.ubifs\0" \
include/configs/mx51evk.h +0 -1
index d9d76d7c08da..ddd37b3936ff 100644
@@ -26,7 +26,6 @@
 #define CONFIG_FSL_PMIC_CLK	2500000
 #define CONFIG_FSL_PMIC_MODE	(SPI_MODE_0 | SPI_CS_HIGH)
 #define CONFIG_FSL_PMIC_BITLEN	32
-#define CONFIG_RTC_MC13XXX
 
 /*
  * MMC Configs
include/configs/p1_p2_rdb_pc.h +0 -1
index eda2d43d0c1f..c8acce8b06b7 100644
@@ -329,7 +329,6 @@
  * I2C2 EEPROM
  */
 
-#define CONFIG_RTC_PT7C4338
 #define CFG_SYS_I2C_RTC_ADDR		0x68
 #define CFG_SYS_I2C_PCA9557_ADDR	0x18
 
include/configs/qemu-ppce500.h +0 -3
index d1b20da24a86..30a9eae8523b 100644
@@ -44,9 +44,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void);
 
 #define CFG_SYS_INIT_SP_OFFSET	(CFG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 
-/* RTC */
-#define CONFIG_RTC_PT7C4338
-
 /*
  * Miscellaneous configurable options
  */
include/configs/tqma6_wru4.h +0 -2
index ce897fcd9325..4d8839b6e60d 100644
@@ -16,11 +16,9 @@
 /* Watchdog */
 
 /* Config on-board RTC */
-#define CONFIG_RTC_DS1337
 #define CFG_SYS_RTC_BUS_NUM		2
 #define CFG_SYS_I2C_RTC_ADDR		0x68
 /* Turn off RTC square-wave output to save battery */
-#define CONFIG_RTC_DS1337_NOOSC
 
 /* LED */
 
include/configs/work_92105.h +0 -2
index 065006f912c8..010da1531ff9 100644
@@ -19,8 +19,6 @@
 #define CFG_SYS_SDRAM_BASE		EMC_DYCS0_BASE
 #define CFG_SYS_SDRAM_SIZE		SZ_128M
 
-#define CONFIG_RTC_DS1374
-
 /*
  * U-Boot General Configurations
  */
Signature · 1 line
2.25.1
author
#27 lore raw

PATCH 25/38 Convert CONFIG_SH_GPIO_PFC et al to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_SH_GPIO_PFC
CONFIG_TMU_TIMER

---
 arch/arm/mach-rmobile/Kconfig.32   | 4 ++++
 drivers/gpio/Kconfig               | 5 +++++
 include/configs/rcar-gen2-common.h | 5 -----
 3 files changed, 9 insertions(+), 5 deletions(-)
arch/arm/mach-rmobile/Kconfig.32 +4 -0
index a07eff71dfe7..31badc5a47dd 100644
@@ -8,6 +8,7 @@ config RCAR_GEN2
 	bool "Renesas RCar Gen2"
 	select PHY
 	select PHY_RCAR_GEN2
+	select TMU_TIMER
 
 config R8A7740
 	bool "Renesas SoC R8A7740"
@@ -121,6 +122,9 @@ config TARGET_STOUT
 
 endchoice
 
+config TMU_TIMER
+	bool
+
 config SYS_SOC
 	default "rmobile"
 
drivers/gpio/Kconfig +5 -0
index 1e4b50ef72b5..365615a53f7e 100644
@@ -596,6 +596,11 @@ config ZYNQMP_GPIO_MODEPIN
 	  are accessed using xilinx firmware. In modepin register, [3:0] bits
 	  set direction, [7:4] bits read IO, [11:8] bits set/clear IO.
 
+config SH_GPIO_PFC
+	bool "Pinmuxed GPIO support for SuperH"
+	depends on RCAR_GEN2 && !PINCTRL_PFC
+	default y
+
 config SL28CPLD_GPIO
 	bool "Kontron sl28cpld GPIO driver"
 	depends on DM_GPIO && SL28CPLD
include/configs/rcar-gen2-common.h +0 -5
index a86180ead576..291c2a43d4d9 100644
@@ -10,10 +10,6 @@
 
 #include <asm/arch/rmobile.h>
 
-#ifndef CONFIG_PINCTRL_PFC
-#define CONFIG_SH_GPIO_PFC
-#endif
-
 /* console */
 #define CFG_SYS_BAUDRATE_TABLE	{ 38400, 115200 }
 
@@ -21,7 +17,6 @@
 #define CFG_SYS_SDRAM_SIZE		(RCAR_GEN2_UBOOT_SDRAM_SIZE)
 
 /* Timer */
-#define CONFIG_TMU_TIMER
 #define CFG_SYS_TIMER_COUNTER	(TMU_BASE + 0xc)	/* TCNT0 */
 #define CFG_SYS_TIMER_RATE		(get_board_sys_clk() / 8)
 
Signature · 1 line
2.25.1
author
#28 lore raw

PATCH 26/38 Convert CONFIG_SMSC_LPC47M et al to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_SMSC_LPC47M
CONFIG_SMSC_SIO1007

---
 configs/cougarcanyon2_defconfig | 1 +
 configs/crownbay_defconfig      | 1 +
 drivers/misc/Kconfig            | 6 ++++++
 include/configs/cougarcanyon2.h | 2 --
 include/configs/crownbay.h      | 2 --
 5 files changed, 8 insertions(+), 4 deletions(-)
configs/cougarcanyon2_defconfig +1 -0
index 203eff8e165a..8b47f2d89f87 100644
@@ -52,6 +52,7 @@ CONFIG_SYSCON=y
 CONFIG_LBA48=y
 CONFIG_SYS_64BIT_LBA=y
 CONFIG_CPU=y
+CONFIG_SMSC_SIO1007=y
 CONFIG_SYS_NS16550=y
 CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_SPI=y
configs/crownbay_defconfig +1 -0
index cb0f0d7c8d02..038cbbe5b993 100644
@@ -56,6 +56,7 @@ CONFIG_SYSCON=y
 CONFIG_LBA48=y
 CONFIG_SYS_64BIT_LBA=y
 CONFIG_CPU=y
+CONFIG_SMSC_LPC47M=y
 CONFIG_E1000=y
 CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_SOUND=y
drivers/misc/Kconfig +6 -0
index 122d605a537d..b07261d3db5a 100644
@@ -112,6 +112,12 @@ config SIFIVE_OTP
 	  Enable support for reading and writing the eMemory OTP on the
 	  SiFive SoCs.
 
+config SMSC_LPC47M
+	bool "LPC47M SMSC driver"
+
+config SMSC_SIO1007
+	bool "SIO1007 SMSC driver"
+
 config VEXPRESS_CONFIG
 	bool "Enable support for Arm Versatile Express config bus"
 	depends on MISC
include/configs/cougarcanyon2.h +0 -2
index efd0b7784350..b64c7df1b25f 100644
@@ -8,8 +8,6 @@
 
 #include <configs/x86-common.h>
 
-#define CONFIG_SMSC_SIO1007
-
 #define CONFIG_STD_DEVICES_SETTINGS	"stdin=serial,i8042-kbd,usbkbd\0" \
 					"stdout=serial,vga\0" \
 					"stderr=serial,vga\0"
include/configs/crownbay.h +0 -2
index e8a8af7e6492..ff74deb3d400 100644
@@ -12,8 +12,6 @@
 
 #include <configs/x86-common.h>
 
-#define CONFIG_SMSC_LPC47M
-
 #define CONFIG_STD_DEVICES_SETTINGS	"stdin=serial,i8042-kbd,usbkbd\0" \
 					"stdout=serial,vidconsole\0" \
 					"stderr=serial,vidconsole\0"
Signature · 1 line
2.25.1
author
#29 lore raw

PATCH 27/38 Convert CONFIG_SPD_EEPROM to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_SPD_EEPROM

Cc Stefan Roese <[email protected]>

---
Note that this increases the size of SPL on db-mv784mp-gp as now the SPD_EEPROM code is being included, where it wasn't before seemingly.

---
 README                              | 7 -------
 configs/MPC8548CDS_36BIT_defconfig  | 1 +
 configs/MPC8548CDS_defconfig        | 1 +
 configs/MPC8548CDS_legacy_defconfig | 1 +
 configs/socrates_defconfig          | 1 +
 drivers/ddr/Kconfig                 | 8 ++++++++
 include/configs/MPC8548CDS.h        | 1 -
 include/configs/db-mv784mp-gp.h     | 3 ---
 include/configs/socrates.h          | 1 -
 9 files changed, 12 insertions(+), 12 deletions(-)
README +0 -7
index dd43a0c08d4a..0acc0b410917 100644
@@ -1683,13 +1683,6 @@ Low Level (hardware related) configuration options:
 		Sets the EBC0_CFG register for the NDFC. If not defined
 		a default value will be used.
 
-- CONFIG_SPD_EEPROM
-		Get DDR timing information from an I2C EEPROM. Common
-		with pluggable memory modules such as SODIMMs
-
-  SPD_EEPROM_ADDRESS
-		I2C address of the SPD EEPROM
-
 - CONFIG_SYS_SPD_BUS_NUM
 		If SPD EEPROM is on an I2C bus other than the first
 		one, specify here. Note that the value must resolve
configs/MPC8548CDS_36BIT_defconfig +1 -0
index 98a2c4f85fc5..8d2a0785a8af 100644
@@ -45,6 +45,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="8548cds/uImage.uboot"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC0"
+CONFIG_SPD_EEPROM=y
 CONFIG_CHIP_SELECTS_PER_CTRL=2
 CONFIG_DDR_ECC=y
 CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
configs/MPC8548CDS_defconfig +1 -0
index b47dbb533cee..5faba03e136d 100644
@@ -44,6 +44,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="8548cds/uImage.uboot"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC0"
+CONFIG_SPD_EEPROM=y
 CONFIG_CHIP_SELECTS_PER_CTRL=2
 CONFIG_DDR_ECC=y
 CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
configs/MPC8548CDS_legacy_defconfig +1 -0
index af2c6a25eb9c..dbabf665cbf4 100644
@@ -44,6 +44,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="8548cds/uImage.uboot"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC0"
+CONFIG_SPD_EEPROM=y
 CONFIG_CHIP_SELECTS_PER_CTRL=2
 CONFIG_DDR_ECC=y
 CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
configs/socrates_defconfig +1 -0
index ab52ea26a089..f45f570764cd 100644
@@ -57,6 +57,7 @@ CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_ENV_ADDR_REDUND=0xFFF20000
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="TSEC0"
+CONFIG_SPD_EEPROM=y
 CONFIG_CHIP_SELECTS_PER_CTRL=2
 CONFIG_SYS_BR0_PRELIM_BOOL=y
 CONFIG_SYS_BR0_PRELIM=0xFE001001
drivers/ddr/Kconfig +8 -0
index 738b7884012f..fa873cc48750 100644
@@ -37,3 +37,11 @@ config SYS_SPD_BUS_NUM
 
 source "drivers/ddr/altera/Kconfig"
 source "drivers/ddr/imx/Kconfig"
+
+config SPD_EEPROM
+	bool "DDR controller makes use of an SPD EEPROM for JEDEC information"
+	depends on SYS_FSL_DDR || SYS_FSL_MMDC || CONFIG_ARMADA_XP
+	help
+	  Get DDR timing information from an I2C EEPROM. Common with pluggable
+	  memory modules such as SODIMMs. You must define SPD_EEPROM_ADDRESS
+	  to the I2C address of the SPD EEPROM.
include/configs/MPC8548CDS.h +0 -1
index 83eb18c3b7ac..780ee5ae865a 100644
@@ -30,7 +30,6 @@
 #define CFG_SYS_CCSRBAR_PHYS_LOW	CFG_SYS_CCSRBAR
 
 /* DDR Setup */
-#define CONFIG_SPD_EEPROM		/* Use SPD EEPROM for DDR setup*/
 
 #define CONFIG_MEM_INIT_VALUE	0xDeadBeef
 
include/configs/db-mv784mp-gp.h +0 -3
index 7b305955c962..bf8b35102ad7 100644
@@ -45,7 +45,4 @@
 /* SPL */
 /* Defines for SPL */
 
-/* Enable DDR support in SPL (DDR3 training from Marvell bin_hdr) */
-#define CONFIG_SPD_EEPROM		0x4e
-
 #endif /* _CONFIG_DB_MV7846MP_GP_H */
include/configs/socrates.h +0 -1
index 0a2d5815170b..95393d3ab25e 100644
@@ -50,7 +50,6 @@
 #define CFG_SYS_CCSRBAR_PHYS_LOW	CFG_SYS_CCSRBAR
 
 /* DDR Setup */
-#define CONFIG_SPD_EEPROM		/* Use SPD EEPROM for DDR setup */
 
 #define CONFIG_MEM_INIT_VALUE	0xDeadBeef
 
Signature · 1 line
2.25.1
author
#30 lore raw

PATCH 28/38 Convert CONFIG_TPS6586X_POWER et al to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_TPS6586X_POWER
CONFIG_TWL6030_POWER

---
 configs/omap4_panda_defconfig     | 1 +
 configs/omap4_sdp4430_defconfig   | 1 +
 configs/seaboard_defconfig        | 1 +
 drivers/power/Kconfig             | 7 +++++++
 include/configs/seaboard.h        | 1 -
 include/configs/ti_omap4_common.h | 3 ---
 6 files changed, 10 insertions(+), 4 deletions(-)
configs/omap4_panda_defconfig +1 -0
index 2c4e26c290a7..3eb8b8ae2db5 100644
@@ -45,6 +45,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SPL_SYS_I2C_LEGACY=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_TWL6030_POWER=y
 CONFIG_CONS_INDEX=3
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
configs/omap4_sdp4430_defconfig +1 -0
index 2315a84285ec..8b77509d14ee 100644
@@ -42,6 +42,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SPL_SYS_I2C_LEGACY=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_TWL6030_POWER=y
 CONFIG_CONS_INDEX=3
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
configs/seaboard_defconfig +1 -0
index 686a3c062b1d..2375040a9ec5 100644
@@ -50,6 +50,7 @@ CONFIG_SYS_NAND_ONFI_DETECTION=y
 CONFIG_DM_PMIC=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_TPS6586X_POWER=y
 CONFIG_PWM_TEGRA=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
drivers/power/Kconfig +7 -0
index 5dbcde333ba5..7f3b990d2315 100644
@@ -411,6 +411,9 @@ config SY8106A_VOUT1_VOLT
 	is typically used to power the VDD-CPU and should be 1200mV.
 	Values can range from 680mV till 1950mV.
 
+config TPS6586X_POWER
+	bool "Enable legacy driver for TI TPS6586x power management chip"
+
 config TWL4030_POWER
 	depends on OMAP34XX
 	bool "Enable driver for TI TWL4030 power management chip"
@@ -419,6 +422,10 @@ config TWL4030_POWER
 	The TWL4030 in a combination audio CODEC/power management with
 	GPIO and it is commonly used with the OMAP3 family of processors
 
+config TWL6030_POWER
+	depends on OMAP44XX
+	bool "Enable driver for TI TWL6030 power management chip"
+
 config POWER_MT6323
 	bool "Poweroff driver for mediatek mt6323"
 	select CMD_POWEROFF
include/configs/seaboard.h +0 -1
index 4887747968f2..73b738bd0993 100644
@@ -12,7 +12,6 @@
 /* LP0 suspend / resume */
 #define CONFIG_TEGRA_LP0
 #define CONFIG_TEGRA_PMU
-#define CONFIG_TPS6586X_POWER
 #define CONFIG_TEGRA_CLOCK_SCALING
 
 #include "tegra20-common.h"
include/configs/ti_omap4_common.h +0 -3
index 9a068e261402..64ec59d78eb6 100644
@@ -32,9 +32,6 @@
 #define CFG_SYS_NS16550_COM3		UART3_BASE
 #endif
 
-/* TWL6030 */
-#define CONFIG_TWL6030_POWER		1
-
 /*
  * Environment setup
  */
Signature · 1 line
2.25.1
author
#31 lore raw

PATCH 29/38 Convert CONFIG_TEGRA_CLOCK_SCALING et al to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_TEGRA_CLOCK_SCALING
CONFIG_TEGRA_LP0
CONFIG_TEGRA_PMU

---
 arch/arm/mach-tegra/tegra20/Kconfig    | 12 ++++++++++++
 arch/arm/mach-tegra/tegra20/warmboot.c |  4 ----
 include/configs/seaboard.h             |  5 -----
 3 files changed, 12 insertions(+), 9 deletions(-)
arch/arm/mach-tegra/tegra20/Kconfig +12 -0
index 5c4d35b5673d..345563fc789e 100644
@@ -1,5 +1,15 @@
 if TEGRA20
 
+config TEGRA_LP0
+	bool
+	select TEGRA_CLOCK_SCALING
+
+config TEGRA_PMU
+	bool
+
+config TEGRA_CLOCK_SCALING
+	bool
+
 choice
 	prompt "Tegra20 board select"
 	optional
@@ -23,6 +33,8 @@ config TARGET_PLUTUX
 config TARGET_SEABOARD
 	bool "NVIDIA Seaboard"
 	select BOARD_LATE_INIT
+	select TEGRA_LP0
+	select TEGRA_PMU
 
 config TARGET_TEC
 	bool "Avionic Design Tamonten Evaluation Carrier"
arch/arm/mach-tegra/tegra20/warmboot.c +0 -4
index 3d3758f6e6f4..5e3a9ebaceb3 100644
@@ -23,10 +23,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#ifndef CONFIG_TEGRA_CLOCK_SCALING
-#error "You must enable CONFIG_TEGRA_CLOCK_SCALING to use CONFIG_TEGRA_LP0"
-#endif
-
 /*
  * This is the place in SRAM where the SDRAM parameters are stored. There
  * are 4 blocks, one for each RAM code
include/configs/seaboard.h +0 -5
index 73b738bd0993..f272fe9bf8f1 100644
@@ -9,11 +9,6 @@
 
 #include <linux/sizes.h>
 
-/* LP0 suspend / resume */
-#define CONFIG_TEGRA_LP0
-#define CONFIG_TEGRA_PMU
-#define CONFIG_TEGRA_CLOCK_SCALING
-
 #include "tegra20-common.h"
 
 /* High-level configuration options */
Signature · 1 line
2.25.1
author
#32 lore raw

PATCH 30/38 Nokia RX-51: Migrate legacy USB device options to Kconfig

In reply to Tom Rini

Move a number of legacy USB UDC options to Kconfig, over from the config header.

---
 README                       |  7 -------
 board/nokia/rx51/Kconfig     | 30 ++++++++++++++++++++++++++++++
 include/configs/nokia_rx51.h |  9 ---------
 3 files changed, 30 insertions(+), 16 deletions(-)
README +0 -7
index 0acc0b410917..103562bbbe8d 100644
@@ -629,13 +629,6 @@ The following options need to be configured:
 		variable usbtty to be cdc_acm should suffice. The following
 		might be defined in YourBoardName.h
 
-			CONFIG_USB_DEVICE
-			Define this to build a UDC device
-
-			CONFIG_USB_TTY
-			Define this to have a tty type of device available to
-			talk to the UDC device
-
 			CONFIG_USBD_HS
 			Define this to enable the high speed support for usb
 			device and usbtty. If this feature is enabled, a routine
board/nokia/rx51/Kconfig +30 -0
index 7cf05077dad1..c884543a3d84 100644
@@ -1,5 +1,35 @@
 if TARGET_NOKIA_RX51
 
+config USB_DEVICE
+	def_bool y
+	help
+	  Legacy UDC device support
+
+config USB_TTY
+	def_bool y
+	help
+	  Legacy tty type of device available to talk to the UDC device
+
+config USBD_VENDORID
+	hex
+	default 0x0421
+
+config USBD_PRODUCTID_CDCACM
+	hex
+	default 0x01c8
+
+config USBD_PRODUCTID_GSERIAL
+	hex
+	default 0x01c8
+
+config USBD_MANUFACTURER
+	string
+	default "Nokia"
+
+config USBD_PRODUCT_NAME
+	string
+	default "N900 (U-Boot)"
+
 config NR_DRAM_BANKS
 	default 2
 
include/configs/nokia_rx51.h +0 -9
index 5701732b9aeb..04bff3ca4f67 100644
@@ -49,15 +49,6 @@
 
 #define CFG_SYS_BAUDRATE_TABLE { 4800, 9600, 19200, 38400, 57600, 115200 }
 
-/* USB device configuration */
-#define CONFIG_USB_DEVICE
-#define CONFIG_USB_TTY
-#define CONFIG_USBD_VENDORID		0x0421
-#define CONFIG_USBD_PRODUCTID_CDCACM	0x01c8
-#define CONFIG_USBD_PRODUCTID_GSERIAL	0x01c8
-#define CONFIG_USBD_MANUFACTURER	"Nokia"
-#define CONFIG_USBD_PRODUCT_NAME	"N900 (U-Boot)"
-
 #define GPIO_SLIDE			71
 
 /*
Signature · 1 line
2.25.1
author
#33 lore raw

PATCH 31/38 Convert CONFIG_USB_GADGET_AT91 to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_USB_GADGET_AT91

---
 configs/smartweb_defconfig | 1 +
 configs/taurus_defconfig   | 1 +
 drivers/usb/gadget/Kconfig | 4 ++++
 include/configs/smartweb.h | 4 ----
 include/configs/taurus.h   | 4 ----
 5 files changed, 6 insertions(+), 8 deletions(-)
configs/smartweb_defconfig +1 -0
index 601353c67a66..ed0ed2c7bb13 100644
@@ -97,6 +97,7 @@ CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0908
 CONFIG_USB_GADGET_PRODUCT_NUM=0x02d2
+CONFIG_USB_GADGET_AT91=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_WDT=y
 CONFIG_WDT_AT91=y
configs/taurus_defconfig +1 -0
index ef9e444a670b..9a1dac78f127 100644
@@ -115,6 +115,7 @@ CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0908
 CONFIG_USB_GADGET_PRODUCT_NUM=0x02d2
+CONFIG_USB_GADGET_AT91=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_WDT=y
 CONFIG_WDT_AT91=y
drivers/usb/gadget/Kconfig +4 -0
index e8da73c78869..e120efeb0073 100644
@@ -82,6 +82,10 @@ config USB_GADGET_BCM_UDC_OTG_PHY
 	help
 	  Enable the Broadcom UDC OTG physical device interface.
 
+config USB_GADGET_AT91
+	bool "Atmel AT91 USB Gadget Controller"
+	depends on ARCH_AT91
+
 config USB_GADGET_DWC2_OTG
 	bool "DesignWare USB2.0 HS OTG controller (gadget mode)"
 	select USB_GADGET_DUALSPEED
include/configs/smartweb.h +0 -4
index 794475942a23..b988b96e58d8 100644
@@ -64,10 +64,6 @@
 #define CONFIG_USART_BASE		ATMEL_BASE_DBGU
 #define CONFIG_USART_ID			ATMEL_ID_SYS
 
-/* USB DFU support */
-
-#define CONFIG_USB_GADGET_AT91
-
 /* DFU class support */
 #define DFU_MANIFEST_POLL_TIMEOUT	25000
 
include/configs/taurus.h +0 -4
index baaf94e2dd54..30f842558207 100644
@@ -62,10 +62,6 @@
 #endif
 
 #if defined(CONFIG_BOARD_TAURUS)
-/* USB DFU support */
-
-#define CONFIG_USB_GADGET_AT91
-
 /* DFU class support */
 #define DFU_MANIFEST_POLL_TIMEOUT	25000
 #endif
Signature · 1 line
2.25.1
author
#34 lore raw

PATCH 32/38 Convert CONFIG_VSC7385_ENET et al to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_VSC7385_ENET
CONFIG_VSC9953

---
 configs/MPC837XERDB_defconfig                | 1 +
 configs/P1020RDB-PC_36BIT_NAND_defconfig     | 1 +
 configs/P1020RDB-PC_36BIT_SDCARD_defconfig   | 1 +
 configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig | 1 +
 configs/P1020RDB-PC_36BIT_defconfig          | 1 +
 configs/P1020RDB-PC_NAND_defconfig           | 1 +
 configs/P1020RDB-PC_SDCARD_defconfig         | 1 +
 configs/P1020RDB-PC_SPIFLASH_defconfig       | 1 +
 configs/P1020RDB-PC_defconfig                | 1 +
 configs/P1020RDB-PD_NAND_defconfig           | 1 +
 configs/P1020RDB-PD_SDCARD_defconfig         | 1 +
 configs/P1020RDB-PD_SPIFLASH_defconfig       | 1 +
 configs/P1020RDB-PD_defconfig                | 1 +
 configs/P2020RDB-PC_36BIT_NAND_defconfig     | 1 +
 configs/P2020RDB-PC_36BIT_SDCARD_defconfig   | 1 +
 configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig | 1 +
 configs/P2020RDB-PC_36BIT_defconfig          | 1 +
 configs/P2020RDB-PC_NAND_defconfig           | 1 +
 configs/P2020RDB-PC_SDCARD_defconfig         | 1 +
 configs/P2020RDB-PC_SPIFLASH_defconfig       | 1 +
 configs/P2020RDB-PC_defconfig                | 1 +
 drivers/net/Kconfig                          | 6 ++++++
 include/configs/MPC837XERDB.h                | 5 -----
 include/configs/T104xRDB.h                   | 1 -
 include/configs/p1_p2_rdb_pc.h               | 3 ---
 25 files changed, 27 insertions(+), 9 deletions(-)
configs/MPC837XERDB_defconfig +1 -0
index b6263ec03ff6..6372a72bc3e3 100644
@@ -206,6 +206,7 @@ CONFIG_DM_MDIO=y
 CONFIG_DM_ETH_PHY=y
 CONFIG_RGMII=y
 CONFIG_MII=y
+CONFIG_VSC7385_ENET=y
 CONFIG_TSEC_ENET=y
 CONFIG_RTC_DS1374=y
 CONFIG_SYS_NS16550=y
configs/P1020RDB-PC_36BIT_NAND_defconfig +1 -0
index 46816999e7a6..b2bd220cf021 100644
@@ -139,6 +139,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_MII=y
+CONFIG_VSC7385_ENET=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
configs/P1020RDB-PC_36BIT_SDCARD_defconfig +1 -0
index 4ce423ea739c..e93f01f65068 100644
@@ -121,6 +121,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_MII=y
+CONFIG_VSC7385_ENET=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig +1 -0
index d7b2d3780907..59bacba39df2 100644
@@ -123,6 +123,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_MII=y
+CONFIG_VSC7385_ENET=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
configs/P1020RDB-PC_36BIT_defconfig +1 -0
index d67b31aafcda..17fc9dddad16 100644
@@ -101,6 +101,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_MII=y
+CONFIG_VSC7385_ENET=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
configs/P1020RDB-PC_NAND_defconfig +1 -0
index 6d1193e051d2..b0f770b11efd 100644
@@ -138,6 +138,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_MII=y
+CONFIG_VSC7385_ENET=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
configs/P1020RDB-PC_SDCARD_defconfig +1 -0
index 25c04754acba..2a8637f254f9 100644
@@ -120,6 +120,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_MII=y
+CONFIG_VSC7385_ENET=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
configs/P1020RDB-PC_SPIFLASH_defconfig +1 -0
index d865102dc6f2..b1c30754bb76 100644
@@ -122,6 +122,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_MII=y
+CONFIG_VSC7385_ENET=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
configs/P1020RDB-PC_defconfig +1 -0
index 28bc16c97e43..09493a84ac37 100644
@@ -100,6 +100,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_MII=y
+CONFIG_VSC7385_ENET=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
configs/P1020RDB-PD_NAND_defconfig +1 -0
index 20384bb054d6..ccb94cbc955a 100644
@@ -141,6 +141,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_MII=y
+CONFIG_VSC7385_ENET=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
configs/P1020RDB-PD_SDCARD_defconfig +1 -0
index bffecea2634e..3b813b22bd74 100644
@@ -123,6 +123,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_MII=y
+CONFIG_VSC7385_ENET=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
configs/P1020RDB-PD_SPIFLASH_defconfig +1 -0
index a87afd3bb08c..225eca2d9763 100644
@@ -125,6 +125,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_MII=y
+CONFIG_VSC7385_ENET=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
configs/P1020RDB-PD_defconfig +1 -0
index c0111b4acd05..b8d3b123928a 100644
@@ -103,6 +103,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_MII=y
+CONFIG_VSC7385_ENET=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
configs/P2020RDB-PC_36BIT_NAND_defconfig +1 -0
index 169e54cd1b7e..b935d18879c1 100644
@@ -144,6 +144,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_MII=y
+CONFIG_VSC7385_ENET=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
configs/P2020RDB-PC_36BIT_SDCARD_defconfig +1 -0
index ff3388b68bd2..247c96183e09 100644
@@ -126,6 +126,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_MII=y
+CONFIG_VSC7385_ENET=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig +1 -0
index 234bc80a3aff..733aa5ad5e9c 100644
@@ -128,6 +128,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_MII=y
+CONFIG_VSC7385_ENET=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
configs/P2020RDB-PC_36BIT_defconfig +1 -0
index 0691cbcc217b..69d25c5f78f5 100644
@@ -106,6 +106,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_MII=y
+CONFIG_VSC7385_ENET=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
configs/P2020RDB-PC_NAND_defconfig +1 -0
index bfaa79af6abd..4b19800d2097 100644
@@ -143,6 +143,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_MII=y
+CONFIG_VSC7385_ENET=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
configs/P2020RDB-PC_SDCARD_defconfig +1 -0
index 2d00717e538a..85b38a0897c6 100644
@@ -125,6 +125,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_MII=y
+CONFIG_VSC7385_ENET=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
configs/P2020RDB-PC_SPIFLASH_defconfig +1 -0
index 9edbb04b3802..fe763f5e60e9 100644
@@ -127,6 +127,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_MII=y
+CONFIG_VSC7385_ENET=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
configs/P2020RDB-PC_defconfig +1 -0
index 2c7dd633e556..788e8f8abc0d 100644
@@ -105,6 +105,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_MII=y
+CONFIG_VSC7385_ENET=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
drivers/net/Kconfig +6 -0
index 8df3dce6dff5..32404972bb37 100644
@@ -671,6 +671,12 @@ config XILINX_AXIMRMAC
 	  rates from 10GE to 100GE. This could be present in some of the Xilinx
 	  Versal designs.
 
+config VSC7385_ENET
+	bool "Vitesse 7385 Switch Firmware Upload driver"
+
+config VSC9953
+	bool "Vitesse VSC9953 L2 Switch driver"
+
 config XILINX_EMACLITE
 	select PHYLIB
 	select MII
include/configs/MPC837XERDB.h +0 -5
index de63a0f1993f..95a90199a429 100644
@@ -14,11 +14,6 @@
  * High Level Configuration Options
  */
 
-/*
- * On-board devices
- */
-#define CONFIG_VSC7385_ENET
-
 /* System performance - define the value i.e. CONFIG_SYS_XXX
 */
 
include/configs/T104xRDB.h +0 -1
index d3fd10526bd9..b6938056bbe1 100644
@@ -385,7 +385,6 @@
 
 /* Enable VSC9953 L2 Switch driver on T1040 SoC */
 #if defined(CONFIG_TARGET_T1040RDB) || defined(CONFIG_TARGET_T1040D4RDB)
-#define CONFIG_VSC9953
 #ifdef CONFIG_TARGET_T1040RDB
 #define CFG_SYS_FM1_QSGMII11_PHY_ADDR	0x04
 #define CFG_SYS_FM1_QSGMII21_PHY_ADDR	0x08
include/configs/p1_p2_rdb_pc.h +0 -3
index c8acce8b06b7..9738e9fa9cb7 100644
@@ -13,7 +13,6 @@
 #include <linux/stringify.h>
 
 #if defined(CONFIG_TARGET_P1020RDB_PC)
-#define CONFIG_VSC7385_ENET
 #define CONFIG_SLIC
 #define __SW_BOOT_MASK		0x03
 #define __SW_BOOT_NOR		0x5c
@@ -43,7 +42,6 @@
  * 011101 800 800 400 667 PCIe-2 Core0 boot; Core1 hold-off
  */
 #if defined(CONFIG_TARGET_P1020RDB_PD)
-#define CONFIG_VSC7385_ENET
 #define CONFIG_SLIC
 #define __SW_BOOT_MASK		0x03
 #define __SW_BOOT_NOR		0x64
@@ -63,7 +61,6 @@
 #endif
 
 #if defined(CONFIG_TARGET_P2020RDB)
-#define CONFIG_VSC7385_ENET
 #define __SW_BOOT_MASK		0x03
 #define __SW_BOOT_NOR		0xc8
 #define __SW_BOOT_SPI		0x28
Signature · 1 line
2.25.1
author
#35 lore raw

PATCH 33/38 net: ftmac100: Remove non-DM_ETH code

In reply to Tom Rini

At this point all users of this driver enable DM_ETH, so remove the legacy code paths.

---
 drivers/net/ftmac100.c | 91 +-----------------------------------------
 1 file changed, 2 insertions(+), 89 deletions(-)
drivers/net/ftmac100.c +2 -89
index c30ace96bb13..f710c271c64b 100644
@@ -17,10 +17,10 @@
 #include <linux/io.h>
 
 #include "ftmac100.h"
-#ifdef CONFIG_DM_ETH
 #include <dm.h>
+
 DECLARE_GLOBAL_DATA_PTR;
-#endif
+
 #define ETH_ZLEN	60
 
 struct ftmac100_data {
@@ -231,92 +231,6 @@ static int _ftmac100_send(struct ftmac100_data *priv, void *packet, int length)
 	return 0;
 }
 
-#ifndef CONFIG_DM_ETH
-/*
- * disable transmitter, receiver
- */
-static void ftmac100_halt(struct eth_device *dev)
-{
-	struct ftmac100_data *priv = dev->priv;
-	return _ftmac100_halt(priv);
-}
-
-static int ftmac100_init(struct eth_device *dev, struct bd_info *bd)
-{
-	struct ftmac100_data *priv = dev->priv;
-	return _ftmac100_init(priv , dev->enetaddr);
-}
-
-static int _ftmac100_recv(struct ftmac100_data *priv)
-{
-	struct ftmac100_rxdes *curr_des;
-	unsigned short len;
-	curr_des = &priv->rxdes[priv->rx_index];
-	len = __ftmac100_recv(priv);
-	if (len) {
-		/* pass the packet up to the protocol layers. */
-		net_process_received_packet((void *)curr_des->rxdes2, len);
-		_ftmac100_free_pkt(priv);
-	}
-	return len ? 1 : 0;
-}
-
-/*
- * Get a data block via Ethernet
- */
-static int ftmac100_recv(struct eth_device *dev)
-{
-	struct ftmac100_data *priv = dev->priv;
-	return _ftmac100_recv(priv);
-}
-
-/*
- * Send a data block via Ethernet
- */
-static int ftmac100_send(struct eth_device *dev, void *packet, int length)
-{
-	struct ftmac100_data *priv = dev->priv;
-	return _ftmac100_send(priv , packet , length);
-}
-
-int ftmac100_initialize (struct bd_info *bd)
-{
-	struct eth_device *dev;
-	struct ftmac100_data *priv;
-	dev = malloc (sizeof *dev);
-	if (!dev) {
-		printf ("%s(): failed to allocate dev\n", __func__);
-		goto out;
-	}
-	/* Transmit and receive descriptors should align to 16 bytes */
-	priv = memalign (16, sizeof (struct ftmac100_data));
-	if (!priv) {
-		printf ("%s(): failed to allocate priv\n", __func__);
-		goto free_dev;
-	}
-	memset (dev, 0, sizeof (*dev));
-	memset (priv, 0, sizeof (*priv));
-
-	strcpy(dev->name, "FTMAC100");
-	dev->iobase	= CONFIG_FTMAC100_BASE;
-	dev->init	= ftmac100_init;
-	dev->halt	= ftmac100_halt;
-	dev->send	= ftmac100_send;
-	dev->recv	= ftmac100_recv;
-	dev->priv	= priv;
-	priv->iobase	= dev->iobase;
-	eth_register (dev);
-
-	return 1;
-
-free_dev:
-	free (dev);
-out:
-	return 0;
-}
-#endif
-
-#ifdef CONFIG_DM_ETH
 static int ftmac100_start(struct udevice *dev)
 {
 	struct eth_pdata *plat = dev_get_plat(dev);
@@ -445,4 +359,3 @@ U_BOOT_DRIVER(ftmac100) = {
 	.plat_auto	= sizeof(struct eth_pdata),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 };
-#endif
Signature · 1 line
2.25.1
Reviewed-by on v1 33/38
#36 lore raw

Re: [PATCH 33/38] net: ftmac100: Remove non-DM_ETH code

Quoted 125 lines · Tom Rini

At this point all users of this driver enable DM_ETH, so remove the legacy code paths.

---
 drivers/net/ftmac100.c | 91 +-----------------------------------------
 1 file changed, 2 insertions(+), 89 deletions(-)
drivers/net/ftmac100.c +2 -90
index c30ace96bb13..f710c271c64b 100644
@@ -17,10 +17,10 @@
 #include <linux/io.h>
 
 #include "ftmac100.h"
-#ifdef CONFIG_DM_ETH
 #include <dm.h>
+
 DECLARE_GLOBAL_DATA_PTR;
-#endif
+
 #define ETH_ZLEN       60
 
 struct ftmac100_data {
@@ -231,92 +231,6 @@ static int _ftmac100_send(struct ftmac100_data *priv, void *packet, int length)
        return 0;
 }
 
-#ifndef CONFIG_DM_ETH
-/*
- * disable transmitter, receiver
- */
-static void ftmac100_halt(struct eth_device *dev)
-{
-       struct ftmac100_data *priv = dev->priv;
-       return _ftmac100_halt(priv);
-}
-
-static int ftmac100_init(struct eth_device *dev, struct bd_info *bd)
-{
-       struct ftmac100_data *priv = dev->priv;
-       return _ftmac100_init(priv , dev->enetaddr);
-}
-
-static int _ftmac100_recv(struct ftmac100_data *priv)
-{
-       struct ftmac100_rxdes *curr_des;
-       unsigned short len;
-       curr_des = &priv->rxdes[priv->rx_index];
-       len = __ftmac100_recv(priv);
-       if (len) {
-               /* pass the packet up to the protocol layers. */
-               net_process_received_packet((void *)curr_des->rxdes2, len);
-               _ftmac100_free_pkt(priv);
-       }
-       return len ? 1 : 0;
-}
-
-/*
- * Get a data block via Ethernet
- */
-static int ftmac100_recv(struct eth_device *dev)
-{
-       struct ftmac100_data *priv = dev->priv;
-       return _ftmac100_recv(priv);
-}
-
-/*
- * Send a data block via Ethernet
- */
-static int ftmac100_send(struct eth_device *dev, void *packet, int length)
-{
-       struct ftmac100_data *priv = dev->priv;
-       return _ftmac100_send(priv , packet , length);
-}
-
-int ftmac100_initialize (struct bd_info *bd)
-{
-       struct eth_device *dev;
-       struct ftmac100_data *priv;
-       dev = malloc (sizeof *dev);
-       if (!dev) {
-               printf ("%s(): failed to allocate dev\n", __func__);
-               goto out;
-       }
-       /* Transmit and receive descriptors should align to 16 bytes */
-       priv = memalign (16, sizeof (struct ftmac100_data));
-       if (!priv) {
-               printf ("%s(): failed to allocate priv\n", __func__);
-               goto free_dev;
-       }
-       memset (dev, 0, sizeof (*dev));
-       memset (priv, 0, sizeof (*priv));
-
-       strcpy(dev->name, "FTMAC100");
-       dev->iobase     = CONFIG_FTMAC100_BASE;
-       dev->init       = ftmac100_init;
-       dev->halt       = ftmac100_halt;
-       dev->send       = ftmac100_send;
-       dev->recv       = ftmac100_recv;
-       dev->priv       = priv;
-       priv->iobase    = dev->iobase;
-       eth_register (dev);
-
-       return 1;
-
-free_dev:
-       free (dev);
-out:
-       return 0;
-}
-#endif
-
-#ifdef CONFIG_DM_ETH
 static int ftmac100_start(struct udevice *dev)
 {
        struct eth_pdata *plat = dev_get_plat(dev);
@@ -445,4 +359,3 @@ U_BOOT_DRIVER(ftmac100) = {
        .plat_auto      = sizeof(struct eth_pdata),
        .flags  = DM_FLAG_ALLOC_PRIV_DMA,
 };
-#endif
--
Quoted 2 lines

2.25.1

author
#37 lore raw

PATCH 34/38 configs: Resync with savedefconfig

In reply to Tom Rini

Rsync all defconfig files using moveconfig.py

---
 scripts/config_whitelist.txt | 65 ------------------------------------
 1 file changed, 65 deletions(-)
scripts/config_whitelist.txt +0 -65
index 8832597d33a2..8b5b1e6f4553 100644
@@ -37,21 +37,16 @@ CONFIG_FLASH_SHOW_PROGRESS
 CONFIG_FLASH_SPANSION_S29WS_N
 CONFIG_FLASH_VERIFY
 CONFIG_FM_PLAT_CLK_DIV
-CONFIG_FSL_CADMUS
 CONFIG_FSL_CPLD
-CONFIG_FSL_DEVICE_DISABLE
 CONFIG_FSL_ESDHC_PIN_MUX
 CONFIG_FSL_FM_10GEC_REGULAR_NOTATION
-CONFIG_FSL_IIM
 CONFIG_FSL_ISBC_KEY_EXT
-CONFIG_FSL_LBC
 CONFIG_FSL_PMIC_BITLEN
 CONFIG_FSL_PMIC_BUS
 CONFIG_FSL_PMIC_CLK
 CONFIG_FSL_PMIC_CS
 CONFIG_FSL_PMIC_MODE
 CONFIG_FSL_SDHC_V2_3
-CONFIG_FSL_SERDES
 CONFIG_FSL_SERDES1
 CONFIG_FSL_SERDES2
 CONFIG_FTMAC100_BASE
@@ -64,10 +59,8 @@ CONFIG_G_DNL_THOR_VENDOR_NUM
 CONFIG_G_DNL_UMS_PRODUCT_NUM
 CONFIG_G_DNL_UMS_VENDOR_NUM
 CONFIG_HDMI_ENCODER_I2C_ADDR
-CONFIG_HIKEY_GPIO
 CONFIG_HOSTNAME
 CONFIG_HSMMC2_8BIT
-CONFIG_HWCONFIG
 CONFIG_HW_ENV_SETTINGS
 CONFIG_I2C_ENV_EEPROM_BUS
 CONFIG_I2C_MULTI_BUS
@@ -77,15 +70,7 @@ CONFIG_I2C_MVTWSI_BASE0
 CONFIG_I2C_MVTWSI_BASE1
 CONFIG_I2C_RTC_ADDR
 CONFIG_ICS307_REFCLK_HZ
-CONFIG_IMX
 CONFIG_IMX6_PWM_PER_CLK
-CONFIG_IMX_HDMI
-CONFIG_IMX_VIDEO_SKIP
-CONFIG_INTERRUPTS
-CONFIG_IODELAY_RECALIBRATION
-CONFIG_IOMUX_LPSR
-CONFIG_IOMUX_SHARE_CONF_REG
-CONFIG_IO_TRACE
 CONFIG_IPADDR
 CONFIG_IRAM_BASE
 CONFIG_IRAM_END
@@ -122,7 +107,6 @@ CONFIG_L2_CACHE
 CONFIG_LEGACY_BOOTCMD_ENV
 CONFIG_LOWPOWER_ADDR
 CONFIG_LOWPOWER_FLAG
-CONFIG_LPC32XX_HSUART
 CONFIG_LPC32XX_NAND_MLC_BUSY_DELAY
 CONFIG_LPC32XX_NAND_MLC_NAND_TA
 CONFIG_LPC32XX_NAND_MLC_RD_HIGH
@@ -138,7 +122,6 @@ CONFIG_LPC32XX_NAND_SLC_WDR_CLKS
 CONFIG_LPC32XX_NAND_SLC_WHOLD
 CONFIG_LPC32XX_NAND_SLC_WSETUP
 CONFIG_LPC32XX_NAND_SLC_WWIDTH
-CONFIG_LS102XA_STREAM_ID
 CONFIG_MACB_SEARCH_PHY
 CONFIG_MALLOC_F_ADDR
 CONFIG_MALTA
@@ -149,7 +132,6 @@ CONFIG_MEMSIZE_IN_BYTES
 CONFIG_MEM_INIT_VALUE
 CONFIG_MFG_ENV_SETTINGS
 CONFIG_MII_DEFAULT_TSEC
-CONFIG_MISC_COMMON
 CONFIG_MIU_2BIT_21_7_INTERLEAVED
 CONFIG_MIU_2BIT_INTERLEAVED
 CONFIG_MMC_DEFAULT_DEV
@@ -161,8 +143,6 @@ CONFIG_MTD_NAND_VERIFY_WRITE
 CONFIG_MTD_PARTITION
 CONFIG_MVGBE_PORTS
 CONFIG_MVS
-CONFIG_MX27
-CONFIG_MX27_CLK32
 CONFIG_MXC_GPT_HCLK
 CONFIG_MXC_NAND_HWECC
 CONFIG_MXC_NAND_IP_REGS_BASE
@@ -172,12 +152,8 @@ CONFIG_MXC_USB_FLAGS
 CONFIG_MXC_USB_PORT
 CONFIG_MXC_USB_PORTSC
 CONFIG_MXS
-CONFIG_MXS_OCOTP
 CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
 CONFIG_NAND_CS_INIT
-CONFIG_NAND_ECC_BCH
-CONFIG_NAND_KIRKWOOD
-CONFIG_NAND_KMETER1
 CONFIG_NAND_OMAP_GPMC_WSCFG
 CONFIG_NAND_SECBOOT
 CONFIG_NAND_SPL
@@ -189,7 +165,6 @@ CONFIG_NUM_DSP_CPUS
 CONFIG_ODROID_REV_AIN
 CONFIG_OTHBOOTARGS
 CONFIG_OVERWRITE_ETHADDR_ONCE
-CONFIG_PCA953X
 CONFIG_PCIE_IMX_PERST_GPIO
 CONFIG_PCIE_IMX_POWER_GPIO
 CONFIG_PEN_ADDR_BIG_ENDIAN
@@ -206,20 +181,9 @@ CONFIG_POST
 CONFIG_POSTBOOTMENU
 CONFIG_POST_EXTERNAL_WORD_FUNCS
 CONFIG_POST_SKIP_ENV_FLAGS
-CONFIG_POWER_FSL
-CONFIG_POWER_FSL_MC13892
-CONFIG_POWER_HI6553
-CONFIG_POWER_LTC3676
 CONFIG_POWER_LTC3676_I2C_ADDR
-CONFIG_POWER_PFUZE100
 CONFIG_POWER_PFUZE100_I2C_ADDR
-CONFIG_POWER_PFUZE3000
 CONFIG_POWER_PFUZE3000_I2C_ADDR
-CONFIG_POWER_SPI
-CONFIG_POWER_TPS62362
-CONFIG_POWER_TPS65090_EC
-CONFIG_POWER_TPS65218
-CONFIG_POWER_TPS65910
 CONFIG_PPC_SPINTABLE_COMPATIBLE
 CONFIG_PRAM
 CONFIG_PSRAM_SCFG
@@ -231,14 +195,6 @@ CONFIG_RD_LVL
 CONFIG_RESET_VECTOR_ADDRESS
 CONFIG_ROCKCHIP_SDHCI_MAX_FREQ
 CONFIG_ROOTPATH
-CONFIG_RTC_DS1337
-CONFIG_RTC_DS1337_NOOSC
-CONFIG_RTC_DS1338
-CONFIG_RTC_DS1374
-CONFIG_RTC_DS3231
-CONFIG_RTC_MC13XXX
-CONFIG_RTC_MXS
-CONFIG_RTC_PT7C4338
 CONFIG_SANDBOX_ARCH
 CONFIG_SANDBOX_SDL
 CONFIG_SANDBOX_SPI_MAX_BUS
@@ -260,16 +216,12 @@ CONFIG_SH_ETHER_PHY_ADDR
 CONFIG_SH_ETHER_PHY_MODE
 CONFIG_SH_ETHER_SH7734_MII
 CONFIG_SH_ETHER_USE_PORT
-CONFIG_SH_GPIO_PFC
 CONFIG_SH_QSPI_BASE
 CONFIG_SLIC
 CONFIG_SMDK5420
 CONFIG_SMP_PEN_ADDR
-CONFIG_SMSC_LPC47M
-CONFIG_SMSC_SIO1007
 CONFIG_SOCRATES
 CONFIG_SOFT_I2C_READ_REPEATED_START
-CONFIG_SPD_EEPROM
 CONFIG_SPI_ADDR
 CONFIG_SPI_BOOTING
 CONFIG_SPI_FLASH_QUAD
@@ -279,13 +231,9 @@ CONFIG_SPI_N25Q256A_RESET
 CONFIG_STACKBASE
 CONFIG_STANDALONE_LOAD_ADDR
 CONFIG_STD_DEVICES_SETTINGS
-CONFIG_TCA642X
 CONFIG_TEGRA_BOARD_STRING
-CONFIG_TEGRA_CLOCK_SCALING
 CONFIG_TEGRA_ENABLE_UARTA
 CONFIG_TEGRA_ENABLE_UARTD
-CONFIG_TEGRA_LP0
-CONFIG_TEGRA_PMU
 CONFIG_TEGRA_SLINK_CTRLS
 CONFIG_TEGRA_SPI
 CONFIG_TEGRA_UARTA_GPU
@@ -295,9 +243,7 @@ CONFIG_TEGRA_VDD_CORE_TPS62366A_SET1
 CONFIG_TESTPIN_MASK
 CONFIG_TESTPIN_REG
 CONFIG_THOR_RESET_OFF
-CONFIG_TMU_TIMER
 CONFIG_TPM_TIS_BASE_ADDRESS
-CONFIG_TPS6586X_POWER
 CONFIG_TSEC
 CONFIG_TSEC1
 CONFIG_TSEC1_NAME
@@ -310,7 +256,6 @@ CONFIG_TSEC4_NAME
 CONFIG_TSECV2
 CONFIG_TSECV2_1
 CONFIG_TSEC_TBICR_SETTINGS
-CONFIG_TWL6030_POWER
 CONFIG_UBIFS_VOLUME
 CONFIG_UBI_PART
 CONFIG_UBOOTPATH
@@ -321,25 +266,15 @@ CONFIG_UEC_ETH2
 CONFIG_USART_BASE
 CONFIG_USART_ID
 CONFIG_USBD_HS
-CONFIG_USBD_MANUFACTURER
-CONFIG_USBD_PRODUCTID_CDCACM
-CONFIG_USBD_PRODUCTID_GSERIAL
-CONFIG_USBD_PRODUCT_NAME
-CONFIG_USBD_VENDORID
 CONFIG_USB_BOOTING
-CONFIG_USB_DEVICE
 CONFIG_USB_EXT2_BOOT
 CONFIG_USB_FAT_BOOT
-CONFIG_USB_GADGET_AT91
 CONFIG_USB_ISP1301_I2C_ADDR
-CONFIG_USB_TTY
 CONFIG_U_BOOT_HDR_SIZE
 CONFIG_VAR_SIZE_SPL
 CONFIG_VERY_BIG_RAM
-CONFIG_VSC7385_ENET
 CONFIG_VSC7385_IMAGE
 CONFIG_VSC7385_IMAGE_SIZE
-CONFIG_VSC9953
 CONFIG_WATCHDOG_PRESC
 CONFIG_WATCHDOG_RC
 CONFIG_WATCHDOG_TIMEOUT
Signature · 1 line
2.25.1
author
#38 lore raw

PATCH 35/38 scripts/config_whitelist.txt: Remove more referenced symbols

In reply to Tom Rini

Perform some deeper investigation on the remaining symbols listed in this file and remove more.

---
 include/configs/P1010RDB.h   |  2 --
 scripts/config_whitelist.txt | 22 ----------------------
 2 files changed, 24 deletions(-)
include/configs/P1010RDB.h +0 -2
index c0805f979be7..b1d6b15811dd 100644
@@ -173,8 +173,6 @@ extern unsigned long get_sdram_size(void);
 #define CFG_SYS_NAND_BASE_PHYS	CFG_SYS_NAND_BASE
 #endif
 
-#define CONFIG_MTD_PARTITION
-
 #define CFG_SYS_NAND_CSPR	(CSPR_PHYS_ADDR(CFG_SYS_NAND_BASE_PHYS) \
 				| CSPR_PORT_SIZE_8	\
 				| CSPR_MSEL_NAND	\
scripts/config_whitelist.txt +0 -22
index 8b5b1e6f4553..39e1071236bd 100644
@@ -1,5 +1,4 @@
 CONFIG_ARM_GIC_BASE_ADDRESS
-CONFIG_AUTO_ZRELADDR
 CONFIG_BOARDDIR
 CONFIG_DFU_ALT
 CONFIG_DFU_ALT_BOOT_EMMC
@@ -8,7 +7,6 @@ CONFIG_DFU_ALT_SYSTEM
 CONFIG_DFU_ENV_SETTINGS
 CONFIG_DM9000_BASE
 CONFIG_DM9000_BYTE_SWAPPED
-CONFIG_DM9000_DEBUG
 CONFIG_DM9000_NO_SROM
 CONFIG_DM9000_USE_16BIT
 CONFIG_DW_WDT_CLOCK_KHZ
@@ -49,9 +47,6 @@ CONFIG_FSL_PMIC_MODE
 CONFIG_FSL_SDHC_V2_3
 CONFIG_FSL_SERDES1
 CONFIG_FSL_SERDES2
-CONFIG_FTMAC100_BASE
-CONFIG_FTRTC010_EXTCLK
-CONFIG_FTRTC010_PCLK
 CONFIG_GATEWAYIP
 CONFIG_GMII
 CONFIG_G_DNL_THOR_PRODUCT_NUM
@@ -65,7 +60,6 @@ CONFIG_HW_ENV_SETTINGS
 CONFIG_I2C_ENV_EEPROM_BUS
 CONFIG_I2C_MULTI_BUS
 CONFIG_I2C_MVTWSI
-CONFIG_I2C_MVTWSI_BASE
 CONFIG_I2C_MVTWSI_BASE0
 CONFIG_I2C_MVTWSI_BASE1
 CONFIG_I2C_RTC_ADDR
@@ -137,12 +131,8 @@ CONFIG_MIU_2BIT_INTERLEAVED
 CONFIG_MMC_DEFAULT_DEV
 CONFIG_MMC_SUNXI_SLOT
 CONFIG_MONITOR_IS_IN_RAM
-CONFIG_MPC85XX_FEC
-CONFIG_MPC85XX_FEC_NAME
 CONFIG_MTD_NAND_VERIFY_WRITE
-CONFIG_MTD_PARTITION
 CONFIG_MVGBE_PORTS
-CONFIG_MVS
 CONFIG_MXC_GPT_HCLK
 CONFIG_MXC_NAND_HWECC
 CONFIG_MXC_NAND_IP_REGS_BASE
@@ -151,15 +141,10 @@ CONFIG_MXC_UART_BASE
 CONFIG_MXC_USB_FLAGS
 CONFIG_MXC_USB_PORT
 CONFIG_MXC_USB_PORTSC
-CONFIG_MXS
 CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
 CONFIG_NAND_CS_INIT
-CONFIG_NAND_OMAP_GPMC_WSCFG
-CONFIG_NAND_SECBOOT
-CONFIG_NAND_SPL
 CONFIG_NETDEV
 CONFIG_NETMASK
-CONFIG_NEVER_ASSERT_ODT_TO_CPU
 CONFIG_NORBOOT
 CONFIG_NUM_DSP_CPUS
 CONFIG_ODROID_REV_AIN
@@ -175,12 +160,10 @@ CONFIG_PHY_INTERFACE_MODE
 CONFIG_PHY_IRAM_BASE
 CONFIG_PL011_CLOCK
 CONFIG_PL01x_PORTS
-CONFIG_PM
 CONFIG_PME_PLAT_CLK_DIV
 CONFIG_POST
 CONFIG_POSTBOOTMENU
 CONFIG_POST_EXTERNAL_WORD_FUNCS
-CONFIG_POST_SKIP_ENV_FLAGS
 CONFIG_POWER_LTC3676_I2C_ADDR
 CONFIG_POWER_PFUZE100_I2C_ADDR
 CONFIG_POWER_PFUZE3000_I2C_ADDR
@@ -205,7 +188,6 @@ CONFIG_SCIF_A
 CONFIG_SCSI_DEV_LIST
 CONFIG_SC_TIMER_CLK
 CONFIG_SERIAL_BOOT
-CONFIG_SERIAL_SOFTWARE_FIFO
 CONFIG_SERVERIP
 CONFIG_SETUP_INITRD_TAG
 CONFIG_SET_DFU_ALT_BUF_LEN
@@ -214,14 +196,12 @@ CONFIG_SH_ETHER_CACHE_INVALIDATE
 CONFIG_SH_ETHER_CACHE_WRITEBACK
 CONFIG_SH_ETHER_PHY_ADDR
 CONFIG_SH_ETHER_PHY_MODE
-CONFIG_SH_ETHER_SH7734_MII
 CONFIG_SH_ETHER_USE_PORT
 CONFIG_SH_QSPI_BASE
 CONFIG_SLIC
 CONFIG_SMDK5420
 CONFIG_SMP_PEN_ADDR
 CONFIG_SOCRATES
-CONFIG_SOFT_I2C_READ_REPEATED_START
 CONFIG_SPI_ADDR
 CONFIG_SPI_BOOTING
 CONFIG_SPI_FLASH_QUAD
@@ -244,7 +224,6 @@ CONFIG_TESTPIN_MASK
 CONFIG_TESTPIN_REG
 CONFIG_THOR_RESET_OFF
 CONFIG_TPM_TIS_BASE_ADDRESS
-CONFIG_TSEC
 CONFIG_TSEC1
 CONFIG_TSEC1_NAME
 CONFIG_TSEC2
@@ -262,7 +241,6 @@ CONFIG_UBOOTPATH
 CONFIG_UBOOT_SECTOR_COUNT
 CONFIG_UBOOT_SECTOR_START
 CONFIG_UEC_ETH
-CONFIG_UEC_ETH2
 CONFIG_USART_BASE
 CONFIG_USART_ID
 CONFIG_USBD_HS
Signature · 1 line
2.25.1
Reviewed-by on v1 35/38
#39 lore raw

Re: [PATCH 35/38] scripts/config_whitelist.txt: Remove more referenced symbols

Quoted 9 lines · Tom Rini

Perform some deeper investigation on the remaining symbols listed in this file and remove more.

---
 include/configs/P1010RDB.h   |  2 --
 scripts/config_whitelist.txt | 22 ----------------------
 2 files changed, 24 deletions(-)
author
#40 lore raw

PATCH 36/38 sandbox: Rework how SDL is enabled / disabled

In reply to Tom Rini

Given that we can use Kconfig logic directly to see if we have a program available on the host or not, change from passing NO_SDL to instead controlling CONFIG_SANDBOX_SDL in Kconfig directly. Introduce CONFIG_HOST_HAS_SDL as the way to test for sdl2-config and default CONFIG_SANDBOX_SDL on if we have that, or not.

---
 .azure-pipelines.yml         | 4 ++--
 arch/sandbox/Kconfig         | 7 +++++++
 arch/sandbox/config.mk       | 4 +---
 doc/arch/sandbox/sandbox.rst | 9 +++------
 doc/build/tools.rst          | 2 +-
 drivers/video/Kconfig        | 2 +-
 include/configs/sandbox.h    | 4 ----
 7 files changed, 15 insertions(+), 17 deletions(-)
.azure-pipelines.yml +2 -2
index bda762451fd0..a767fb1008c2 100644
@@ -30,7 +30,7 @@ stages:
           %CD:~0,2%\msys64\usr\bin\bash -lc "pacman --noconfirm --needed -Sy make gcc bison flex diffutils openssl-devel libgnutls-devel libutil-linux-devel"
         displayName: 'Install Toolchain'
       - script: |
-          echo make tools-only_defconfig tools-only NO_SDL=1 > build-tools.sh
+          echo make tools-only_defconfig tools-only > build-tools.sh
           %CD:~0,2%\msys64\usr\bin\bash -lc "bash build-tools.sh"
         displayName: 'Build Host Tools'
         env:
@@ -47,7 +47,7 @@ stages:
       - script: brew install make ossp-uuid
         displayName: Brew install dependencies
       - script: |
-          gmake tools-only_config tools-only NO_SDL=1 \
+          gmake tools-only_config tools-only \
             HOSTCFLAGS="-I/usr/local/opt/[email protected]/include" \
             HOSTLDFLAGS="-L/usr/local/opt/[email protected]/lib" \
             -j$(sysctl -n hw.logicalcpu)
arch/sandbox/Kconfig +7 -0
index 96b3402b47c1..0ce77de2fcb4 100644
@@ -47,6 +47,13 @@ config HOST_32BIT
 config HOST_64BIT
 	def_bool $(cc-define,_LP64)
 
+config HOST_HAS_SDL
+	def_bool $(success,sdl2-config --version)
+
+config SANDBOX_SDL
+	bool "Enable SDL2 support in sandbox"
+	default HOST_HAS_SDL
+
 config SANDBOX_CRASH_RESET
 	bool "Reset on crash"
 	help
arch/sandbox/config.mk +1 -3
index 3e2c7f9ebe55..1284ef390b51 100644
@@ -8,9 +8,7 @@ SDL_CONFIG ?= sdl2-config
 
 # Define this to avoid linking with SDL, which requires SDL libraries
 # This can solve 'sdl-config: Command not found' errors
-ifneq ($(NO_SDL),)
-PLATFORM_CPPFLAGS += -DSANDBOX_NO_SDL
-else
+ifeq ($(CONFIG_SANDBOX_SDL),y)
 PLATFORM_LIBS += $(shell $(SDL_CONFIG) --libs)
 PLATFORM_CPPFLAGS += $(shell $(SDL_CONFIG) --cflags)
 endif
doc/arch/sandbox/sandbox.rst +3 -6
index 34c4e06d9b8d..e6d840365166 100644
@@ -56,11 +56,8 @@ To run sandbox U-Boot use something like::
 
 Note: If you get errors about 'sdl-config: Command not found' you may need to
 install libsdl2.0-dev or similar to get SDL support. Alternatively you can
-build sandbox without SDL (i.e. no display/keyboard support) by removing
-the CONFIG_SANDBOX_SDL line in include/configs/sandbox.h or using::
-
-   make sandbox_defconfig all NO_SDL=1
-   ./u-boot
+build sandbox without SDL (i.e. no display/keyboard support) by disabling
+CONFIG_SANDBOX_SDL in the .config file.
 
 U-Boot will start on your computer, showing a sandbox emulation of the serial
 console::
@@ -84,7 +81,7 @@ To exit, type 'poweroff' or press Ctrl-C.
 Console / LCD support
 ---------------------
 
-Assuming that CONFIG_SANDBOX_SDL is defined when building, you can run the
+Assuming that CONFIG_SANDBOX_SDL is enabled when building, you can run the
 sandbox with LCD and keyboard emulation, using something like::
 
    ./u-boot -d u-boot.dtb -l
doc/build/tools.rst +1 -1
index c06f91527417..ec0172292585 100644
@@ -44,4 +44,4 @@ applications using a linux toolchain (gcc, bash, etc), targeting respectively
 Launch the MSYS2 shell of the MSYS2 environment, and do the following::
 
    $ make tools-only_defconfig
-   $ make tools-only NO_SDL=1
+   $ make tools-only
drivers/video/Kconfig +1 -1
index c841b99bb30d..f539977d9b73 100644
@@ -622,7 +622,7 @@ config VIDEO_ARM_MALIDP
 
 config VIDEO_SANDBOX_SDL
 	bool "Enable sandbox video console using SDL"
-	depends on SANDBOX
+	depends on SANDBOX_SDL
 	help
 	  When using sandbox you can enable an emulated LCD display which
 	  appears as an SDL (Simple DirectMedia Layer) window. This is a
include/configs/sandbox.h +0 -4
index 3a5af4b3b609..c9e57da0160a 100644
@@ -31,8 +31,4 @@
 #define CFG_SYS_BAUDRATE_TABLE	{4800, 9600, 19200, 38400, 57600,\
 					115200}
 
-#ifndef SANDBOX_NO_SDL
-#define CONFIG_SANDBOX_SDL
-#endif
-
 #endif
Signature · 1 line
2.25.1
Reviewed-by on v1 36/38
#41 lore raw

Re: [PATCH 36/38] sandbox: Rework how SDL is enabled / disabled

Quoted 9 lines · Tom Rini

Given that we can use Kconfig logic directly to see if we have a program available on the host or not, change from passing NO_SDL to instead controlling CONFIG_SANDBOX_SDL in Kconfig directly. Introduce CONFIG_HOST_HAS_SDL as the way to test for sdl2-config and default CONFIG_SANDBOX_SDL on if we have that, or not.

Quoted 9 lines
---
 .azure-pipelines.yml         | 4 ++--
 arch/sandbox/Kconfig         | 7 +++++++
 arch/sandbox/config.mk       | 4 +---
 doc/arch/sandbox/sandbox.rst | 9 +++------
 doc/build/tools.rst          | 2 +-
 drivers/video/Kconfig        | 2 +-
 include/configs/sandbox.h    | 4 ----
 7 files changed, 15 insertions(+), 17 deletions(-)
author
#42 lore raw

PATCH 37/38 post: Migrate to Kconfig

In reply to Tom Rini

We move the existing CONFIG_POST_* functionality over to CFG_POST and then introduce CONFIG_POST to Kconfig.

---
 arch/powerpc/cpu/mpc85xx/cpu.c                |  2 +-
 configs/P2041RDB_NAND_defconfig               |  1 +
 configs/P2041RDB_SDCARD_defconfig             |  1 +
 configs/P2041RDB_SPIFLASH_defconfig           |  1 +
 configs/P2041RDB_defconfig                    |  1 +
 configs/kmcent2_defconfig                     |  1 +
 configs/kmcoge5ne_defconfig                   |  1 +
 configs/pg_wcom_expu1_defconfig               |  1 +
 configs/pg_wcom_expu1_update_defconfig        |  1 +
 configs/pg_wcom_seli8_defconfig               |  1 +
 configs/pg_wcom_seli8_update_defconfig        |  1 +
 doc/README.POST                               |  6 +-
 doc/README.fsl-ddr                            |  2 +-
 drivers/serial/serial-uclass.c                |  2 +-
 drivers/serial/serial.c                       |  2 +-
 include/configs/P2041RDB.h                    |  2 +-
 include/configs/km/pg-wcom-ls102xa.h          |  4 +-
 include/configs/kmcent2.h                     |  2 +-
 include/configs/kmcoge5ne.h                   |  4 +-
 include/post.h                                |  4 +-
 include/serial.h                              |  4 +-
 post/cpu/mpc83xx/ecc.c                        |  2 +-
 post/drivers/flash.c                          |  2 +-
 post/drivers/i2c.c                            |  4 +-
 post/drivers/memory.c                         |  4 +-
 post/drivers/rtc.c                            |  4 +-
 post/lib_powerpc/andi.c                       |  2 +-
 post/lib_powerpc/asm.S                        |  2 +-
 post/lib_powerpc/b.c                          |  2 +-
 post/lib_powerpc/cmp.c                        |  2 +-
 post/lib_powerpc/cmpi.c                       |  2 +-
 post/lib_powerpc/complex.c                    |  2 +-
 post/lib_powerpc/cpu.c                        |  4 +-
 post/lib_powerpc/cr.c                         |  2 +-
 post/lib_powerpc/fpu/20001122-1.c             |  4 +-
 post/lib_powerpc/fpu/20010114-2.c             |  4 +-
 post/lib_powerpc/fpu/20010226-1.c             |  4 +-
 post/lib_powerpc/fpu/980619-1.c               |  4 +-
 post/lib_powerpc/fpu/acc1.c                   |  4 +-
 post/lib_powerpc/fpu/compare-fp-1.c           |  4 +-
 post/lib_powerpc/fpu/fpu.c                    |  4 +-
 post/lib_powerpc/fpu/mul-subnormal-single-1.c |  4 +-
 post/lib_powerpc/load.c                       |  2 +-
 post/lib_powerpc/multi.c                      |  2 +-
 post/lib_powerpc/rlwimi.c                     |  2 +-
 post/lib_powerpc/rlwinm.c                     |  2 +-
 post/lib_powerpc/rlwnm.c                      |  2 +-
 post/lib_powerpc/srawi.c                      |  2 +-
 post/lib_powerpc/store.c                      |  2 +-
 post/lib_powerpc/string.c                     |  2 +-
 post/lib_powerpc/three.c                      |  2 +-
 post/lib_powerpc/threei.c                     |  2 +-
 post/lib_powerpc/threex.c                     |  2 +-
 post/lib_powerpc/two.c                        |  2 +-
 post/lib_powerpc/twox.c                       |  2 +-
 post/post.c                                   |  4 +-
 post/tests.c                                  | 68 +++++++++----------
 test/Kconfig                                  |  5 ++
 58 files changed, 114 insertions(+), 99 deletions(-)
arch/powerpc/cpu/mpc85xx/cpu.c +1 -1
index 74ad7483dc10..be85c54e4801 100644
@@ -486,7 +486,7 @@ int dram_init(void)
 #endif /* CONFIG_SYS_RAMBOOT */
 #endif
 
-#if CONFIG_POST & CFG_SYS_POST_MEMORY
+#if CFG_POST & CFG_SYS_POST_MEMORY
 
 /* Board-specific functions defined in each board's ddr.c */
 void fsl_ddr_get_spd(generic_spd_eeprom_t *ctrl_dimms_spd,
configs/P2041RDB_NAND_defconfig +1 -0
index aa80f79fd7f7..38ab9af13b34 100644
@@ -112,3 +112,4 @@ CONFIG_USB_MAX_CONTROLLER_COUNT=2
 CONFIG_USB_STORAGE=y
 CONFIG_ADDR_MAP=y
 CONFIG_SYS_NUM_ADDR_MAP=64
+CONFIG_POST=y
configs/P2041RDB_SDCARD_defconfig +1 -0
index bd223c18988d..39f5f8ce6910 100644
@@ -107,3 +107,4 @@ CONFIG_USB_MAX_CONTROLLER_COUNT=2
 CONFIG_USB_STORAGE=y
 CONFIG_ADDR_MAP=y
 CONFIG_SYS_NUM_ADDR_MAP=64
+CONFIG_POST=y
configs/P2041RDB_SPIFLASH_defconfig +1 -0
index dbd5845789cc..b06e6142c4ee 100644
@@ -109,3 +109,4 @@ CONFIG_USB_MAX_CONTROLLER_COUNT=2
 CONFIG_USB_STORAGE=y
 CONFIG_ADDR_MAP=y
 CONFIG_SYS_NUM_ADDR_MAP=64
+CONFIG_POST=y
configs/P2041RDB_defconfig +1 -0
index c17318c7cc15..0eb837321aeb 100644
@@ -104,3 +104,4 @@ CONFIG_USB_MAX_CONTROLLER_COUNT=2
 CONFIG_USB_STORAGE=y
 CONFIG_ADDR_MAP=y
 CONFIG_SYS_NUM_ADDR_MAP=64
+CONFIG_POST=y
configs/kmcent2_defconfig +1 -0
index 48ac85b699be..41b26287d567 100644
@@ -110,3 +110,4 @@ CONFIG_FS_CRAMFS=y
 CONFIG_BCH=y
 CONFIG_PANIC_HANG=y
 CONFIG_LZO=y
+CONFIG_POST=y
configs/kmcoge5ne_defconfig +1 -0
index c2a17c6212f1..013277c9bf12 100644
@@ -243,3 +243,4 @@ CONFIG_QE_UEC=y
 CONFIG_QE=y
 CONFIG_SYS_NS16550=y
 CONFIG_BCH=y
+CONFIG_POST=y
configs/pg_wcom_expu1_defconfig +1 -0
index ed55f7bfd0aa..d21e180d1fc3 100644
@@ -100,3 +100,4 @@ CONFIG_SCSI_AHCI_PLAT=y
 CONFIG_SPECIFY_CONSOLE_INDEX=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
+CONFIG_POST=y
configs/pg_wcom_expu1_update_defconfig +1 -0
index 64ddaf8aa61c..54773b06339a 100644
@@ -98,3 +98,4 @@ CONFIG_SCSI_AHCI_PLAT=y
 CONFIG_SPECIFY_CONSOLE_INDEX=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
+CONFIG_POST=y
configs/pg_wcom_seli8_defconfig +1 -0
index ad08e3582e36..8311b3a3a00f 100644
@@ -100,3 +100,4 @@ CONFIG_SCSI_AHCI_PLAT=y
 CONFIG_SPECIFY_CONSOLE_INDEX=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
+CONFIG_POST=y
configs/pg_wcom_seli8_update_defconfig +1 -0
index 01a6198d727e..d6f4a0547907 100644
@@ -98,3 +98,4 @@ CONFIG_SCSI_AHCI_PLAT=y
 CONFIG_SPECIFY_CONSOLE_INDEX=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
+CONFIG_POST=y
doc/README.POST +3 -3
index 1d1c25bdf9e1..5d92f3fe6e91 100644
@@ -242,11 +242,11 @@ storage server and etc.
 
 All POST-related code will be #ifdef'ed with the CONFIG_POST macro.
 This macro will be defined in the config_<board>.h file for those
-boards that need POST. The CONFIG_POST macro will contain the list of
+boards that need POST. The CFG_POST macro will contain the list of
 POST tests for the board. The macro will have the format of array
 composed of post_test structures:
 
-#define CONFIG_POST \
+#define CFG_POST \
 	{
 		"On-board peripherals test", "board", \
 		"  This test performs full check-up of the " \
@@ -257,7 +257,7 @@ composed of post_test structures:
 
 A new file, post.h, will be created in the include/ directory. This
 file will contain common POST declarations and will define a set of
-macros that will be reused for defining CONFIG_POST. As an example,
+macros that will be reused for defining CFG_POST. As an example,
 the following macro may be defined:
 
 #define POST_CACHE \
doc/README.fsl-ddr +1 -1
index cec5d94df4a8..10e63f3be1d3 100644
@@ -137,7 +137,7 @@ Memory testing options for mpc85xx
 2. Memory test can be done with Power-On-Self-Test function, activated at
    compile time.
 
-   In order to enable the POST memory test, CONFIG_POST needs to be
+   In order to enable the POST memory test, CFG_POST needs to be
    defined in board configuraiton header file. By default, POST memory test
    performs a fast test. A slow test can be enabled by changing the flag at
    compiling time. To test memory bigger than 2GB, 36BIT support is needed.
drivers/serial/serial-uclass.c +1 -1
index 8a489a2e3f95..c02106747a08 100644
@@ -526,7 +526,7 @@ static int serial_post_probe(struct udevice *dev)
 		ops->getconfig += gd->reloc_off;
 	if (ops->setconfig)
 		ops->setconfig += gd->reloc_off;
-#if CONFIG_POST & CONFIG_SYS_POST_UART
+#if CFG_POST & CONFIG_SYS_POST_UART
 	if (ops->loop)
 		ops->loop += gd->reloc_off;
 #endif
drivers/serial/serial.c +1 -1
index 4d5496509481..369a8e38e3e2 100644
@@ -458,7 +458,7 @@ void default_serial_puts(const char *s)
 		dev->putc(*s++);
 }
 
-#if CONFIG_POST & CONFIG_SYS_POST_UART
+#if CFG_POST & CONFIG_SYS_POST_UART
 static const int bauds[] = CFG_SYS_BAUDRATE_TABLE;
 
 /**
include/configs/P2041RDB.h +1 -1
index acbd43419f2e..8b901ca47a0c 100644
@@ -41,7 +41,7 @@
  */
 #define CFG_SYS_INIT_L2CSR0		L2CSR0_L2E
 
-#define CONFIG_POST CFG_SYS_POST_MEMORY	/* test POST memory test */
+#define CFG_POST CFG_SYS_POST_MEMORY	/* test POST memory test */
 
 /*
  *  Config the L3 Cache as L3 SRAM
include/configs/km/pg-wcom-ls102xa.h +2 -2
index c1174b87ab7a..dfa81c037f48 100644
@@ -25,8 +25,8 @@
 #define SPD_EEPROM_ADDRESS		0x54
 
 /* POST memory regions test */
-#define CONFIG_POST			(CFG_SYS_POST_MEM_REGIONS)
-#define CONFIG_POST_EXTERNAL_WORD_FUNCS
+#define CFG_POST			(CFG_SYS_POST_MEM_REGIONS)
+#define CFG_POST_EXTERNAL_WORD_FUNCS
 
 /*
  * IFC Definitions
include/configs/kmcent2.h +1 -1
index 89c5a24ee901..527f0383bc65 100644
@@ -148,7 +148,7 @@
 #define CFG_SYS_INIT_L2CSR0		L2CSR0_L2E
 
 /* POST memory regions test */
-#define CONFIG_POST CFG_SYS_POST_MEM_REGIONS
+#define CFG_POST CFG_SYS_POST_MEM_REGIONS
 
 /*
  *  Config the L3 Cache as L3 SRAM
include/configs/kmcoge5ne.h +2 -2
index c24d6ad8bc2d..6b30fb4b617e 100644
@@ -33,8 +33,8 @@
 	CSCONFIG_COL_BIT_10)
 
 /* enable POST tests */
-#define CONFIG_POST (CFG_SYS_POST_MEMORY|CFG_SYS_POST_MEM_REGIONS)
-#define CONFIG_POST_EXTERNAL_WORD_FUNCS /* use own functions, not generic */
+#define CFG_POST (CFG_SYS_POST_MEMORY|CFG_SYS_POST_MEM_REGIONS)
+#define CFG_POST_EXTERNAL_WORD_FUNCS /* use own functions, not generic */
 #define CPM_POST_WORD_ADDR  CONFIG_SYS_MEMTEST_END
 #define CONFIG_TESTPIN_REG  gprt3	/* for kmcoge5ne */
 #define CONFIG_TESTPIN_MASK 0x20	/* for kmcoge5ne */
include/post.h +2 -2
index 867a66f3007a..e68d5c89020c 100644
@@ -16,7 +16,7 @@
 
 #if defined(CONFIG_POST)
 
-#ifndef CONFIG_POST_EXTERNAL_WORD_FUNCS
+#ifndef CFG_POST_EXTERNAL_WORD_FUNCS
 #ifdef CONFIG_SYS_POST_WORD_ADDR
 #define _POST_WORD_ADDR	CONFIG_SYS_POST_WORD_ADDR
 #else
@@ -51,7 +51,7 @@ static inline void post_word_store (ulong value)
 extern ulong post_word_load(void);
 extern void post_word_store(ulong value);
 
-#endif /* CONFIG_POST_EXTERNAL_WORD_FUNCS */
+#endif /* CFG_POST_EXTERNAL_WORD_FUNCS */
 #endif /* defined (CONFIG_POST) */
 #endif /* __ASSEMBLY__ */
 
include/serial.h +2 -2
index fe01bcfadb9b..f4d7dc58a9e1 100644
@@ -14,7 +14,7 @@ struct serial_device {
 	int	(*tstc)(void);
 	void	(*putc)(const char c);
 	void	(*puts)(const char *s);
-#if CONFIG_POST & CONFIG_SYS_POST_UART
+#if CFG_POST & CONFIG_SYS_POST_UART
 	void	(*loop)(int);
 #endif
 	struct serial_device	*next;
@@ -242,7 +242,7 @@ struct dm_serial_ops {
 	 * @return 0 if OK, -ve on error
 	 */
 	int (*clear)(struct udevice *dev);
-#if CONFIG_POST & CONFIG_SYS_POST_UART
+#if CFG_POST & CONFIG_SYS_POST_UART
 	/**
 	 * loop() - Control serial device loopback mode
 	 *
post/cpu/mpc83xx/ecc.c +1 -1
index edd74115672b..45263e6b44ca 100644
@@ -17,7 +17,7 @@
 #include <asm/io.h>
 #include <post.h>
 
-#if CONFIG_POST & CONFIG_SYS_POST_ECC
+#if CFG_POST & CONFIG_SYS_POST_ECC
 /*
  * We use the RAW I/O accessors where possible in order to
  * achieve performance goal, since the test's execution time
post/drivers/flash.c +1 -1
index 7d65f46d9fea..e157d3691100 100644
@@ -6,7 +6,7 @@
  * Licensed under the GPL-2 or later.
  */
 
-#if CONFIG_POST & CONFIG_SYS_POST_FLASH
+#if CFG_POST & CONFIG_SYS_POST_FLASH
 #include <common.h>
 #include <malloc.h>
 #include <post.h>
post/drivers/i2c.c +2 -2
index 3b378921fafc..057454ffd8f5 100644
@@ -26,7 +26,7 @@
 #include <post.h>
 #include <i2c.h>
 
-#if CONFIG_POST & CONFIG_SYS_POST_I2C
+#if CFG_POST & CONFIG_SYS_POST_I2C
 
 static int i2c_ignore_device(unsigned int chip)
 {
@@ -94,4 +94,4 @@ int i2c_post_test (int flags)
 #endif
 }
 
-#endif /* CONFIG_POST & CONFIG_SYS_POST_I2C */
+#endif /* CFG_POST & CONFIG_SYS_POST_I2C */
post/drivers/memory.c +2 -2
index 71dad7b8c026..1be2b41df45d 100644
@@ -138,7 +138,7 @@
 #include <post.h>
 #include <watchdog.h>
 
-#if CONFIG_POST & (CFG_SYS_POST_MEMORY | CFG_SYS_POST_MEM_REGIONS)
+#if CFG_POST & (CFG_SYS_POST_MEMORY | CFG_SYS_POST_MEM_REGIONS)
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -535,4 +535,4 @@ int memory_post_test(int flags)
 	return ret;
 }
 
-#endif /* CONFIG_POST&(CFG_SYS_POST_MEMORY|CFG_SYS_POST_MEM_REGIONS) */
+#endif /* CFG_POST&(CFG_SYS_POST_MEMORY|CFG_SYS_POST_MEM_REGIONS) */
post/drivers/rtc.c +2 -2
index c603f0e6728c..cfed56b680cd 100644
@@ -26,7 +26,7 @@
 #include <post.h>
 #include <rtc.h>
 
-#if CONFIG_POST & CONFIG_SYS_POST_RTC
+#if CFG_POST & CONFIG_SYS_POST_RTC
 
 static int rtc_post_skip (ulong * diff)
 {
@@ -189,4 +189,4 @@ int rtc_post_test (int flags)
 	return 0;
 }
 
-#endif /* CONFIG_POST & CONFIG_SYS_POST_RTC */
+#endif /* CFG_POST & CONFIG_SYS_POST_RTC */
post/lib_powerpc/andi.c +1 -1
index d4f60aa73880..d69d61396bcb 100644
@@ -19,7 +19,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CONFIG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CONFIG_SYS_POST_CPU
 
 extern void cpu_post_exec_21 (ulong *code, ulong *cr, ulong *res, ulong op);
 extern ulong cpu_post_makecr (long v);
post/lib_powerpc/asm.S +1 -1
index 91b599932ffd..13302d796898 100644
@@ -10,7 +10,7 @@
 #include <ppc_defs.h>
 #include <asm/cache.h>
 
-#if CONFIG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CONFIG_SYS_POST_CPU
 
 /* void cpu_post_exec_02 (ulong *code, ulong op1, ulong op2); */
 	.global	cpu_post_exec_02
post/lib_powerpc/b.c +1 -1
index 0b02e9169e2b..eb9371fa6b20 100644
@@ -24,7 +24,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CONFIG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CONFIG_SYS_POST_CPU
 
 extern void cpu_post_exec_11 (ulong *code, ulong *res, ulong op1);
 extern void cpu_post_exec_31 (ulong *code, ulong *ctr, ulong *lr, ulong *jump,
post/lib_powerpc/cmp.c +1 -1
index e70869774ceb..e4d0931fc9a4 100644
@@ -23,7 +23,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CONFIG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CONFIG_SYS_POST_CPU
 
 extern void cpu_post_exec_12 (ulong *code, ulong *res, ulong op1, ulong op2);
 
post/lib_powerpc/cmpi.c +1 -1
index 85a9b0ad36b2..983892d00635 100644
@@ -23,7 +23,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CONFIG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CONFIG_SYS_POST_CPU
 
 extern void cpu_post_exec_11 (ulong *code, ulong *res, ulong op1);
 
post/lib_powerpc/complex.c +1 -1
index bb29e9170127..d2ec21b0cbea 100644
@@ -18,7 +18,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CONFIG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CONFIG_SYS_POST_CPU
 
 extern int cpu_post_complex_1_asm (int a1, int a2, int a3, int a4, int n);
 extern int cpu_post_complex_2_asm (int x, int n);
post/lib_powerpc/cpu.c +2 -2
index 1d4710734291..77c25381729b 100644
@@ -20,7 +20,7 @@
 #include <post.h>
 #include <asm/mmu.h>
 
-#if CONFIG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CONFIG_SYS_POST_CPU
 
 extern int cpu_post_test_cmp (void);
 extern int cpu_post_test_cmpi (void);
@@ -118,4 +118,4 @@ int cpu_post_test (int flags)
 	return ret;
 }
 
-#endif /* CONFIG_POST & CONFIG_SYS_POST_CPU */
+#endif /* CFG_POST & CONFIG_SYS_POST_CPU */
post/lib_powerpc/cr.c +1 -1
index 56ed355dde71..077fb0f2da3a 100644
@@ -33,7 +33,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CONFIG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CONFIG_SYS_POST_CPU
 
 extern void cpu_post_exec_11 (ulong *code, ulong *res, ulong op1);
 extern void cpu_post_exec_21x (ulong *code, ulong *op1, ulong *op2, ulong op3);
post/lib_powerpc/fpu/20001122-1.c +2 -2
index 4b452dc083d4..eddd3f915eed 100644
@@ -13,7 +13,7 @@
 
 GNU_FPOST_ATTR
 
-#if CONFIG_POST & CONFIG_SYS_POST_FPU
+#if CFG_POST & CONFIG_SYS_POST_FPU
 
 int fpu_post_test_math1 (void)
 {
@@ -40,4 +40,4 @@ int fpu_post_test_math1 (void)
 	return 0;
 }
 
-#endif /* CONFIG_POST & CONFIG_SYS_POST_FPU */
+#endif /* CFG_POST & CONFIG_SYS_POST_FPU */
post/lib_powerpc/fpu/20010114-2.c +2 -2
index 4aadd1e0482d..9e3e54661f99 100644
@@ -13,7 +13,7 @@
 
 GNU_FPOST_ATTR
 
-#if CONFIG_POST & CONFIG_SYS_POST_FPU
+#if CFG_POST & CONFIG_SYS_POST_FPU
 
 static float rintf (float x)
 {
@@ -45,4 +45,4 @@ int fpu_post_test_math2 (void)
 	return 0;
 }
 
-#endif /* CONFIG_POST & CONFIG_SYS_POST_FPU */
+#endif /* CFG_POST & CONFIG_SYS_POST_FPU */
post/lib_powerpc/fpu/20010226-1.c +2 -2
index b09a25c2118c..5bb386090035 100644
@@ -13,7 +13,7 @@
 
 GNU_FPOST_ATTR
 
-#if CONFIG_POST & CONFIG_SYS_POST_FPU
+#if CFG_POST & CONFIG_SYS_POST_FPU
 
 int fpu_post_test_math3 (void)
 {
@@ -33,4 +33,4 @@ int fpu_post_test_math3 (void)
 	return 0;
 }
 
-#endif /* CONFIG_POST & CONFIG_SYS_POST_FPU */
+#endif /* CFG_POST & CONFIG_SYS_POST_FPU */
post/lib_powerpc/fpu/980619-1.c +2 -2
index 2fea708306cc..415cd50c85d2 100644
@@ -13,7 +13,7 @@
 
 GNU_FPOST_ATTR
 
-#if CONFIG_POST & CONFIG_SYS_POST_FPU
+#if CFG_POST & CONFIG_SYS_POST_FPU
 
 int fpu_post_test_math4 (void)
 {
@@ -39,4 +39,4 @@ int fpu_post_test_math4 (void)
 	return 0;
 }
 
-#endif /* CONFIG_POST & CONFIG_SYS_POST_FPU */
+#endif /* CFG_POST & CONFIG_SYS_POST_FPU */
post/lib_powerpc/fpu/acc1.c +2 -2
index 9e5783b25792..4cf3b7cef757 100644
@@ -13,7 +13,7 @@
 
 GNU_FPOST_ATTR
 
-#if CONFIG_POST & CONFIG_SYS_POST_FPU
+#if CFG_POST & CONFIG_SYS_POST_FPU
 
 static double func (const double *array)
 {
@@ -36,4 +36,4 @@ int fpu_post_test_math5 (void)
 	return 0;
 }
 
-#endif /* CONFIG_POST & CONFIG_SYS_POST_FPU */
+#endif /* CFG_POST & CONFIG_SYS_POST_FPU */
post/lib_powerpc/fpu/compare-fp-1.c +2 -2
index d46a13adcdfe..029600fd2b74 100644
@@ -15,7 +15,7 @@
 
 GNU_FPOST_ATTR
 
-#if CONFIG_POST & CONFIG_SYS_POST_FPU
+#if CFG_POST & CONFIG_SYS_POST_FPU
 
 static int failed;
 
@@ -204,4 +204,4 @@ int fpu_post_test_math6 (void)
 	return 0;
 }
 
-#endif /* CONFIG_POST & CONFIG_SYS_POST_FPU */
+#endif /* CFG_POST & CONFIG_SYS_POST_FPU */
post/lib_powerpc/fpu/fpu.c +2 -2
index bd65f623d500..8993b36e801d 100644
@@ -21,7 +21,7 @@
 
 GNU_FPOST_ATTR
 
-#if CONFIG_POST & CONFIG_SYS_POST_FPU
+#if CFG_POST & CONFIG_SYS_POST_FPU
 
 #include <watchdog.h>
 
@@ -71,4 +71,4 @@ int fpu_post_test (int flags)
 	return ret;
 }
 
-#endif /* CONFIG_POST & CONFIG_SYS_POST_FPU */
+#endif /* CFG_POST & CONFIG_SYS_POST_FPU */
post/lib_powerpc/fpu/mul-subnormal-single-1.c +2 -2
index cb61c9114d7b..87b882c6b22f 100644
@@ -15,7 +15,7 @@
 
 GNU_FPOST_ATTR
 
-#if CONFIG_POST & CONFIG_SYS_POST_FPU
+#if CFG_POST & CONFIG_SYS_POST_FPU
 
 union uf
 {
@@ -82,4 +82,4 @@ int fpu_post_test_math7 (void)
 	return 0;
 }
 
-#endif /* CONFIG_POST & CONFIG_SYS_POST_FPU */
+#endif /* CFG_POST & CONFIG_SYS_POST_FPU */
post/lib_powerpc/load.c +1 -1
index 5269563b1e17..ece0b2756e00 100644
@@ -28,7 +28,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CONFIG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CONFIG_SYS_POST_CPU
 
 extern void cpu_post_exec_22w (ulong *code, ulong *op1, ulong op2, ulong *op3);
 extern void cpu_post_exec_21w (ulong *code, ulong *op1, ulong *op2);
post/lib_powerpc/multi.c +1 -1
index f082e4c546cc..0e9ee88eb5d5 100644
@@ -21,7 +21,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CONFIG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CONFIG_SYS_POST_CPU
 
 extern void cpu_post_exec_02(ulong *code, ulong op1, ulong op2);
 
post/lib_powerpc/rlwimi.c +1 -1
index 7b4dc79fb17d..d24a3f665c7c 100644
@@ -19,7 +19,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CONFIG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CONFIG_SYS_POST_CPU
 
 extern void cpu_post_exec_22 (ulong *code, ulong *cr, ulong *res, ulong op1,
     ulong op2);
post/lib_powerpc/rlwinm.c +1 -1
index 8a03e9b9bcb6..9f4a3edb3ea7 100644
@@ -19,7 +19,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CONFIG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CONFIG_SYS_POST_CPU
 
 extern void cpu_post_exec_21 (ulong *code, ulong *cr, ulong *res, ulong op1);
 extern ulong cpu_post_makecr (long v);
post/lib_powerpc/rlwnm.c +1 -1
index e2beb4e41713..224e6bdd45e9 100644
@@ -19,7 +19,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CONFIG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CONFIG_SYS_POST_CPU
 
 extern void cpu_post_exec_22 (ulong *code, ulong *cr, ulong *res, ulong op1,
     ulong op2);
post/lib_powerpc/srawi.c +1 -1
index d4a8fabc4257..713d4f2276b3 100644
@@ -19,7 +19,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CONFIG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CONFIG_SYS_POST_CPU
 
 extern void cpu_post_exec_21 (ulong *code, ulong *cr, ulong *res, ulong op);
 extern ulong cpu_post_makecr (long v);
post/lib_powerpc/store.c +1 -1
index 8e278fee885a..2dbcccf098a5 100644
@@ -28,7 +28,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CONFIG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CONFIG_SYS_POST_CPU
 
 extern void cpu_post_exec_12w (ulong *code, ulong *op1, ulong op2, ulong op3);
 extern void cpu_post_exec_11w (ulong *code, ulong *op1, ulong op2);
post/lib_powerpc/string.c +1 -1
index 0d8d280b271c..9b54847632a3 100644
@@ -20,7 +20,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CONFIG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CONFIG_SYS_POST_CPU
 
 extern void cpu_post_exec_02 (ulong *code, ulong op1, ulong op2);
 extern void cpu_post_exec_04 (ulong *code, ulong op1, ulong op2, ulong op3,
post/lib_powerpc/three.c +1 -1
index fc6f1f5674ad..55f0ff8a8825 100644
@@ -22,7 +22,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CONFIG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CONFIG_SYS_POST_CPU
 
 extern void cpu_post_exec_22 (ulong *code, ulong *cr, ulong *res, ulong op1,
     ulong op2);
post/lib_powerpc/threei.c +1 -1
index f49c85e6b9da..ec52d238e699 100644
@@ -21,7 +21,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CONFIG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CONFIG_SYS_POST_CPU
 
 extern void cpu_post_exec_21 (ulong *code, ulong *cr, ulong *res, ulong op);
 extern ulong cpu_post_makecr (long v);
post/lib_powerpc/threex.c +1 -1
index 6bc5a54706b4..6f5f0b8eb760 100644
@@ -22,7 +22,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CONFIG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CONFIG_SYS_POST_CPU
 
 extern void cpu_post_exec_22 (ulong *code, ulong *cr, ulong *res, ulong op1,
     ulong op2);
post/lib_powerpc/two.c +1 -1
index fa376c76b1bb..b44dd4e20845 100644
@@ -22,7 +22,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CONFIG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CONFIG_SYS_POST_CPU
 
 extern void cpu_post_exec_21 (ulong *code, ulong *cr, ulong *res, ulong op1);
 extern ulong cpu_post_makecr (long v);
post/lib_powerpc/twox.c +1 -1
index 5c36012a9b79..320cc0a64e7c 100644
@@ -22,7 +22,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CONFIG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CONFIG_SYS_POST_CPU
 
 extern void cpu_post_exec_21 (ulong *code, ulong *cr, ulong *res, ulong op1);
 extern ulong cpu_post_makecr (long v);
post/post.c +2 -2
index b81425d8cf81..9964b4108041 100644
@@ -168,7 +168,7 @@ static void post_bootmode_test_off(void)
 	post_word_store(word);
 }
 
-#ifndef CONFIG_POST_SKIP_ENV_FLAGS
+#ifndef CFG_POST_SKIP_ENV_FLAGS
 static void post_get_env_flags(int *test_flags)
 {
 	int  flag[] = {  POST_POWERON,   POST_NORMAL,   POST_SLOWTEST,
@@ -227,7 +227,7 @@ static void post_get_flags(int *test_flags)
 	for (j = 0; j < post_list_size; j++)
 		test_flags[j] = post_list[j].flags;
 
-#ifndef CONFIG_POST_SKIP_ENV_FLAGS
+#ifndef CFG_POST_SKIP_ENV_FLAGS
 	post_get_env_flags(test_flags);
 #endif
 
post/tests.c +34 -34

188 lines not on this page · raw message

test/Kconfig +5 -0
index a6b463e4d06c..9f4641ae6bc5 100644
@@ -1,3 +1,8 @@
+config POST
+	bool "Power On Self Test support"
+	help
+	  See doc/README.POST for more details
+
 menuconfig UNIT_TEST
 	bool "Unit tests"
 	help
Signature · 1 line
2.25.1
Reviewed-by on v1 37/38
#43 lore raw

Re: [PATCH 37/38] post: Migrate to Kconfig

Quoted 57 lines · Tom Rini

We move the existing CONFIG_POST_* functionality over to CFG_POST and then introduce CONFIG_POST to Kconfig.

---
 arch/powerpc/cpu/mpc85xx/cpu.c                |  2 +-
 configs/P2041RDB_NAND_defconfig               |  1 +
 configs/P2041RDB_SDCARD_defconfig             |  1 +
 configs/P2041RDB_SPIFLASH_defconfig           |  1 +
 configs/P2041RDB_defconfig                    |  1 +
 configs/kmcent2_defconfig                     |  1 +
 configs/kmcoge5ne_defconfig                   |  1 +
 configs/pg_wcom_expu1_defconfig               |  1 +
 configs/pg_wcom_expu1_update_defconfig        |  1 +
 configs/pg_wcom_seli8_defconfig               |  1 +
 configs/pg_wcom_seli8_update_defconfig        |  1 +
 doc/README.POST                               |  6 +-
 doc/README.fsl-ddr                            |  2 +-
 drivers/serial/serial-uclass.c                |  2 +-
 drivers/serial/serial.c                       |  2 +-
 include/configs/P2041RDB.h                    |  2 +-
 include/configs/km/pg-wcom-ls102xa.h          |  4 +-
 include/configs/kmcent2.h                     |  2 +-
 include/configs/kmcoge5ne.h                   |  4 +-
 include/post.h                                |  4 +-
 include/serial.h                              |  4 +-
 post/cpu/mpc83xx/ecc.c                        |  2 +-
 post/drivers/flash.c                          |  2 +-
 post/drivers/i2c.c                            |  4 +-
 post/drivers/memory.c                         |  4 +-
 post/drivers/rtc.c                            |  4 +-
 post/lib_powerpc/andi.c                       |  2 +-
 post/lib_powerpc/asm.S                        |  2 +-
 post/lib_powerpc/b.c                          |  2 +-
 post/lib_powerpc/cmp.c                        |  2 +-
 post/lib_powerpc/cmpi.c                       |  2 +-
 post/lib_powerpc/complex.c                    |  2 +-
 post/lib_powerpc/cpu.c                        |  4 +-
 post/lib_powerpc/cr.c                         |  2 +-
 post/lib_powerpc/fpu/20001122-1.c             |  4 +-
 post/lib_powerpc/fpu/20010114-2.c             |  4 +-
 post/lib_powerpc/fpu/20010226-1.c             |  4 +-
 post/lib_powerpc/fpu/980619-1.c               |  4 +-
 post/lib_powerpc/fpu/acc1.c                   |  4 +-
 post/lib_powerpc/fpu/compare-fp-1.c           |  4 +-
 post/lib_powerpc/fpu/fpu.c                    |  4 +-
 post/lib_powerpc/fpu/mul-subnormal-single-1.c |  4 +-
 post/lib_powerpc/load.c                       |  2 +-
 post/lib_powerpc/multi.c                      |  2 +-
 post/lib_powerpc/rlwimi.c                     |  2 +-
 post/lib_powerpc/rlwinm.c                     |  2 +-
 post/lib_powerpc/rlwnm.c                      |  2 +-
 post/lib_powerpc/srawi.c                      |  2 +-
 post/lib_powerpc/store.c                      |  2 +-
 post/lib_powerpc/string.c                     |  2 +-
 post/lib_powerpc/three.c                      |  2 +-
Quoted 9 lines
 post/lib_powerpc/threei.c                     |  2 +-
 post/lib_powerpc/threex.c                     |  2 +-
 post/lib_powerpc/two.c                        |  2 +-
 post/lib_powerpc/twox.c                       |  2 +-
 post/post.c                                   |  4 +-
 post/tests.c                                  | 68 +++++++++----------
 test/Kconfig                                  |  5 ++
 58 files changed, 114 insertions(+), 99 deletions(-)

but please see below

test/Kconfig line 4

Quoted 9 lines
test/Kconfig +4 -0
index a6b463e4d06c..9f4641ae6bc5 100644
@@ -1,3 +1,8 @@
+config POST
+       bool "Power On Self Test support"
+       help
+         See doc/README.POST for more details

Shouldn't this be in post/Kconfig ?

We use test/ for unit / functional tests.

Regards,
Simon

author
#44 lore raw

Re: [PATCH 37/38] post: Migrate to Kconfig

Quoted 72 lines · Simon Glass
Quoted 57 lines · Tom Rini

We move the existing CONFIG_POST_* functionality over to CFG_POST and then introduce CONFIG_POST to Kconfig.

---
 arch/powerpc/cpu/mpc85xx/cpu.c                |  2 +-
 configs/P2041RDB_NAND_defconfig               |  1 +
 configs/P2041RDB_SDCARD_defconfig             |  1 +
 configs/P2041RDB_SPIFLASH_defconfig           |  1 +
 configs/P2041RDB_defconfig                    |  1 +
 configs/kmcent2_defconfig                     |  1 +
 configs/kmcoge5ne_defconfig                   |  1 +
 configs/pg_wcom_expu1_defconfig               |  1 +
 configs/pg_wcom_expu1_update_defconfig        |  1 +
 configs/pg_wcom_seli8_defconfig               |  1 +
 configs/pg_wcom_seli8_update_defconfig        |  1 +
 doc/README.POST                               |  6 +-
 doc/README.fsl-ddr                            |  2 +-
 drivers/serial/serial-uclass.c                |  2 +-
 drivers/serial/serial.c                       |  2 +-
 include/configs/P2041RDB.h                    |  2 +-
 include/configs/km/pg-wcom-ls102xa.h          |  4 +-
 include/configs/kmcent2.h                     |  2 +-
 include/configs/kmcoge5ne.h                   |  4 +-
 include/post.h                                |  4 +-
 include/serial.h                              |  4 +-
 post/cpu/mpc83xx/ecc.c                        |  2 +-
 post/drivers/flash.c                          |  2 +-
 post/drivers/i2c.c                            |  4 +-
 post/drivers/memory.c                         |  4 +-
 post/drivers/rtc.c                            |  4 +-
 post/lib_powerpc/andi.c                       |  2 +-
 post/lib_powerpc/asm.S                        |  2 +-
 post/lib_powerpc/b.c                          |  2 +-
 post/lib_powerpc/cmp.c                        |  2 +-
 post/lib_powerpc/cmpi.c                       |  2 +-
 post/lib_powerpc/complex.c                    |  2 +-
 post/lib_powerpc/cpu.c                        |  4 +-
 post/lib_powerpc/cr.c                         |  2 +-
 post/lib_powerpc/fpu/20001122-1.c             |  4 +-
 post/lib_powerpc/fpu/20010114-2.c             |  4 +-
 post/lib_powerpc/fpu/20010226-1.c             |  4 +-
 post/lib_powerpc/fpu/980619-1.c               |  4 +-
 post/lib_powerpc/fpu/acc1.c                   |  4 +-
 post/lib_powerpc/fpu/compare-fp-1.c           |  4 +-
 post/lib_powerpc/fpu/fpu.c                    |  4 +-
 post/lib_powerpc/fpu/mul-subnormal-single-1.c |  4 +-
 post/lib_powerpc/load.c                       |  2 +-
 post/lib_powerpc/multi.c                      |  2 +-
 post/lib_powerpc/rlwimi.c                     |  2 +-
 post/lib_powerpc/rlwinm.c                     |  2 +-
 post/lib_powerpc/rlwnm.c                      |  2 +-
 post/lib_powerpc/srawi.c                      |  2 +-
 post/lib_powerpc/store.c                      |  2 +-
 post/lib_powerpc/string.c                     |  2 +-
 post/lib_powerpc/three.c                      |  2 +-
Quoted 9 lines
 post/lib_powerpc/threei.c                     |  2 +-
 post/lib_powerpc/threex.c                     |  2 +-
 post/lib_powerpc/two.c                        |  2 +-
 post/lib_powerpc/twox.c                       |  2 +-
 post/post.c                                   |  4 +-
 post/tests.c                                  | 68 +++++++++----------
 test/Kconfig                                  |  5 ++
 58 files changed, 114 insertions(+), 99 deletions(-)

but please see below

Quoted 11 lines

test/Kconfig line 4

Quoted 9 lines
test/Kconfig +4 -0
index a6b463e4d06c..9f4641ae6bc5 100644
@@ -1,3 +1,8 @@
+config POST
+       bool "Power On Self Test support"
+       help
+         See doc/README.POST for more details

Shouldn't this be in post/Kconfig ?

It's non-trivial enough content that it really should be migrated to doc/post/ and then expanded upon a bit further.

Quoted 1 line

We use test/ for unit / functional tests.

Yes, but post pre-dates all of that, keep in mind. It's also still in active use (enabled on some semi-recent layerscape platforms for example). This is an area that could use some attention and renovation, yes, but the whole point of this and the huge follow-up are to get the migrate to Kconfig part done already.

Signature · 1 line
Tom
#45 lore raw

Re: [PATCH 37/38] post: Migrate to Kconfig

Hi Tom,

Quoted 89 lines · Tom Rini
Quoted 72 lines · Simon Glass
Quoted 57 lines · Tom Rini

We move the existing CONFIG_POST_* functionality over to CFG_POST and then introduce CONFIG_POST to Kconfig.

---
 arch/powerpc/cpu/mpc85xx/cpu.c                |  2 +-
 configs/P2041RDB_NAND_defconfig               |  1 +
 configs/P2041RDB_SDCARD_defconfig             |  1 +
 configs/P2041RDB_SPIFLASH_defconfig           |  1 +
 configs/P2041RDB_defconfig                    |  1 +
 configs/kmcent2_defconfig                     |  1 +
 configs/kmcoge5ne_defconfig                   |  1 +
 configs/pg_wcom_expu1_defconfig               |  1 +
 configs/pg_wcom_expu1_update_defconfig        |  1 +
 configs/pg_wcom_seli8_defconfig               |  1 +
 configs/pg_wcom_seli8_update_defconfig        |  1 +
 doc/README.POST                               |  6 +-
 doc/README.fsl-ddr                            |  2 +-
 drivers/serial/serial-uclass.c                |  2 +-
 drivers/serial/serial.c                       |  2 +-
 include/configs/P2041RDB.h                    |  2 +-
 include/configs/km/pg-wcom-ls102xa.h          |  4 +-
 include/configs/kmcent2.h                     |  2 +-
 include/configs/kmcoge5ne.h                   |  4 +-
 include/post.h                                |  4 +-
 include/serial.h                              |  4 +-
 post/cpu/mpc83xx/ecc.c                        |  2 +-
 post/drivers/flash.c                          |  2 +-
 post/drivers/i2c.c                            |  4 +-
 post/drivers/memory.c                         |  4 +-
 post/drivers/rtc.c                            |  4 +-
 post/lib_powerpc/andi.c                       |  2 +-
 post/lib_powerpc/asm.S                        |  2 +-
 post/lib_powerpc/b.c                          |  2 +-
 post/lib_powerpc/cmp.c                        |  2 +-
 post/lib_powerpc/cmpi.c                       |  2 +-
 post/lib_powerpc/complex.c                    |  2 +-
 post/lib_powerpc/cpu.c                        |  4 +-
 post/lib_powerpc/cr.c                         |  2 +-
 post/lib_powerpc/fpu/20001122-1.c             |  4 +-
 post/lib_powerpc/fpu/20010114-2.c             |  4 +-
 post/lib_powerpc/fpu/20010226-1.c             |  4 +-
 post/lib_powerpc/fpu/980619-1.c               |  4 +-
 post/lib_powerpc/fpu/acc1.c                   |  4 +-
 post/lib_powerpc/fpu/compare-fp-1.c           |  4 +-
 post/lib_powerpc/fpu/fpu.c                    |  4 +-
 post/lib_powerpc/fpu/mul-subnormal-single-1.c |  4 +-
 post/lib_powerpc/load.c                       |  2 +-
 post/lib_powerpc/multi.c                      |  2 +-
 post/lib_powerpc/rlwimi.c                     |  2 +-
 post/lib_powerpc/rlwinm.c                     |  2 +-
 post/lib_powerpc/rlwnm.c                      |  2 +-
 post/lib_powerpc/srawi.c                      |  2 +-
 post/lib_powerpc/store.c                      |  2 +-
 post/lib_powerpc/string.c                     |  2 +-
 post/lib_powerpc/three.c                      |  2 +-
Quoted 9 lines
 post/lib_powerpc/threei.c                     |  2 +-
 post/lib_powerpc/threex.c                     |  2 +-
 post/lib_powerpc/two.c                        |  2 +-
 post/lib_powerpc/twox.c                       |  2 +-
 post/post.c                                   |  4 +-
 post/tests.c                                  | 68 +++++++++----------
 test/Kconfig                                  |  5 ++
 58 files changed, 114 insertions(+), 99 deletions(-)

but please see below

Quoted 11 lines

test/Kconfig line 4

Quoted 9 lines
test/Kconfig +4 -0
index a6b463e4d06c..9f4641ae6bc5 100644
@@ -1,3 +1,8 @@
+config POST
+       bool "Power On Self Test support"
+       help
+         See doc/README.POST for more details

Shouldn't this be in post/Kconfig ?

It's non-trivial enough content that it really should be migrated to doc/post/ and then expanded upon a bit further.

Quoted 7 lines
Quoted 1 line

We use test/ for unit / functional tests.

Yes, but post pre-dates all of that, keep in mind. It's also still in active use (enabled on some semi-recent layerscape platforms for example). This is an area that could use some attention and renovation, yes, but the whole point of this and the huge follow-up are to get the migrate to Kconfig part done already.

OK, good to get all this over the line!!

Regards,
Simon

author
#46 lore raw

PATCH 38/38 m68k: Rename CONFIG_WATCHDOG_TIMEOUT to CONFIG_WATCHDOG_TIMEOUT_MSECS

In reply to Tom Rini

In practice, it is clear that the usage in m68k of CONFIG_WATCHDOG_TIMEOUT is setting a value in milliseconds. Rename this to the existing symbol and move to Kconfig.

---
 arch/m68k/cpu/mcf523x/cpu.c        |  2 +-
 arch/m68k/cpu/mcf52x2/cpu.c        |  6 +++---
 arch/m68k/cpu/mcf532x/cpu.c        |  2 +-
 configs/M5208EVBE_defconfig        |  1 +
 configs/M5235EVB_Flash32_defconfig |  1 +
 configs/M5235EVB_defconfig         |  1 +
 configs/M5272C3_defconfig          |  1 +
 configs/M53017EVB_defconfig        |  1 +
 configs/M5329AFEE_defconfig        |  1 +
 configs/M5329BFEE_defconfig        |  1 +
 configs/M5373EVB_defconfig         |  1 +
 configs/astro_mcf5373l_defconfig   |  1 +
 include/configs/M5208EVBE.h        |  2 --
 include/configs/M5235EVB.h         |  2 --
 include/configs/M5272C3.h          |  2 --
 include/configs/M53017EVB.h        |  2 --
 include/configs/M5329EVB.h         |  2 --
 include/configs/M5373EVB.h         |  2 --
 include/configs/astro_mcf5373l.h   | 10 ----------
 include/configs/cobra5272.h        | 12 ------------
 20 files changed, 14 insertions(+), 39 deletions(-)
arch/m68k/cpu/mcf523x/cpu.c +1 -1
index 6d87908965d2..838b71a2ea48 100644
@@ -92,7 +92,7 @@ int watchdog_init(void)
 	u32 wdog_module = 0;
 
 	/* set timeout and enable watchdog */
-	wdog_module = ((CFG_SYS_CLK / CONFIG_SYS_HZ) * CONFIG_WATCHDOG_TIMEOUT);
+	wdog_module = ((CFG_SYS_CLK / CONFIG_SYS_HZ) * CONFIG_WATCHDOG_TIMEOUT_MSEC);
 	wdog_module |= (wdog_module / 8192);
 	out_be16(&wdp->mr, wdog_module);
 
arch/m68k/cpu/mcf52x2/cpu.c +3 -3
index d21d82fef758..25fc56c5276f 100644
@@ -87,7 +87,7 @@ int watchdog_init(void)
 
 	/* set timeout and enable watchdog */
 	out_be16(&wdt->mr,
-		(CONFIG_WATCHDOG_TIMEOUT * CONFIG_SYS_HZ) / (32768 * 1000) - 1);
+		(CONFIG_WATCHDOG_TIMEOUT_MSEC * CONFIG_SYS_HZ) / (32768 * 1000) - 1);
 
 	/* reset watchdog counter */
 	out_be16(&wdt->sr, 0x5555);
@@ -253,7 +253,7 @@ int watchdog_init(void)
 
 	/* set timeout and enable watchdog */
 	out_be16(&wdt->wdog_wrrr,
-		(CONFIG_WATCHDOG_TIMEOUT * CONFIG_SYS_HZ) / (32768 * 1000) - 1);
+		(CONFIG_WATCHDOG_TIMEOUT_MSEC * CONFIG_SYS_HZ) / (32768 * 1000) - 1);
 
 	/* reset watchdog counter */
 	out_be16(&wdt->wdog_wcr, 0);
@@ -323,7 +323,7 @@ int watchdog_init(void)
 
 	/* set timeout and enable watchdog */
 	out_be16(&wdt->wmr,
-		(CONFIG_WATCHDOG_TIMEOUT * CONFIG_SYS_HZ) / (32768 * 1000) - 1);
+		(CONFIG_WATCHDOG_TIMEOUT_MSEC * CONFIG_SYS_HZ) / (32768 * 1000) - 1);
 
 	/* reset watchdog counter */
 	out_be16(&wdt->wsr, 0x5555);
arch/m68k/cpu/mcf532x/cpu.c +1 -1
index 8a48d73475c8..014fbc43cb65 100644
@@ -131,7 +131,7 @@ int watchdog_init(void)
 	u32 wdog_module = 0;
 
 	/* set timeout and enable watchdog */
-	wdog_module = ((CFG_SYS_CLK / 1000) * CONFIG_WATCHDOG_TIMEOUT);
+	wdog_module = ((CFG_SYS_CLK / 1000) * CONFIG_WATCHDOG_TIMEOUT_MSEC);
 #ifdef CONFIG_M5329
 	out_be16(&wdp->mr, wdog_module / 8192);
 #else
configs/M5208EVBE_defconfig +1 -0
index fd219cbaebc5..680c2d43671b 100644
@@ -43,3 +43,4 @@ CONFIG_SYS_MAX_FLASH_SECT=254
 CONFIG_MCFFEC=y
 CONFIG_MII=y
 CONFIG_MCFUART=y
+CONFIG_WATCHDOG_TIMEOUT_MSECS=5000
configs/M5235EVB_Flash32_defconfig +1 -0
index 1b7b1568003e..c0087aa67f95 100644
@@ -50,3 +50,4 @@ CONFIG_SYS_MAX_FLASH_SECT=137
 CONFIG_MCFFEC=y
 CONFIG_MII=y
 CONFIG_MCFUART=y
+CONFIG_WATCHDOG_TIMEOUT_MSECS=5000
configs/M5235EVB_defconfig +1 -0
index fffcdddd4912..b099e986067b 100644
@@ -50,3 +50,4 @@ CONFIG_SYS_MAX_FLASH_SECT=137
 CONFIG_MCFFEC=y
 CONFIG_MII=y
 CONFIG_MCFUART=y
+CONFIG_WATCHDOG_TIMEOUT_MSECS=5000
configs/M5272C3_defconfig +1 -0
index 5e7d40144f96..a321b1c5c244 100644
@@ -62,3 +62,4 @@ CONFIG_SYS_MAX_FLASH_SECT=137
 CONFIG_MCFFEC=y
 CONFIG_MII=y
 CONFIG_MCFUART=y
+CONFIG_WATCHDOG_TIMEOUT_MSECS=10000
configs/M53017EVB_defconfig +1 -0
index 6586f0468b20..32d195808801 100644
@@ -49,3 +49,4 @@ CONFIG_MII=y
 CONFIG_MCFRTC=y
 CONFIG_SYS_MCFRTC_BASE=0xFC0A8000
 CONFIG_MCFUART=y
+CONFIG_WATCHDOG_TIMEOUT_MSECS=5000
configs/M5329AFEE_defconfig +1 -0
index bf1d70f832cc..9f0b4196392b 100644
@@ -48,3 +48,4 @@ CONFIG_MII=y
 CONFIG_MCFRTC=y
 CONFIG_SYS_MCFRTC_BASE=0xFC0A8000
 CONFIG_MCFUART=y
+CONFIG_WATCHDOG_TIMEOUT_MSECS=5000
configs/M5329BFEE_defconfig +1 -0
index b83b542f8f83..05388796fb11 100644
@@ -50,3 +50,4 @@ CONFIG_MII=y
 CONFIG_MCFRTC=y
 CONFIG_SYS_MCFRTC_BASE=0xFC0A8000
 CONFIG_MCFUART=y
+CONFIG_WATCHDOG_TIMEOUT_MSECS=5000
configs/M5373EVB_defconfig +1 -0
index 181f79b1e906..90d83216489a 100644
@@ -50,3 +50,4 @@ CONFIG_MII=y
 CONFIG_MCFRTC=y
 CONFIG_SYS_MCFRTC_BASE=0xFC0A8000
 CONFIG_MCFUART=y
+CONFIG_WATCHDOG_TIMEOUT_MSECS=3360
configs/astro_mcf5373l_defconfig +1 -0
index afbcb86c034b..9e5665a12b84 100644
@@ -50,3 +50,4 @@ CONFIG_MCFRTC=y
 CONFIG_SYS_MCFRTC_BASE=0xFC0A8000
 CONFIG_MCFUART=y
 CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_TIMEOUT_MSECS=3355
include/configs/M5208EVBE.h +0 -2
index 246437a51e2f..b360238b332a 100644
@@ -15,8 +15,6 @@
  */
 #define CFG_SYS_UART_PORT		(0)
 
-#define CONFIG_WATCHDOG_TIMEOUT		5000
-
 /* I2C */
 
 #ifdef CONFIG_MCFFEC
include/configs/M5235EVB.h +0 -2
index 128ef50b476f..ed45eccb62c9 100644
@@ -20,8 +20,6 @@
 
 #define CFG_SYS_UART_PORT		(0)
 
-#define CONFIG_WATCHDOG_TIMEOUT	5000	/* timeout in milliseconds, max timeout is 6.71sec */
-
 /* I2C */
 #define CFG_SYS_I2C_PINMUX_REG	(gpio->par_qspi)
 #define CFG_SYS_I2C_PINMUX_CLR	~(GPIO_PAR_FECI2C_SCL_MASK | GPIO_PAR_FECI2C_SDA_MASK)
include/configs/M5272C3.h +0 -2
index 847b4c2593d8..a9339e505257 100644
@@ -19,8 +19,6 @@
 
 #define CFG_SYS_UART_PORT		(0)
 
-#define CONFIG_WATCHDOG_TIMEOUT 10000	/* timeout in milliseconds */
-
 #undef CONFIG_MONITOR_IS_IN_RAM	/* define if monitor is started from a pre-loader */
 
 /* Configuration for environment
include/configs/M53017EVB.h +0 -2
index 0e9ba4c3ada8..42b74aeb9b5d 100644
@@ -20,8 +20,6 @@
 
 #define CFG_SYS_UART_PORT		(0)
 
-#define CONFIG_WATCHDOG_TIMEOUT		5000
-
 #ifdef CONFIG_MCFFEC
 #	define CFG_SYS_TX_ETH_BUFFER	8
 #	define CFG_SYS_FEC_BUF_USE_SRAM
include/configs/M5329EVB.h +0 -2
index 8f83810f165e..72f0c63a1e21 100644
@@ -20,8 +20,6 @@
 
 #define CFG_SYS_UART_PORT		(0)
 
-#define CONFIG_WATCHDOG_TIMEOUT	5000	/* timeout in milliseconds, max timeout is 6.71sec */
-
 /* I2C */
 
 #ifdef CONFIG_MCFFEC
include/configs/M5373EVB.h +0 -2
index 43c642edeb18..4e8b54e01f4e 100644
@@ -22,8 +22,6 @@
 
 #define CFG_SYS_UART_PORT		(0)
 
-#define CONFIG_WATCHDOG_TIMEOUT	3360	/* timeout in ms, max is 3.36 sec */
-
 /* I2C */
 
 #ifdef CONFIG_MCFFEC
include/configs/astro_mcf5373l.h +0 -10
index f5922fc416eb..62aa99342a0e 100644
@@ -69,16 +69,6 @@
 #define CFG_SYS_UART_PORT		(2)
 #define CFG_SYS_UART2_ALT3_GPIO
 
-/*
- * Watchdog configuration; Watchdog is disabled for running from RAM
- * and set to highest possible value else. Beware there is no check
- * in the watchdog code to validate the timeout value set here!
- */
-
-#ifndef CONFIG_MONITOR_IS_IN_RAM
-#define CONFIG_WATCHDOG_TIMEOUT 3355	/* timeout in milliseconds */
-#endif
-
 /*
  * Configuration for environment
  * Environment is located in the last sector of the flash
include/configs/cobra5272.h +0 -12
index 01828ea2011c..6d6e2fc69620 100644
@@ -42,18 +42,6 @@
 
 #define CFG_SYS_UART_PORT		(0)
 
-/* ---
- * set "#if 0" to "#if 1" if (Hardware)-WATCHDOG should be enabled & change
- * timeout acc. to your needs
- * #define CONFIG_WATCHDOG_TIMEOUT x , x is timeout in milliseconds, e. g. 10000
- * for 10 sec
- * ---
- */
-
-#if 0
-#define CONFIG_WATCHDOG_TIMEOUT 10000	/* timeout in milliseconds */
-#endif
-
 /* ---
  * CONFIG_MONITOR_IS_IN_RAM defines if u-boot is started from a different
  * bootloader residing in flash ('chainloading'); if you want to use
Signature · 1 line
2.25.1
author
#47 lore raw

cover Finish migration to Kconfig or CFG namespace

Hey all,

The intention of this series isn't to apply it just yet. This was a very quick scripted migration and so there's cases where we do more than one symbol, or we can see there's define but unused symbols. But it also shows that with the last few series I've posted, we're nearly done. With this series applied, everything builds still, and the resulting binaries seem to be the same (I'm doing a build where I keep before/after so I can check checksums now).

Signature · 1 line
Tom
author
#48 lore raw

PATCH 1/241 global: Migrate CONFIG_ARM_GIC_BASE_ADDRESS to CFG

---
 arch/arm/cpu/armv7/nonsec_virt.S | 4 ++--
 arch/arm/cpu/armv7/virt-v7.c     | 4 ++--
 include/configs/arndale.h        | 2 +-
 scripts/config_whitelist.txt     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/cpu/armv7/nonsec_virt.S +2 -2
index 39aeeb423f08..b6d144f065d2 100644
@@ -112,8 +112,8 @@ ENTRY(_do_nonsec_entry)
 ENDPROC(_do_nonsec_entry)
 
 .macro get_cbar_addr	addr
-#ifdef CONFIG_ARM_GIC_BASE_ADDRESS
-	ldr	\addr, =CONFIG_ARM_GIC_BASE_ADDRESS
+#ifdef CFG_ARM_GIC_BASE_ADDRESS
+	ldr	\addr, =CFG_ARM_GIC_BASE_ADDRESS
 #else
 	mrc	p15, 4, \addr, c15, c0, 0	@ read CBAR
 	bfc	\addr, #0, #15			@ clear reserved bits
arch/arm/cpu/armv7/virt-v7.c +2 -2
index 5ffeca13d913..c82b215b6f9c 100644
@@ -26,8 +26,8 @@ static unsigned int read_id_pfr1(void)
 
 static unsigned long get_gicd_base_address(void)
 {
-#ifdef CONFIG_ARM_GIC_BASE_ADDRESS
-	return CONFIG_ARM_GIC_BASE_ADDRESS + GIC_DIST_OFFSET;
+#ifdef CFG_ARM_GIC_BASE_ADDRESS
+	return CFG_ARM_GIC_BASE_ADDRESS + GIC_DIST_OFFSET;
 #else
 	unsigned periphbase;
 
include/configs/arndale.h +1 -1
index 7a244769e30a..8acc525b11c9 100644
@@ -19,6 +19,6 @@
 #define CONFIG_SMP_PEN_ADDR	0x02020000
 
 /* The PERIPHBASE in the CBAR register is wrong on the Arndale, so override it */
-#define CONFIG_ARM_GIC_BASE_ADDRESS	0x10480000
+#define CFG_ARM_GIC_BASE_ADDRESS	0x10480000
 
 #endif	/* __CONFIG_H */
scripts/config_whitelist.txt +1 -1
index 39e1071236bd..0d2cbddeed40 100644
@@ -1,4 +1,4 @@
-CONFIG_ARM_GIC_BASE_ADDRESS
+CFG_ARM_GIC_BASE_ADDRESS
 CONFIG_BOARDDIR
 CONFIG_DFU_ALT
 CONFIG_DFU_ALT_BOOT_EMMC
Signature · 1 line
2.25.1
author
#49 lore raw

PATCH 2/241 global: Migrate CONFIG_BOARDDIR to CFG

In reply to Tom Rini
---
 arch/sh/cpu/u-boot.lds       | 2 +-
 doc/README.kwbimage          | 2 +-
 scripts/Makefile.autoconf    | 2 +-
 scripts/config_whitelist.txt | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
arch/sh/cpu/u-boot.lds +1 -1
index d360eea7eba3..c31deecec659 100644
@@ -35,7 +35,7 @@ SECTIONS
 	.text :
 	{
 		KEEP(*/start.o		(.text))
-		KEEP(CONFIG_BOARDDIR/lowlevel_init.o	(.text .spiboot1.text))
+		KEEP(CFG_BOARDDIR/lowlevel_init.o	(.text .spiboot1.text))
 		KEEP(*(.spiboot2.text))
 		. = ALIGN(8192);
 #ifdef CONFIG_ENV_IS_IN_FLASH
doc/README.kwbimage +1 -1
index 762b2e3acb71..a1d247c32dd1 100644
@@ -42,7 +42,7 @@ Board specific configuration file specifications:
 	kwbimage.cfg.  The name can be set as part of the full path
 	to the file using CONFIG_SYS_KWD_CONFIG (probably in
 	include/configs/<yourboard>.h).   The path should look like:
-	$(CONFIG_BOARDDIR)/<yourkwbimagename>.cfg
+	$(CFG_BOARDDIR)/<yourkwbimagename>.cfg
 2. This file can have empty lines and lines starting with "#" as first
 	character to put comments
 3. This file can have configuration command lines as mentioned below,
scripts/Makefile.autoconf +1 -1
index 5a4a14895538..f5f5e4a4d540 100644
@@ -112,7 +112,7 @@ vpl/include/autoconf.mk: vpl/u-boot.cfg
 # Prior to Kconfig, it was generated by mkconfig. Now it is created here.
 define filechk_config_h
 	(echo "/* Automatically generated - do not edit */";		\
-	echo \#define CONFIG_BOARDDIR board/$(if $(VENDOR),$(VENDOR)/)$(BOARD);\
+	echo \#define CFG_BOARDDIR board/$(if $(VENDOR),$(VENDOR)/)$(BOARD);\
 	echo \#include \<config_uncmd_spl.h\>;				\
 	echo \#include \<configs/$(CONFIG_SYS_CONFIG_NAME).h\>;		\
 	echo \#include \<asm/config.h\>;				\
scripts/config_whitelist.txt +1 -1
index 0d2cbddeed40..14863642e4d3 100644
@@ -1,5 +1,5 @@
 CFG_ARM_GIC_BASE_ADDRESS
-CONFIG_BOARDDIR
+CFG_BOARDDIR
 CONFIG_DFU_ALT
 CONFIG_DFU_ALT_BOOT_EMMC
 CONFIG_DFU_ALT_BOOT_SD
Signature · 1 line
2.25.1
author
#50 lore raw

PATCH 3/241 global: Migrate CONFIG_DFU_ALT to CFG

In reply to Tom Rini
---
 board/samsung/common/exynos5-dt.c | 4 ++--
 board/samsung/odroid/odroid.c     | 4 ++--
 include/configs/odroid.h          | 8 ++++----
 include/configs/odroid_xu3.h      | 8 ++++----
 include/configs/s5p_goni.h        | 4 ++--
 include/configs/trats.h           | 4 ++--
 include/configs/trats2.h          | 4 ++--
 scripts/config_whitelist.txt      | 8 ++++----
 8 files changed, 22 insertions(+), 22 deletions(-)
board/samsung/common/exynos5-dt.c +2 -2
index 0d77a57f8082..cde77d79a0f6 100644
@@ -179,9 +179,9 @@ char *get_dfu_alt_boot(char *interface, char *devstr)
 		return NULL;
 
 	if (IS_SD(mmc))
-		alt_boot = CONFIG_DFU_ALT_BOOT_SD;
+		alt_boot = CFG_DFU_ALT_BOOT_SD;
 	else
-		alt_boot = CONFIG_DFU_ALT_BOOT_EMMC;
+		alt_boot = CFG_DFU_ALT_BOOT_EMMC;
 
 	return alt_boot;
 }
board/samsung/odroid/odroid.c +2 -2
index 35e4cee74f44..39a60e4ad295 100644
@@ -94,8 +94,8 @@ char *get_dfu_alt_boot(char *interface, char *devstr)
 	if (mmc_init(mmc))
 		return NULL;
 
-	alt_boot = IS_SD(mmc) ? CONFIG_DFU_ALT_BOOT_SD :
-				CONFIG_DFU_ALT_BOOT_EMMC;
+	alt_boot = IS_SD(mmc) ? CFG_DFU_ALT_BOOT_SD :
+				CFG_DFU_ALT_BOOT_EMMC;
 
 	return alt_boot;
 }
include/configs/odroid.h +4 -4
index f252b349437c..e2331e45cdfe 100644
@@ -27,7 +27,7 @@
 #define PARTS_BOOT		"boot"
 #define PARTS_ROOT		"platform"
 
-#define CONFIG_DFU_ALT \
+#define CFG_DFU_ALT \
 	"uImage fat 0 1;" \
 	"zImage fat 0 1;" \
 	"Image.itb fat 0 1;" \
@@ -39,13 +39,13 @@
 
 #define CONFIG_SET_DFU_ALT_BUF_LEN	(SZ_1K)
 
-#define CONFIG_DFU_ALT_BOOT_EMMC \
+#define CFG_DFU_ALT_BOOT_EMMC \
 	"u-boot raw 0x3e 0x800 mmcpart 1;" \
 	"bl1 raw 0x0 0x1e mmcpart 1;" \
 	"bl2 raw 0x1e 0x1d mmcpart 1;" \
 	"tzsw raw 0x83e 0x138 mmcpart 1\0"
 
-#define CONFIG_DFU_ALT_BOOT_SD \
+#define CFG_DFU_ALT_BOOT_SD \
 	"u-boot raw 0x3f 0x800;" \
 	"bl1 raw 0x1 0x1e;" \
 	"bl2 raw 0x1f 0x1d;" \
@@ -132,7 +132,7 @@
 	"mmcbootpart=1\0" \
 	"mmcrootdev=0\0" \
 	"mmcrootpart=2\0" \
-	"dfu_alt_system="CONFIG_DFU_ALT \
+	"dfu_alt_system="CFG_DFU_ALT \
 	"dfu_alt_info=Please reset the board\0" \
 	"consoleon=set console console=ttySAC1,115200n8; save; reset\0" \
 	"consoleoff=set console console=ram; save; reset\0" \
include/configs/odroid_xu3.h +4 -4
index 5bbe7aadcb25..7a81585494a9 100644
@@ -28,7 +28,7 @@
 #define CONFIG_G_DNL_UMS_VENDOR_NUM	0x0525
 #define CONFIG_G_DNL_UMS_PRODUCT_NUM	0xA4A5
 
-#define CONFIG_DFU_ALT_SYSTEM               \
+#define CFG_DFU_ALT_SYSTEM               \
 	"uImage fat 0 1;"                   \
 	"zImage fat 0 1;"                   \
 	"Image.itb fat 0 1;"                \
@@ -42,14 +42,14 @@
 	"boot part 0 1;"                    \
 	"root part 0 2\0"
 
-#define CONFIG_DFU_ALT_BOOT_EMMC           \
+#define CFG_DFU_ALT_BOOT_EMMC           \
 	"u-boot raw 0x3e 0x800 mmcpart 1;" \
 	"bl1 raw 0x0 0x1e mmcpart 1;"      \
 	"bl2 raw 0x1e 0x1d mmcpart 1;"     \
 	"tzsw raw 0x83e 0x200 mmcpart 1;"  \
 	"params.bin raw 0x1880 0x20\0"
 
-#define CONFIG_DFU_ALT_BOOT_SD   \
+#define CFG_DFU_ALT_BOOT_SD   \
 	"u-boot raw 0x3f 0x800;" \
 	"bl1 raw 0x1 0x1e;"      \
 	"bl2 raw 0x1f 0x1d;"     \
@@ -83,7 +83,7 @@
 	"mmcrootdev=0\0" \
 	"mmcbootpart=1\0" \
 	"mmcrootpart=2\0" \
-	"dfu_alt_system="CONFIG_DFU_ALT_SYSTEM \
+	"dfu_alt_system="CFG_DFU_ALT_SYSTEM \
 	"dfu_alt_info=Autoset by THOR/DFU command run.\0"
 
 #endif	/* __CONFIG_H */
include/configs/s5p_goni.h +2 -2
index fdade1ee66fa..b7a91af008c7 100644
@@ -42,7 +42,7 @@
 #define PARTS_CSC			"csc"
 #define PARTS_UMS			"ums"
 
-#define CONFIG_DFU_ALT \
+#define CFG_DFU_ALT \
 	"u-boot raw 0x80 0x400;" \
 	"uImage ext4 0 2;" \
 	"exynos3-goni.dtb ext4 0 2;" \
@@ -109,7 +109,7 @@
 	"ubiblock=8\0" \
 	"ubi=enabled\0" \
 	"opts=always_resume=1\0" \
-	"dfu_alt_info=" CONFIG_DFU_ALT "\0"
+	"dfu_alt_info=" CFG_DFU_ALT "\0"
 
 /* Goni has 3 banks of DRAM, but swap the bank */
 #define PHYS_SDRAM_1		CFG_SYS_SDRAM_BASE	/* OneDRAM Bank #0 */
include/configs/trats.h +2 -2
index ec18842bbe8c..3eac66539dfe 100644
@@ -39,7 +39,7 @@
 	"name="PARTS_DATA",size=3000MiB,uuid=${uuid_gpt_"PARTS_DATA"};" \
 	"name="PARTS_UMS",size=-,uuid=${uuid_gpt_"PARTS_UMS"}\0" \
 
-#define CONFIG_DFU_ALT \
+#define CFG_DFU_ALT \
 	"u-boot raw 0x80 0x400;" \
 	"/uImage ext4 0 2;" \
 	"/modem.bin ext4 0 2;" \
@@ -98,7 +98,7 @@
 	"mmcrootpart=5\0" \
 	"opts=always_resume=1\0" \
 	"partitions=" PARTS_DEFAULT \
-	"dfu_alt_info=" CONFIG_DFU_ALT \
+	"dfu_alt_info=" CFG_DFU_ALT \
 	"spladdr=0x40000100\0" \
 	"splsize=0x200\0" \
 	"splfile=falcon.bin\0" \
include/configs/trats2.h +2 -2
index 0aa331e39359..125d3e776a3f 100644
@@ -40,7 +40,7 @@
 	"name="PARTS_DATA",size=3000MiB,uuid=${uuid_gpt_"PARTS_DATA"};" \
 	"name="PARTS_UMS",size=-,uuid=${uuid_gpt_"PARTS_UMS"}\0" \
 
-#define CONFIG_DFU_ALT \
+#define CFG_DFU_ALT \
 	"u-boot raw 0x80 0x800;" \
 	"/uImage ext4 0 2;" \
 	"/modem.bin ext4 0 2;" \
@@ -86,7 +86,7 @@
 	"mmcrootpart=5\0" \
 	"opts=always_resume=1\0" \
 	"partitions=" PARTS_DEFAULT \
-	"dfu_alt_info=" CONFIG_DFU_ALT \
+	"dfu_alt_info=" CFG_DFU_ALT \
 	"uartpath=ap\0" \
 	"usbpath=ap\0" \
 	"consoleon=set console console=ttySAC2,115200n8; save; reset\0" \
scripts/config_whitelist.txt +4 -4
index 14863642e4d3..880e963e1d0f 100644
@@ -1,9 +1,9 @@
 CFG_ARM_GIC_BASE_ADDRESS
 CFG_BOARDDIR
-CONFIG_DFU_ALT
-CONFIG_DFU_ALT_BOOT_EMMC
-CONFIG_DFU_ALT_BOOT_SD
-CONFIG_DFU_ALT_SYSTEM
+CFG_DFU_ALT
+CFG_DFU_ALT_BOOT_EMMC
+CFG_DFU_ALT_BOOT_SD
+CFG_DFU_ALT_SYSTEM
 CONFIG_DFU_ENV_SETTINGS
 CONFIG_DM9000_BASE
 CONFIG_DM9000_BYTE_SWAPPED
Signature · 1 line
2.25.1
author
#51 lore raw

PATCH 4/241 global: Migrate CONFIG_DFU_ENV_SETTINGS to CFG

In reply to Tom Rini
---
 include/configs/mx7dsabresd.h | 4 ++--
 include/configs/pico-imx6.h   | 4 ++--
 include/configs/pico-imx6ul.h | 4 ++--
 include/configs/pico-imx7d.h  | 4 ++--
 include/configs/warp7.h       | 4 ++--
 scripts/config_whitelist.txt  | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)
include/configs/mx7dsabresd.h +2 -2
index 6c165521f7a0..377e4d9c4b27 100644
@@ -44,7 +44,7 @@
 	"initrd_high=0xffffffff\0" \
 	"bootcmd_mfg=run mfgtool_args;bootz ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
 
-#define CONFIG_DFU_ENV_SETTINGS \
+#define CFG_DFU_ENV_SETTINGS \
 	"dfu_alt_info=image raw 0 0x800000;"\
 		"u-boot raw 0 0x4000;"\
 		"bootimg part 0 1;"\
@@ -53,7 +53,7 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	UPDATE_M4_ENV \
 	CONFIG_MFG_ENV_SETTINGS \
-	CONFIG_DFU_ENV_SETTINGS \
+	CFG_DFU_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
 	"console=ttymxc0\0" \
include/configs/pico-imx6.h +2 -2
index 6d7873daa0ad..719b70144051 100644
@@ -21,7 +21,7 @@
 
 #define DFU_DEFAULT_POLL_TIMEOUT 300
 
-#define CONFIG_DFU_ENV_SETTINGS \
+#define CFG_DFU_ENV_SETTINGS \
 	"dfu_alt_info=" \
 		"spl raw 0x2 0x400;" \
 		"u-boot raw 0x8a 0x1000;" \
@@ -47,7 +47,7 @@
 	"fdt_addr_r=0x18000000\0" \
 	"fdt_addr=0x18000000\0" \
 	"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
-	CONFIG_DFU_ENV_SETTINGS \
+	CFG_DFU_ENV_SETTINGS \
 	"finduuid=part uuid mmc 0:1 uuid\0" \
 	"findfdt="\
 		"if test $baseboard = hobbit && test $board_rev = MX6Q ; then " \
include/configs/pico-imx6ul.h +2 -2
index 8af8883fad64..5dfd737cf7a4 100644
@@ -30,7 +30,7 @@
 
 #define DFU_DEFAULT_POLL_TIMEOUT 300
 
-#define CONFIG_DFU_ENV_SETTINGS \
+#define CFG_DFU_ENV_SETTINGS \
 	"dfu_alt_info=" \
 		"spl raw 0x2 0x400;" \
 		"u-boot raw 0x8a 0x400;" \
@@ -65,7 +65,7 @@
 	"ramdiskaddr=0x83000000\0" \
 	"scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
 	"mmcautodetect=yes\0" \
-	CONFIG_DFU_ENV_SETTINGS \
+	CFG_DFU_ENV_SETTINGS \
 	"findfdt=" \
 		"if test $fdtfile = ask ; then " \
 			"bootmenu -1; fi;" \
include/configs/pico-imx7d.h +2 -2
index 83907b06ebb4..581921510426 100644
@@ -15,7 +15,7 @@
 /* MMC Config */
 #define CFG_SYS_FSL_ESDHC_ADDR	0
 
-#define CONFIG_DFU_ENV_SETTINGS \
+#define CFG_DFU_ENV_SETTINGS \
 	"dfu_alt_info=" \
 		"spl raw 0x2 0x400;" \
 		"u-boot raw 0x8a 0x1000;" \
@@ -67,7 +67,7 @@
 	"ramdisk_addr_r=0x83000000\0" \
 	"ramdiskaddr=0x83000000\0" \
 	"scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
-	CONFIG_DFU_ENV_SETTINGS \
+	CFG_DFU_ENV_SETTINGS \
 	"findfdt=" \
 		"if test $fdtfile = ask ; then " \
 			"bootmenu -1; fi;" \
include/configs/warp7.h +2 -2
index 56c90aa1032e..3cdf4a1ffc67 100644
@@ -16,7 +16,7 @@
 /* MMC Config*/
 #define CFG_SYS_FSL_ESDHC_ADDR       USDHC3_BASE_ADDR
 
-#define CONFIG_DFU_ENV_SETTINGS \
+#define CFG_DFU_ENV_SETTINGS \
 	"dfu_alt_info=boot raw 0x2 0x1000 mmcpart 1\0" \
 
 /* When booting with FIT specify the node entry containing boot.scr */
@@ -27,7 +27,7 @@
 #endif
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
-	CONFIG_DFU_ENV_SETTINGS \
+	CFG_DFU_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"bootscr_fitimage_name=bootscr\0" \
 	"script_signed=boot.scr.imx-signed\0" \
scripts/config_whitelist.txt +1 -1
index 880e963e1d0f..414f0078e4d7 100644
@@ -4,7 +4,7 @@ CFG_DFU_ALT
 CFG_DFU_ALT_BOOT_EMMC
 CFG_DFU_ALT_BOOT_SD
 CFG_DFU_ALT_SYSTEM
-CONFIG_DFU_ENV_SETTINGS
+CFG_DFU_ENV_SETTINGS
 CONFIG_DM9000_BASE
 CONFIG_DM9000_BYTE_SWAPPED
 CONFIG_DM9000_NO_SROM
Signature · 1 line
2.25.1
author
#52 lore raw

PATCH 5/241 global: Migrate CONFIG_DM9000_BASE to CFG

In reply to Tom Rini
---
 board/timll/devkit8000/devkit8000.c | 4 ++--
 include/configs/M5253DEMO.h         | 6 +++---
 include/configs/at91sam9261ek.h     | 6 +++---
 include/configs/ci20.h              | 6 +++---
 include/configs/devkit8000.h        | 6 +++---
 scripts/config_whitelist.txt        | 2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)
board/timll/devkit8000/devkit8000.c +2 -2
index 0808ca1a54c0..39103de02ed4 100644
@@ -79,7 +79,7 @@ int board_init(void)
 static void gpmc_dm9000_config(void)
 {
 	enable_gpmc_cs_config(gpmc_net_config, &gpmc_cfg->cs[6],
-		CONFIG_DM9000_BASE, GPMC_SIZE_16M);
+		CFG_DM9000_BASE, GPMC_SIZE_16M);
 }
 
 /*
@@ -102,7 +102,7 @@ int misc_init_r(void)
 #ifdef CONFIG_DRIVER_DM9000
 	/* Configure GPMC registers for DM9000 */
 	enable_gpmc_cs_config(gpmc_net_config, &gpmc_cfg->cs[6],
-			CONFIG_DM9000_BASE, GPMC_SIZE_16M);
+			CFG_DM9000_BASE, GPMC_SIZE_16M);
 
 	/* Use OMAP DIE_ID as MAC address */
 	if (!eth_env_get_enetaddr("ethaddr", enetaddr)) {
include/configs/M5253DEMO.h +3 -3
index 7e37c6d11997..223a843fc695 100644
@@ -20,9 +20,9 @@
 	env/embedded.o(.text*);
 
 #ifdef CONFIG_DRIVER_DM9000
-#	define CONFIG_DM9000_BASE	(CFG_SYS_CS1_BASE | 0x300)
-#	define DM9000_IO		CONFIG_DM9000_BASE
-#	define DM9000_DATA		(CONFIG_DM9000_BASE + 4)
+#	define CFG_DM9000_BASE	(CFG_SYS_CS1_BASE | 0x300)
+#	define DM9000_IO		CFG_DM9000_BASE
+#	define DM9000_DATA		(CFG_DM9000_BASE + 4)
 #	undef CONFIG_DM9000_DEBUG
 #	define CONFIG_DM9000_BYTE_SWAPPED
 
include/configs/at91sam9261ek.h +3 -3
index 56247e390bf6..d58c0f4bbe24 100644
@@ -35,9 +35,9 @@
 #endif
 
 /* Ethernet */
-#define CONFIG_DM9000_BASE		0x30000000
-#define DM9000_IO			CONFIG_DM9000_BASE
-#define DM9000_DATA			(CONFIG_DM9000_BASE + 4)
+#define CFG_DM9000_BASE		0x30000000
+#define DM9000_IO			CFG_DM9000_BASE
+#define DM9000_DATA			(CFG_DM9000_BASE + 4)
 #define CONFIG_DM9000_USE_16BIT
 #define CONFIG_DM9000_NO_SROM
 
include/configs/ci20.h +3 -3
index 3329c24fa68c..bc8b699b84f8 100644
@@ -18,9 +18,9 @@
 #define CFG_SYS_NS16550_CLK		48000000
 
 /* Ethernet: davicom DM9000 */
-#define CONFIG_DM9000_BASE		0xb6000000
-#define DM9000_IO			CONFIG_DM9000_BASE
-#define DM9000_DATA			(CONFIG_DM9000_BASE + 2)
+#define CFG_DM9000_BASE		0xb6000000
+#define DM9000_IO			CFG_DM9000_BASE
+#define DM9000_DATA			(CFG_DM9000_BASE + 2)
 
 /* Miscellaneous configuration options */
 
include/configs/devkit8000.h +3 -3
index 46410595c2bc..824e0e448eea 100644
@@ -18,9 +18,9 @@
 
 /* Hardware drivers */
 /* DM9000 */
-#define	CONFIG_DM9000_BASE		0x2c000000
-#define	DM9000_IO			CONFIG_DM9000_BASE
-#define	DM9000_DATA			(CONFIG_DM9000_BASE + 0x400)
+#define	CFG_DM9000_BASE		0x2c000000
+#define	DM9000_IO			CFG_DM9000_BASE
+#define	DM9000_DATA			(CFG_DM9000_BASE + 0x400)
 #define	CONFIG_DM9000_USE_16BIT		1
 #define CONFIG_DM9000_NO_SROM		1
 #undef	CONFIG_DM9000_DEBUG
scripts/config_whitelist.txt +1 -1
index 414f0078e4d7..7c6fc0a07bf7 100644
@@ -5,7 +5,7 @@ CFG_DFU_ALT_BOOT_EMMC
 CFG_DFU_ALT_BOOT_SD
 CFG_DFU_ALT_SYSTEM
 CFG_DFU_ENV_SETTINGS
-CONFIG_DM9000_BASE
+CFG_DM9000_BASE
 CONFIG_DM9000_BYTE_SWAPPED
 CONFIG_DM9000_NO_SROM
 CONFIG_DM9000_USE_16BIT
Signature · 1 line
2.25.1
author
#53 lore raw

PATCH 6/241 global: Migrate CONFIG_DM9000_BYTE_SWAPPED to CFG

In reply to Tom Rini
---
 drivers/net/dm9000x.c        | 2 +-
 include/configs/M5253DEMO.h  | 2 +-
 scripts/config_whitelist.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/net/dm9000x.c +1 -1
index 07733df533e2..6bf316263d59 100644
@@ -83,7 +83,7 @@ struct dm9000_priv {
 };
 
 /* DM9000 network board routine ---------------------------- */
-#ifndef CONFIG_DM9000_BYTE_SWAPPED
+#ifndef CFG_DM9000_BYTE_SWAPPED
 #define dm9000_outb(d, r) writeb((d), (r))
 #define dm9000_outw(d, r) writew((d), (r))
 #define dm9000_outl(d, r) writel((d), (r))
include/configs/M5253DEMO.h +1 -1
index 223a843fc695..4be4d0f84512 100644
@@ -24,7 +24,7 @@
 #	define DM9000_IO		CFG_DM9000_BASE
 #	define DM9000_DATA		(CFG_DM9000_BASE + 4)
 #	undef CONFIG_DM9000_DEBUG
-#	define CONFIG_DM9000_BYTE_SWAPPED
+#	define CFG_DM9000_BYTE_SWAPPED
 
 #	define CONFIG_OVERWRITE_ETHADDR_ONCE
 
scripts/config_whitelist.txt +1 -1
index 7c6fc0a07bf7..005b893b317c 100644
@@ -6,7 +6,7 @@ CFG_DFU_ALT_BOOT_SD
 CFG_DFU_ALT_SYSTEM
 CFG_DFU_ENV_SETTINGS
 CFG_DM9000_BASE
-CONFIG_DM9000_BYTE_SWAPPED
+CFG_DM9000_BYTE_SWAPPED
 CONFIG_DM9000_NO_SROM
 CONFIG_DM9000_USE_16BIT
 CONFIG_DW_WDT_CLOCK_KHZ
Signature · 1 line
2.25.1
author
#54 lore raw

PATCH 7/241 global: Migrate CONFIG_DM9000_NO_SROM to CFG

In reply to Tom Rini
---
 drivers/net/dm9000x.c           | 2 +-
 include/configs/at91sam9261ek.h | 2 +-
 include/configs/devkit8000.h    | 2 +-
 scripts/config_whitelist.txt    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
drivers/net/dm9000x.c +1 -1
index 6bf316263d59..514b8db2ce1e 100644
@@ -550,7 +550,7 @@ static int dm9000_recv_common(struct dm9000_priv *db, uchar *rdptr)
 /*
  * Read a word data from SROM
  */
-#if !defined(CONFIG_DM9000_NO_SROM)
+#if !defined(CFG_DM9000_NO_SROM)
 static void dm9000_read_srom_word(struct dm9000_priv *db, int offset, u8 *to)
 {
 	dm9000_iow(db, DM9000_EPAR, offset);
include/configs/at91sam9261ek.h +1 -1
index d58c0f4bbe24..a9bbbd39484a 100644
@@ -39,7 +39,7 @@
 #define DM9000_IO			CFG_DM9000_BASE
 #define DM9000_DATA			(CFG_DM9000_BASE + 4)
 #define CONFIG_DM9000_USE_16BIT
-#define CONFIG_DM9000_NO_SROM
+#define CFG_DM9000_NO_SROM
 
 /* USB */
 #define CFG_SYS_USB_OHCI_REGS_BASE		0x00500000	/* AT91SAM9261_UHP_BASE */
include/configs/devkit8000.h +1 -1
index 824e0e448eea..1694bf1cd3e1 100644
@@ -22,7 +22,7 @@
 #define	DM9000_IO			CFG_DM9000_BASE
 #define	DM9000_DATA			(CFG_DM9000_BASE + 0x400)
 #define	CONFIG_DM9000_USE_16BIT		1
-#define CONFIG_DM9000_NO_SROM		1
+#define CFG_DM9000_NO_SROM		1
 #undef	CONFIG_DM9000_DEBUG
 
 /* TWL4030 */
scripts/config_whitelist.txt +1 -1
index 005b893b317c..85adbafa58fe 100644
@@ -7,7 +7,7 @@ CFG_DFU_ALT_SYSTEM
 CFG_DFU_ENV_SETTINGS
 CFG_DM9000_BASE
 CFG_DM9000_BYTE_SWAPPED
-CONFIG_DM9000_NO_SROM
+CFG_DM9000_NO_SROM
 CONFIG_DM9000_USE_16BIT
 CONFIG_DW_WDT_CLOCK_KHZ
 CONFIG_ENV_FLAGS_LIST_STATIC
Signature · 1 line
2.25.1
author
#55 lore raw

PATCH 8/241 global: Migrate CONFIG_DM9000_USE_16BIT to CFG

In reply to Tom Rini
---
 include/configs/at91sam9261ek.h | 2 +-
 include/configs/devkit8000.h    | 2 +-
 scripts/config_whitelist.txt    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
include/configs/at91sam9261ek.h +1 -1
index a9bbbd39484a..9a3928f3fa87 100644
@@ -38,7 +38,7 @@
 #define CFG_DM9000_BASE		0x30000000
 #define DM9000_IO			CFG_DM9000_BASE
 #define DM9000_DATA			(CFG_DM9000_BASE + 4)
-#define CONFIG_DM9000_USE_16BIT
+#define CFG_DM9000_USE_16BIT
 #define CFG_DM9000_NO_SROM
 
 /* USB */
include/configs/devkit8000.h +1 -1
index 1694bf1cd3e1..c8b176542d95 100644
@@ -21,7 +21,7 @@
 #define	CFG_DM9000_BASE		0x2c000000
 #define	DM9000_IO			CFG_DM9000_BASE
 #define	DM9000_DATA			(CFG_DM9000_BASE + 0x400)
-#define	CONFIG_DM9000_USE_16BIT		1
+#define	CFG_DM9000_USE_16BIT		1
 #define CFG_DM9000_NO_SROM		1
 #undef	CONFIG_DM9000_DEBUG
 
scripts/config_whitelist.txt +1 -1
index 85adbafa58fe..43234d822457 100644
@@ -8,7 +8,7 @@ CFG_DFU_ENV_SETTINGS
 CFG_DM9000_BASE
 CFG_DM9000_BYTE_SWAPPED
 CFG_DM9000_NO_SROM
-CONFIG_DM9000_USE_16BIT
+CFG_DM9000_USE_16BIT
 CONFIG_DW_WDT_CLOCK_KHZ
 CONFIG_ENV_FLAGS_LIST_STATIC
 CONFIG_ENV_IS_EMBEDDED
Signature · 1 line
2.25.1
author
#56 lore raw

PATCH 9/241 global: Migrate CONFIG_DW_WDT_CLOCK_KHZ to CFG

In reply to Tom Rini
---
 drivers/watchdog/designware_wdt.c      | 2 +-
 include/configs/socfpga_common.h       | 2 +-
 include/configs/socfpga_soc64_common.h | 4 ++--
 scripts/config_whitelist.txt           | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
drivers/watchdog/designware_wdt.c +1 -1
index cad756aeaf20..0eeb2efee2f5 100644
@@ -132,7 +132,7 @@ static int designware_wdt_probe(struct udevice *dev)
 		goto err;
 	}
 #else
-	priv->clk_khz = CONFIG_DW_WDT_CLOCK_KHZ;
+	priv->clk_khz = CFG_DW_WDT_CLOCK_KHZ;
 #endif
 
 	if (CONFIG_IS_ENABLED(DM_RESET)) {
include/configs/socfpga_common.h +1 -1
index bbbdea6664ca..807bff43e00a 100644
@@ -64,7 +64,7 @@
 /*
  * L4 Watchdog
  */
-#define CONFIG_DW_WDT_CLOCK_KHZ		25000
+#define CFG_DW_WDT_CLOCK_KHZ		25000
 
 /*
  * NAND Support
include/configs/socfpga_soc64_common.h +2 -2
index 47089f312d2c..df3927297bbe 100644
@@ -90,10 +90,10 @@
 #ifdef CONFIG_TARGET_SOCFPGA_STRATIX10
 #ifndef __ASSEMBLY__
 unsigned int cm_get_l4_sys_free_clk_hz(void);
-#define CONFIG_DW_WDT_CLOCK_KHZ		(cm_get_l4_sys_free_clk_hz() / 1000)
+#define CFG_DW_WDT_CLOCK_KHZ		(cm_get_l4_sys_free_clk_hz() / 1000)
 #endif
 #else
-#define CONFIG_DW_WDT_CLOCK_KHZ		100000
+#define CFG_DW_WDT_CLOCK_KHZ		100000
 #endif
 
 /*
scripts/config_whitelist.txt +1 -1
index 43234d822457..97ad18677f1d 100644
@@ -9,7 +9,7 @@ CFG_DM9000_BASE
 CFG_DM9000_BYTE_SWAPPED
 CFG_DM9000_NO_SROM
 CFG_DM9000_USE_16BIT
-CONFIG_DW_WDT_CLOCK_KHZ
+CFG_DW_WDT_CLOCK_KHZ
 CONFIG_ENV_FLAGS_LIST_STATIC
 CONFIG_ENV_IS_EMBEDDED
 CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS
Signature · 1 line
2.25.1
author
#57 lore raw

PATCH 10/241 global: Migrate CONFIG_ENV_FLAGS_LIST_STATIC to CFG

In reply to Tom Rini
---
 README                            | 6 +++---
 include/configs/aristainetos2.h   | 2 +-
 include/configs/imx6q-bosch-acc.h | 2 +-
 include/env_flags.h               | 6 +++---
 scripts/config_whitelist.txt      | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)
README +3 -3
index 103562bbbe8d..71767e32d11b 100644
@@ -1132,7 +1132,7 @@ The following options need to be configured:
 		The same can be accomplished in a more flexible way
 		for any variable by configuring the type of access
 		to allow for those variables in the ".flags" variable
-		or define CONFIG_ENV_FLAGS_LIST_STATIC.
+		or define CFG_ENV_FLAGS_LIST_STATIC.
 
 - Protected RAM:
 		CONFIG_PRAM
@@ -1496,7 +1496,7 @@ Configuration Settings:
 		this option if you really know what you are doing.
 
 - CONFIG_ENV_FLAGS_LIST_DEFAULT
-- CONFIG_ENV_FLAGS_LIST_STATIC
+- CFG_ENV_FLAGS_LIST_STATIC
 	Enable validation of the values given to environment variables when
 	calling env set.  Variables can be restricted to only decimal,
 	hexadecimal, or boolean.  If CONFIG_CMD_NET is also defined,
@@ -1527,7 +1527,7 @@ Configuration Settings:
 		Define this to a list (string) to define the ".flags"
 		environment variable in the default or embedded environment.
 
-	- CONFIG_ENV_FLAGS_LIST_STATIC
+	- CFG_ENV_FLAGS_LIST_STATIC
 		Define this to a list (string) to define validation that
 		should be done if an entry is not found in the ".flags"
 		environment variable.  To override a setting in the static
include/configs/aristainetos2.h +1 -1
index 6faf544d21b6..e80166b3c467 100644
@@ -420,7 +420,7 @@
 
 /* UBI support */
 
-#define CONFIG_ENV_FLAGS_LIST_STATIC "ethaddr:mw,serial#:sw,board_type:sw," \
+#define CFG_ENV_FLAGS_LIST_STATIC "ethaddr:mw,serial#:sw,board_type:sw," \
 		"sysnum:dw,panel:sw,ipaddr:iw,serverip:iw"
 
 #endif                         /* __ARISTAINETOS2_CONFIG_H */
include/configs/imx6q-bosch-acc.h +1 -1
index 99da081cdae8..392f97050a65 100644
@@ -45,7 +45,7 @@
 	"save_env=env save; env save\0" \
 	"altbootcmd=run handle_ustate; run switch_bootset; run save_env; run bootcmd\0"
 
-#define CONFIG_ENV_FLAGS_LIST_STATIC \
+#define CFG_ENV_FLAGS_LIST_STATIC \
 	"bootset:bw," \
 	"clone_pending:bw," \
 	"endurance_test:bw," \
include/env_flags.h +3 -3
index 313cb8c49a6d..e4e40169aed0 100644
@@ -35,8 +35,8 @@ enum env_flags_varaccess {
 #define ENV_FLAGS_VARTYPE_LOC 0
 #define ENV_FLAGS_VARACCESS_LOC 1
 
-#ifndef CONFIG_ENV_FLAGS_LIST_STATIC
-#define CONFIG_ENV_FLAGS_LIST_STATIC ""
+#ifndef CFG_ENV_FLAGS_LIST_STATIC
+#define CFG_ENV_FLAGS_LIST_STATIC ""
 #endif
 
 #ifdef CONFIG_NET
@@ -77,7 +77,7 @@ enum env_flags_varaccess {
 	ETHADDR_FLAGS \
 	NET_FLAGS \
 	SERIAL_FLAGS \
-	CONFIG_ENV_FLAGS_LIST_STATIC
+	CFG_ENV_FLAGS_LIST_STATIC
 
 #ifdef CONFIG_CMD_ENV_FLAGS
 /*
scripts/config_whitelist.txt +1 -1
index 97ad18677f1d..8d9496e6edba 100644
@@ -10,7 +10,7 @@ CFG_DM9000_BYTE_SWAPPED
 CFG_DM9000_NO_SROM
 CFG_DM9000_USE_16BIT
 CFG_DW_WDT_CLOCK_KHZ
-CONFIG_ENV_FLAGS_LIST_STATIC
+CFG_ENV_FLAGS_LIST_STATIC
 CONFIG_ENV_IS_EMBEDDED
 CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS
 CONFIG_ENV_SETTINGS_NAND_V1
Signature · 1 line
2.25.1
author
#58 lore raw

PATCH 11/241 global: Migrate CONFIG_ENV_IS_EMBEDDED to CFG

In reply to Tom Rini
---
 env/Makefile                 |  2 +-
 include/env_internal.h       | 12 ++++++------
 scripts/config_whitelist.txt |  2 +-
 tools/Makefile               |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)
env/Makefile +1 -1
index c4ad65432865..78e82173507f 100644
@@ -11,7 +11,7 @@ obj-$(CONFIG_$(SPL_TPL_)ENV_SUPPORT) += flags.o
 ifndef CONFIG_SPL_BUILD
 obj-y += callback.o
 obj-$(CONFIG_ENV_IS_IN_EEPROM) += eeprom.o
-extra-$(CONFIG_ENV_IS_EMBEDDED) += embedded.o
+extra-$(CFG_ENV_IS_EMBEDDED) += embedded.o
 obj-$(CONFIG_ENV_IS_IN_EEPROM) += embedded.o
 extra-$(CONFIG_ENV_IS_IN_FLASH) += embedded.o
 obj-$(CONFIG_ENV_IS_IN_NVRAM) += embedded.o
include/env_internal.h +6 -6
index f30fd6159d87..690e6da81078 100644
@@ -41,8 +41,8 @@
 	(CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
 #  define ENV_IS_EMBEDDED
 # endif
-# ifdef CONFIG_ENV_IS_EMBEDDED
-#  error "do not define CONFIG_ENV_IS_EMBEDDED in your board config"
+# ifdef CFG_ENV_IS_EMBEDDED
+#  error "do not define CFG_ENV_IS_EMBEDDED in your board config"
 #  error "it is calculated automatically for you"
 # endif
 #endif	/* CONFIG_ENV_IS_IN_FLASH */
@@ -61,15 +61,15 @@ extern unsigned long nand_env_oob_offset;
  * For the flash types where embedded env is supported, but it cannot be
  * calculated automatically (i.e. NAND), take the board opt-in.
  */
-#if defined(CONFIG_ENV_IS_EMBEDDED) && !defined(ENV_IS_EMBEDDED)
+#if defined(CFG_ENV_IS_EMBEDDED) && !defined(ENV_IS_EMBEDDED)
 # define ENV_IS_EMBEDDED
 #endif
 
 /* The build system likes to know if the env is embedded */
 #ifdef DO_DEPS_ONLY
 # ifdef ENV_IS_EMBEDDED
-#  ifndef CONFIG_ENV_IS_EMBEDDED
-#   define CONFIG_ENV_IS_EMBEDDED
+#  ifndef CFG_ENV_IS_EMBEDDED
+#   define CFG_ENV_IS_EMBEDDED
 #  endif
 # endif
 #endif
@@ -88,7 +88,7 @@ extern unsigned long nand_env_oob_offset;
  * If the environment is in RAM, allocate extra space for it in the malloc
  * region.
  */
-#if defined(CONFIG_ENV_IS_EMBEDDED)
+#if defined(CFG_ENV_IS_EMBEDDED)
 #define TOTAL_MALLOC_LEN	CONFIG_SYS_MALLOC_LEN
 #elif (CONFIG_ENV_ADDR + CONFIG_ENV_SIZE < CONFIG_SYS_MONITOR_BASE) || \
       (CONFIG_ENV_ADDR >= CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) || \
scripts/config_whitelist.txt +1 -1
index 8d9496e6edba..040b0c89049a 100644
@@ -11,7 +11,7 @@ CFG_DM9000_NO_SROM
 CFG_DM9000_USE_16BIT
 CFG_DW_WDT_CLOCK_KHZ
 CFG_ENV_FLAGS_LIST_STATIC
-CONFIG_ENV_IS_EMBEDDED
+CFG_ENV_IS_EMBEDDED
 CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS
 CONFIG_ENV_SETTINGS_NAND_V1
 CONFIG_ENV_SETTINGS_NAND_V2
tools/Makefile +1 -1
index 26be0a7ba2ea..b76876307a74 100644
@@ -36,7 +36,7 @@ endif
 subdir-$(HOST_TOOLS_ALL) += gdb
 
 # Merge all the different vars for envcrc into one
-ENVCRC-$(CONFIG_ENV_IS_EMBEDDED) = y
+ENVCRC-$(CFG_ENV_IS_EMBEDDED) = y
 ENVCRC-$(CONFIG_ENV_IS_IN_EEPROM) = y
 ENVCRC-$(CONFIG_ENV_IS_IN_FLASH) = y
 ENVCRC-$(CONFIG_ENV_IS_IN_ONENAND) = y
Signature · 1 line
2.25.1
author
#59 lore raw

PATCH 12/241 global: Migrate CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS to CFG

In reply to Tom Rini
---
 include/configs/draco.h      | 4 ++--
 include/configs/etamin.h     | 4 ++--
 include/configs/pxm2.h       | 4 ++--
 include/configs/rastaban.h   | 4 ++--
 include/configs/thuban.h     | 4 ++--
 scripts/config_whitelist.txt | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)
include/configs/draco.h +2 -2
index 4869008da440..d1c7abe1b392 100644
@@ -19,7 +19,7 @@
 #define BOARD_DFU_BUTTON_GPIO	27	/* Use as default */
 #define GPIO_LAN9303_NRST	88	/* GPIO2_24 = gpio88 */
 
-#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+#define CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	"button_dfu0=27\0" \
 	"led0=103,1,0\0" \
 	"led1=64,0,1\0"
@@ -34,7 +34,7 @@
 	"nand_img_size=0x400000\0" \
 	"optargs=\0" \
 	"preboot=draco_led 0\0" \
-	CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	CONFIG_ENV_SETTINGS_V2 \
 	CONFIG_ENV_SETTINGS_NAND_V2
 
include/configs/etamin.h +2 -2
index 6647148c96f4..d6c313d18e2a 100644
@@ -56,7 +56,7 @@
 #define BOARD_DFU_BUTTON_GPIO	27
 #define GPIO_LAN9303_NRST	88	/* GPIO2_24 = gpio88 */
 /* In dfu mode keep led1 on */
-#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+#define CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	"button_dfu0=27\0" \
 	"button_dfu1=87\0" \
 	"led0=3,0,1\0" \
@@ -144,7 +144,7 @@
 	"nand_img_size=0x400000\0" \
 	"optargs=\0" \
 	"preboot=draco_led 0\0" \
-	CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	CONFIG_ENV_SETTINGS_V2 \
 	CONFIG_ENV_SETTINGS_NAND_V2
 #endif	/* CONFIG_SPL_BUILD */
include/configs/pxm2.h +2 -2
index 586a7edcbb52..eafa6ae9a9a0 100644
@@ -18,7 +18,7 @@
 #define DDR_IOCTRL_VAL		0x18b
 #define DDR_PLL_FREQ		266
 
-#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+#define CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	"button_dfu0=59\0" \
 	"led0=117,0,1\0" \
 
@@ -34,7 +34,7 @@
 	"nand_img_size=0x500000\0" \
 	"optargs=\0" \
 	"preboot=draco_led 0\0" \
-	CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	"splashpos=m,m\0"	\
 	CONFIG_ENV_SETTINGS_V1 \
 	CONFIG_ENV_SETTINGS_NAND_V1 \
include/configs/rastaban.h +2 -2
index 49cd11c17b44..2e002faf2e60 100644
@@ -21,7 +21,7 @@
 #define BOARD_DFU_BUTTON_GPIO	27
 #define GPIO_LAN9303_NRST	88	/* GPIO2_24 = gpio88 */
 /* In dfu mode keep led1 on */
-#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+#define CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	"button_dfu0=27\0" \
 	"button_dfu1=87\0" \
 	"led0=3,0,1\0" \
@@ -44,7 +44,7 @@
 	"nand_img_size=0x400000\0" \
 	"optargs=\0" \
 	"preboot=draco_led 0\0" \
-	CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	CONFIG_ENV_SETTINGS_V2 \
 	CONFIG_ENV_SETTINGS_NAND_V2
 
include/configs/thuban.h +2 -2
index 696306e46592..25c5a8ccd20e 100644
@@ -19,7 +19,7 @@
 #define BOARD_DFU_BUTTON_GPIO	27	/* Use as default */
 #define GPIO_LAN9303_NRST	88	/* GPIO2_24 = gpio88 */
 
-#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+#define CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	"button_dfu0=27\0" \
 	"led0=103,1,0\0" \
 	"led1=64,0,1\0"
@@ -37,7 +37,7 @@
 	"nand_img_size=0x400000\0" \
 	"optargs=\0" \
 	"preboot=draco_led 0\0" \
-	CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	CONFIG_ENV_SETTINGS_V2 \
 	CONFIG_ENV_SETTINGS_NAND_V2
 
scripts/config_whitelist.txt +1 -1
index 040b0c89049a..cb880dc317fc 100644
@@ -12,7 +12,7 @@ CFG_DM9000_USE_16BIT
 CFG_DW_WDT_CLOCK_KHZ
 CFG_ENV_FLAGS_LIST_STATIC
 CFG_ENV_IS_EMBEDDED
-CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS
+CFG_ENV_SETTINGS_BUTTONS_AND_LEDS
 CONFIG_ENV_SETTINGS_NAND_V1
 CONFIG_ENV_SETTINGS_NAND_V2
 CONFIG_ENV_SETTINGS_V1
Signature · 1 line
2.25.1
author
#60 lore raw

PATCH 13/241 global: Migrate CONFIG_ENV_SETTINGS_NAND_V1 to CFG

In reply to Tom Rini
---
 include/configs/pxm2.h                 | 2 +-
 include/configs/rut.h                  | 2 +-
 include/configs/siemens-am33x-common.h | 2 +-
 scripts/config_whitelist.txt           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
include/configs/pxm2.h +1 -1
index eafa6ae9a9a0..c6a01270a54d 100644
@@ -37,7 +37,7 @@
 	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	"splashpos=m,m\0"	\
 	CONFIG_ENV_SETTINGS_V1 \
-	CONFIG_ENV_SETTINGS_NAND_V1 \
+	CFG_ENV_SETTINGS_NAND_V1 \
 	"mmc_dev=0\0" \
 	"mmc_root=/dev/mmcblk0p2 rw\0" \
 	"mmc_root_fs_type=ext4 rootwait\0" \
include/configs/rut.h +1 -1
index ac48372b6c0b..f51771f9ca46 100644
@@ -34,7 +34,7 @@
 	"splashpos=m,m\0" \
 	"optargs=fixrtc --no-log consoleblank=0 \0" \
 	CONFIG_ENV_SETTINGS_V1 \
-	CONFIG_ENV_SETTINGS_NAND_V1 \
+	CFG_ENV_SETTINGS_NAND_V1 \
 	"mmc_dev=0\0" \
 	"mmc_root=/dev/mmcblk0p2 rw\0" \
 	"mmc_root_fs_type=ext4 rootwait\0" \
include/configs/siemens-am33x-common.h +1 -1
index 5a001716fb01..20efa468ac3d 100644
@@ -201,7 +201,7 @@
 	"kernel_b part 0 8;" \
 	"rootfs partubi 0 10"
 
-#define CONFIG_ENV_SETTINGS_NAND_V1 \
+#define CFG_ENV_SETTINGS_NAND_V1 \
 	"nand_active_ubi_vol=rootfs_a\0" \
 	"nand_active_ubi_vol_A=rootfs_a\0" \
 	"nand_active_ubi_vol_B=rootfs_b\0" \
scripts/config_whitelist.txt +1 -1
index cb880dc317fc..25bfb7ee89e7 100644
@@ -13,7 +13,7 @@ CFG_DW_WDT_CLOCK_KHZ
 CFG_ENV_FLAGS_LIST_STATIC
 CFG_ENV_IS_EMBEDDED
 CFG_ENV_SETTINGS_BUTTONS_AND_LEDS
-CONFIG_ENV_SETTINGS_NAND_V1
+CFG_ENV_SETTINGS_NAND_V1
 CONFIG_ENV_SETTINGS_NAND_V2
 CONFIG_ENV_SETTINGS_V1
 CONFIG_ENV_SETTINGS_V2
Signature · 1 line
2.25.1
author
#61 lore raw

PATCH 14/241 global: Migrate CONFIG_ENV_SETTINGS_NAND_V2 to CFG

In reply to Tom Rini
---
 include/configs/draco.h                | 2 +-
 include/configs/etamin.h               | 6 +++---
 include/configs/rastaban.h             | 2 +-
 include/configs/siemens-am33x-common.h | 2 +-
 include/configs/thuban.h               | 2 +-
 scripts/config_whitelist.txt           | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)
include/configs/draco.h +1 -1
index d1c7abe1b392..5b0daec11a6a 100644
@@ -36,6 +36,6 @@
 	"preboot=draco_led 0\0" \
 	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	CONFIG_ENV_SETTINGS_V2 \
-	CONFIG_ENV_SETTINGS_NAND_V2
+	CFG_ENV_SETTINGS_NAND_V2
 
 #endif	/* ! __CONFIG_DRACO_H */
include/configs/etamin.h +3 -3
index d6c313d18e2a..fea69c7eafae 100644
@@ -93,8 +93,8 @@
 	"u-boot.env1 mtddev;" \
 	"rootfs mtddevubi" \
 
-#undef CONFIG_ENV_SETTINGS_NAND_V2
-#define CONFIG_ENV_SETTINGS_NAND_V2 \
+#undef CFG_ENV_SETTINGS_NAND_V2
+#define CFG_ENV_SETTINGS_NAND_V2 \
 	"nand_active_ubi_vol=rootfs_a\0" \
 	"rootfs_name=rootfs\0" \
 	"kernel_name=uImage\0"\
@@ -146,6 +146,6 @@
 	"preboot=draco_led 0\0" \
 	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	CONFIG_ENV_SETTINGS_V2 \
-	CONFIG_ENV_SETTINGS_NAND_V2
+	CFG_ENV_SETTINGS_NAND_V2
 #endif	/* CONFIG_SPL_BUILD */
 #endif	/* ! __CONFIG_ETAMIN_H */
include/configs/rastaban.h +1 -1
index 2e002faf2e60..f3435b2b8c6c 100644
@@ -46,6 +46,6 @@
 	"preboot=draco_led 0\0" \
 	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	CONFIG_ENV_SETTINGS_V2 \
-	CONFIG_ENV_SETTINGS_NAND_V2
+	CFG_ENV_SETTINGS_NAND_V2
 
 #endif	/* ! __CONFIG_RASTABAN_H */
include/configs/siemens-am33x-common.h +1 -1
index 20efa468ac3d..b1cd614316d4 100644
@@ -278,7 +278,7 @@
 	"u-boot.env1 part 0 7;" \
 	"rootfs partubi 0 9" \
 
-#define CONFIG_ENV_SETTINGS_NAND_V2 \
+#define CFG_ENV_SETTINGS_NAND_V2 \
 	"nand_active_ubi_vol=rootfs_a\0" \
 	"rootfs_name=rootfs\0" \
 	"kernel_name=uImage\0"\
include/configs/thuban.h +1 -1
index 25c5a8ccd20e..960b42dffd0e 100644
@@ -39,6 +39,6 @@
 	"preboot=draco_led 0\0" \
 	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	CONFIG_ENV_SETTINGS_V2 \
-	CONFIG_ENV_SETTINGS_NAND_V2
+	CFG_ENV_SETTINGS_NAND_V2
 
 #endif	/* ! __CONFIG_THUBAN_H */
scripts/config_whitelist.txt +1 -1
index 25bfb7ee89e7..e55368c5453c 100644
@@ -14,7 +14,7 @@ CFG_ENV_FLAGS_LIST_STATIC
 CFG_ENV_IS_EMBEDDED
 CFG_ENV_SETTINGS_BUTTONS_AND_LEDS
 CFG_ENV_SETTINGS_NAND_V1
-CONFIG_ENV_SETTINGS_NAND_V2
+CFG_ENV_SETTINGS_NAND_V2
 CONFIG_ENV_SETTINGS_V1
 CONFIG_ENV_SETTINGS_V2
 CONFIG_ENV_SROM_BANK
Signature · 1 line
2.25.1
author
#62 lore raw

PATCH 15/241 global: Migrate CONFIG_ENV_SETTINGS_V1 to CFG

In reply to Tom Rini
---
 include/configs/pxm2.h                 | 2 +-
 include/configs/rut.h                  | 2 +-
 include/configs/siemens-am33x-common.h | 2 +-
 scripts/config_whitelist.txt           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
include/configs/pxm2.h +1 -1
index c6a01270a54d..48f49906b84e 100644
@@ -36,7 +36,7 @@
 	"preboot=draco_led 0\0" \
 	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	"splashpos=m,m\0"	\
-	CONFIG_ENV_SETTINGS_V1 \
+	CFG_ENV_SETTINGS_V1 \
 	CFG_ENV_SETTINGS_NAND_V1 \
 	"mmc_dev=0\0" \
 	"mmc_root=/dev/mmcblk0p2 rw\0" \
include/configs/rut.h +1 -1
index f51771f9ca46..b07d0c50604d 100644
@@ -33,7 +33,7 @@
 	"nand_img_size=0x500000\0" \
 	"splashpos=m,m\0" \
 	"optargs=fixrtc --no-log consoleblank=0 \0" \
-	CONFIG_ENV_SETTINGS_V1 \
+	CFG_ENV_SETTINGS_V1 \
 	CFG_ENV_SETTINGS_NAND_V1 \
 	"mmc_dev=0\0" \
 	"mmc_root=/dev/mmcblk0p2 rw\0" \
include/configs/siemens-am33x-common.h +1 -1
index b1cd614316d4..c54b02c5919a 100644
@@ -234,7 +234,7 @@
 		"${nand_img_size}; bootm ${kloadaddr}\0" \
 	COMMON_ENV_NAND_CMDS
 
-#define CONFIG_ENV_SETTINGS_V1 \
+#define CFG_ENV_SETTINGS_V1 \
 		COMMON_ENV_SETTINGS \
 	"net_args=run bootargs_defaults;" \
 		"mtdparts default;" \
scripts/config_whitelist.txt +1 -1
index e55368c5453c..26821890137d 100644
@@ -15,7 +15,7 @@ CFG_ENV_IS_EMBEDDED
 CFG_ENV_SETTINGS_BUTTONS_AND_LEDS
 CFG_ENV_SETTINGS_NAND_V1
 CFG_ENV_SETTINGS_NAND_V2
-CONFIG_ENV_SETTINGS_V1
+CFG_ENV_SETTINGS_V1
 CONFIG_ENV_SETTINGS_V2
 CONFIG_ENV_SROM_BANK
 CONFIG_ENV_TOTAL_SIZE
Signature · 1 line
2.25.1
author
#63 lore raw

PATCH 16/241 global: Migrate CONFIG_ENV_SETTINGS_V2 to CFG

In reply to Tom Rini
---
 include/configs/draco.h                | 2 +-
 include/configs/etamin.h               | 2 +-
 include/configs/rastaban.h             | 2 +-
 include/configs/siemens-am33x-common.h | 2 +-
 include/configs/thuban.h               | 2 +-
 scripts/config_whitelist.txt           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
include/configs/draco.h +1 -1
index 5b0daec11a6a..ab3cf10d7793 100644
@@ -35,7 +35,7 @@
 	"optargs=\0" \
 	"preboot=draco_led 0\0" \
 	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
-	CONFIG_ENV_SETTINGS_V2 \
+	CFG_ENV_SETTINGS_V2 \
 	CFG_ENV_SETTINGS_NAND_V2
 
 #endif	/* ! __CONFIG_DRACO_H */
include/configs/etamin.h +1 -1
index fea69c7eafae..9011940abe4b 100644
@@ -145,7 +145,7 @@
 	"optargs=\0" \
 	"preboot=draco_led 0\0" \
 	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
-	CONFIG_ENV_SETTINGS_V2 \
+	CFG_ENV_SETTINGS_V2 \
 	CFG_ENV_SETTINGS_NAND_V2
 #endif	/* CONFIG_SPL_BUILD */
 #endif	/* ! __CONFIG_ETAMIN_H */
include/configs/rastaban.h +1 -1
index f3435b2b8c6c..59d56d666242 100644
@@ -45,7 +45,7 @@
 	"optargs=\0" \
 	"preboot=draco_led 0\0" \
 	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
-	CONFIG_ENV_SETTINGS_V2 \
+	CFG_ENV_SETTINGS_V2 \
 	CFG_ENV_SETTINGS_NAND_V2
 
 #endif	/* ! __CONFIG_RASTABAN_H */
include/configs/siemens-am33x-common.h +1 -1
index c54b02c5919a..2a63b36a536a 100644
@@ -311,7 +311,7 @@
 		"bootm ${kloadaddr} - ${loadaddr}\0" \
 	COMMON_ENV_NAND_CMDS
 
-#define CONFIG_ENV_SETTINGS_V2 \
+#define CFG_ENV_SETTINGS_V2 \
 		COMMON_ENV_SETTINGS \
 	"net_args=run bootargs_defaults;" \
 		"mtdparts default;" \
include/configs/thuban.h +1 -1
index 960b42dffd0e..c8b27263e85e 100644
@@ -38,7 +38,7 @@
 	"optargs=\0" \
 	"preboot=draco_led 0\0" \
 	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
-	CONFIG_ENV_SETTINGS_V2 \
+	CFG_ENV_SETTINGS_V2 \
 	CFG_ENV_SETTINGS_NAND_V2
 
 #endif	/* ! __CONFIG_THUBAN_H */
scripts/config_whitelist.txt +1 -1
index 26821890137d..831f8a99ea5c 100644
@@ -16,7 +16,7 @@ CFG_ENV_SETTINGS_BUTTONS_AND_LEDS
 CFG_ENV_SETTINGS_NAND_V1
 CFG_ENV_SETTINGS_NAND_V2
 CFG_ENV_SETTINGS_V1
-CONFIG_ENV_SETTINGS_V2
+CFG_ENV_SETTINGS_V2
 CONFIG_ENV_SROM_BANK
 CONFIG_ENV_TOTAL_SIZE
 CONFIG_ET1100_BASE
Signature · 1 line
2.25.1
author
#64 lore raw

PATCH 17/241 global: Migrate CONFIG_ENV_SROM_BANK to CFG

In reply to Tom Rini
---
 board/samsung/smdkc100/smdkc100.c | 6 +++---
 board/samsung/smdkv310/smdkv310.c | 6 +++---
 include/configs/exynos5-common.h  | 2 +-
 include/configs/smdkc100.h        | 2 +-
 include/configs/smdkv310.h        | 2 +-
 scripts/config_whitelist.txt      | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)
board/samsung/smdkc100/smdkc100.c +3 -3
index b944e44c1ac4..4f46911b0b4d 100644
@@ -25,16 +25,16 @@ static void smc9115_pre_init(void)
 	u32 smc_bw_conf, smc_bc_conf;
 
 	/* gpio configuration GPK0CON */
-	gpio_cfg_pin(S5PC100_GPIO_K00 + CONFIG_ENV_SROM_BANK, S5P_GPIO_FUNC(2));
+	gpio_cfg_pin(S5PC100_GPIO_K00 + CFG_ENV_SROM_BANK, S5P_GPIO_FUNC(2));
 
 	/* Ethernet needs bus width of 16 bits */
-	smc_bw_conf = SMC_DATA16_WIDTH(CONFIG_ENV_SROM_BANK);
+	smc_bw_conf = SMC_DATA16_WIDTH(CFG_ENV_SROM_BANK);
 	smc_bc_conf = SMC_BC_TACS(0x0) | SMC_BC_TCOS(0x4) | SMC_BC_TACC(0xe)
 			| SMC_BC_TCOH(0x1) | SMC_BC_TAH(0x4)
 			| SMC_BC_TACP(0x6) | SMC_BC_PMC(0x0);
 
 	/* Select and configure the SROMC bank */
-	s5p_config_sromc(CONFIG_ENV_SROM_BANK, smc_bw_conf, smc_bc_conf);
+	s5p_config_sromc(CFG_ENV_SROM_BANK, smc_bw_conf, smc_bc_conf);
 }
 
 int board_init(void)
board/samsung/smdkv310/smdkv310.c +3 -3
index bb61ba1f81c6..47483a26a622 100644
@@ -24,17 +24,17 @@ static void smc9115_pre_init(void)
 	u32 smc_bw_conf, smc_bc_conf;
 
 	/* gpio configuration GPK0CON */
-	gpio_cfg_pin(EXYNOS4_GPIO_Y00 + CONFIG_ENV_SROM_BANK, S5P_GPIO_FUNC(2));
+	gpio_cfg_pin(EXYNOS4_GPIO_Y00 + CFG_ENV_SROM_BANK, S5P_GPIO_FUNC(2));
 
 	/* Ethernet needs bus width of 16 bits */
-	smc_bw_conf = SROMC_DATA16_WIDTH(CONFIG_ENV_SROM_BANK);
+	smc_bw_conf = SROMC_DATA16_WIDTH(CFG_ENV_SROM_BANK);
 	smc_bc_conf = SROMC_BC_TACS(0x0F) | SROMC_BC_TCOS(0x0F)
 			| SROMC_BC_TACC(0x0F) | SROMC_BC_TCOH(0x0F)
 			| SROMC_BC_TAH(0x0F)  | SROMC_BC_TACP(0x0F)
 			| SROMC_BC_PMC(0x0F);
 
 	/* Select and configure the SROMC bank */
-	s5p_config_sromc(CONFIG_ENV_SROM_BANK, smc_bw_conf, smc_bc_conf);
+	s5p_config_sromc(CFG_ENV_SROM_BANK, smc_bw_conf, smc_bc_conf);
 }
 
 int board_init(void)
include/configs/exynos5-common.h +1 -1
index dd322c2b3a79..0490c2dad53e 100644
@@ -50,7 +50,7 @@
 
 /* Ethernet Controllor Driver */
 #ifdef CONFIG_CMD_NET
-#define CONFIG_ENV_SROM_BANK		1
+#define CFG_ENV_SROM_BANK		1
 #endif /*CONFIG_CMD_NET*/
 
 /* Enable Time Command */
include/configs/smdkc100.h +1 -1
index ffa1a1fcb0ef..ccb7ec38d033 100644
@@ -94,7 +94,7 @@
  * Ethernet Contoller driver
  */
 #ifdef CONFIG_CMD_NET
-#define CONFIG_ENV_SROM_BANK   3       /* Select SROM Bank-3 for Ethernet*/
+#define CFG_ENV_SROM_BANK   3       /* Select SROM Bank-3 for Ethernet*/
 #endif /* CONFIG_CMD_NET */
 
 #endif	/* __CONFIG_H */
include/configs/smdkv310.h +1 -1
index af0c8200fc23..1f137dba90f7 100644
@@ -42,7 +42,7 @@
 
 /* Ethernet Controllor Driver */
 #ifdef CONFIG_CMD_NET
-#define CONFIG_ENV_SROM_BANK		1
+#define CFG_ENV_SROM_BANK		1
 #endif /*CONFIG_CMD_NET*/
 
 #endif	/* __CONFIG_H */
scripts/config_whitelist.txt +1 -1
index 831f8a99ea5c..5de121b41ca0 100644
@@ -17,7 +17,7 @@ CFG_ENV_SETTINGS_NAND_V1
 CFG_ENV_SETTINGS_NAND_V2
 CFG_ENV_SETTINGS_V1
 CFG_ENV_SETTINGS_V2
-CONFIG_ENV_SROM_BANK
+CFG_ENV_SROM_BANK
 CONFIG_ENV_TOTAL_SIZE
 CONFIG_ET1100_BASE
 CONFIG_ETHBASE
Signature · 1 line
2.25.1
author
#65 lore raw

PATCH 18/241 global: Migrate CONFIG_ENV_TOTAL_SIZE to CFG

In reply to Tom Rini
---
 include/configs/km/pg-wcom-ls102xa.h | 8 ++++----
 include/configs/kmcent2.h            | 8 ++++----
 scripts/config_whitelist.txt         | 2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)
include/configs/km/pg-wcom-ls102xa.h +4 -4
index dfa81c037f48..05cdcbfba193 100644
@@ -172,7 +172,7 @@
  * Environment
  */
 
-#define CONFIG_ENV_TOTAL_SIZE		0x40000
+#define CFG_ENV_TOTAL_SIZE		0x40000
 #define ENV_DEL_ADDR		CONFIG_ENV_ADDR_REDUND  /* direct for newenv */
 
 #ifndef CONFIG_KM_DEF_ENV		/* if not set by keymile-common.h */
@@ -211,11 +211,11 @@
 
 #define CONFIG_KM_NEW_ENV						\
 	"newenv=protect off " __stringify(ENV_DEL_ADDR)			\
-		" +" __stringify(CONFIG_ENV_TOTAL_SIZE) " && "		\
+		" +" __stringify(CFG_ENV_TOTAL_SIZE) " && "		\
 		"erase " __stringify(ENV_DEL_ADDR)			\
-		" +" __stringify(CONFIG_ENV_TOTAL_SIZE) " && "		\
+		" +" __stringify(CFG_ENV_TOTAL_SIZE) " && "		\
 		"protect on " __stringify(ENV_DEL_ADDR)			\
-		" +" __stringify(CONFIG_ENV_TOTAL_SIZE) "\0"
+		" +" __stringify(CFG_ENV_TOTAL_SIZE) "\0"
 
 #define CONFIG_HW_ENV_SETTINGS						\
 	"hwconfig=devdis:esdhc,usb3,usb2,sata,sec,dcu,duart2,qspi,"	\
include/configs/kmcent2.h +4 -4
index 527f0383bc65..17eb9a7c2ea0 100644
@@ -139,7 +139,7 @@
 #define CFG_SYS_NUM_CPC		CONFIG_SYS_NUM_DDR_CTLRS
 
 /* Environment in parallel NOR-Flash */
-#define CONFIG_ENV_TOTAL_SIZE		0x040000
+#define CFG_ENV_TOTAL_SIZE		0x040000
 #define ENV_DEL_ADDR		0xebf00000	/*direct for newenv*/
 
 /*
@@ -430,11 +430,11 @@ int get_scl(void);
 
 #define CONFIG_KM_NEW_ENV						\
 	"newenv=protect off " __stringify(ENV_DEL_ADDR)			\
-		" +" __stringify(CONFIG_ENV_TOTAL_SIZE) " && "		\
+		" +" __stringify(CFG_ENV_TOTAL_SIZE) " && "		\
 		"erase " __stringify(ENV_DEL_ADDR)			\
-		" +" __stringify(CONFIG_ENV_TOTAL_SIZE) " && "		\
+		" +" __stringify(CFG_ENV_TOTAL_SIZE) " && "		\
 		"protect on " __stringify(ENV_DEL_ADDR)			\
-		" +" __stringify(CONFIG_ENV_TOTAL_SIZE) "\0"
+		" +" __stringify(CFG_ENV_TOTAL_SIZE) "\0"
 
 /* ppc_82xx is the equivalent to ppc_6xx, the generic ppc toolchain */
 #ifndef CONFIG_KM_DEF_ARCH
scripts/config_whitelist.txt +1 -1
index 5de121b41ca0..27923ec86bf5 100644
@@ -18,7 +18,7 @@ CFG_ENV_SETTINGS_NAND_V2
 CFG_ENV_SETTINGS_V1
 CFG_ENV_SETTINGS_V2
 CFG_ENV_SROM_BANK
-CONFIG_ENV_TOTAL_SIZE
+CFG_ENV_TOTAL_SIZE
 CONFIG_ET1100_BASE
 CONFIG_ETHBASE
 CONFIG_EXTRA_ENV_SETTINGS
Signature · 1 line
2.25.1
author
#66 lore raw

PATCH 19/241 global: Migrate CONFIG_ET1100_BASE to CFG

In reply to Tom Rini
---
 board/esd/meesc/meesc.c      | 2 +-
 include/configs/meesc.h      | 2 +-
 scripts/config_whitelist.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
board/esd/meesc/meesc.c +1 -1
index 21f4ba98b531..9e3621042241 100644
@@ -163,7 +163,7 @@ int checkboard(void)
 	u_char hw_type;	/* hardware type */
 
 	/* read the "Type" register of the ET1100 controller */
-	hw_type = readb(CONFIG_ET1100_BASE);
+	hw_type = readb(CFG_ET1100_BASE);
 
 	switch (hw_type) {
 	case 0x11:
include/configs/meesc.h +1 -1
index d190e4b50392..38da55c70bfe 100644
@@ -60,6 +60,6 @@
 #endif
 
 /* hw-controller addresses */
-#define CONFIG_ET1100_BASE		0x70000000
+#define CFG_ET1100_BASE		0x70000000
 
 #endif
scripts/config_whitelist.txt +1 -1
index 27923ec86bf5..81353fa94e7c 100644
@@ -19,7 +19,7 @@ CFG_ENV_SETTINGS_V1
 CFG_ENV_SETTINGS_V2
 CFG_ENV_SROM_BANK
 CFG_ENV_TOTAL_SIZE
-CONFIG_ET1100_BASE
+CFG_ET1100_BASE
 CONFIG_ETHBASE
 CONFIG_EXTRA_ENV_SETTINGS
 CONFIG_FB_ADDR
Signature · 1 line
2.25.1
author
#67 lore raw

PATCH 20/241 global: Migrate CONFIG_ETHBASE to CFG

In reply to Tom Rini
---
 board/cadence/xtfpga/xtfpga.c | 2 +-
 include/configs/xtfpga.h      | 2 +-
 scripts/config_whitelist.txt  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
board/cadence/xtfpga/xtfpga.c +1 -1
index f38f5564a06c..8e4081b4c6dd 100644
@@ -89,7 +89,7 @@ int misc_init_r(void)
 	char *s = env_get("ethaddr");
 	if (s == 0) {
 		unsigned int x;
-		char s[] = __stringify(CONFIG_ETHBASE);
+		char s[] = __stringify(CFG_ETHBASE);
 		x = (*(volatile u32 *)CFG_SYS_FPGAREG_DIPSW)
 			& FPGAREG_MAC_MASK;
 		sprintf(&s[15], "%02x", x);
include/configs/xtfpga.h +1 -1
index 9201dac7abce..6c5a9f566bee 100644
@@ -136,7 +136,7 @@
 /* Ethernet Driver Info */
 /*======================*/
 
-#define CONFIG_ETHBASE			00:50:C2:13:6f:00
+#define CFG_ETHBASE			00:50:C2:13:6f:00
 #define CFG_SYS_ETHOC_BASE		IOADDR(0x0d030000)
 #define CFG_SYS_ETHOC_BUFFER_ADDR	IOADDR(0x0D800000)
 
scripts/config_whitelist.txt +1 -1
index 81353fa94e7c..99b3796584d0 100644
@@ -20,7 +20,7 @@ CFG_ENV_SETTINGS_V2
 CFG_ENV_SROM_BANK
 CFG_ENV_TOTAL_SIZE
 CFG_ET1100_BASE
-CONFIG_ETHBASE
+CFG_ETHBASE
 CONFIG_EXTRA_ENV_SETTINGS
 CONFIG_FB_ADDR
 CONFIG_FDTADDR
Signature · 1 line
2.25.1