Skip to contentSkip to conversation

Convert CONFIG_AM335X_LCD to Kconfig

PATCH New Tom Rini 7 participants 67 messages Jun 16, 2020 – Jun 30, 2020

Subsystems (17)
lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH v2 1/31 Convert CONFIG_AM335X_LCD to Kconfig

This converts the following to Kconfig:
CONFIG_AM335X_LCD

---
 configs/brxre1_defconfig | 1 +
 drivers/video/Kconfig    | 1 -
 include/configs/brxre1.h | 3 ---
 3 files changed, 1 insertion(+), 4 deletions(-)
configs/brxre1_defconfig +1 -0
index 5d3246ac8c72..456e4507c8c6 100644
@@ -89,6 +89,7 @@ CONFIG_USB_MUSB_TI=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_SYS_WHITE_ON_BLACK=y
+CONFIG_AM335X_LCD=y
 CONFIG_LCD=y
 CONFIG_SPL_TINY_MEMSET=y
 # CONFIG_OF_LIBFDT_OVERLAY is not set
drivers/video/Kconfig +0 -1
index 38123543a539..05c173b9331c 100644
@@ -475,7 +475,6 @@ config ATMEL_HLCD
 
 config AM335X_LCD
 	bool "Enable AM335x video support"
-	depends on DM_VIDEO
 	help
 	   Supports video output to an attached LCD panel.
 
include/configs/brxre1.h +0 -3
index 9db011358eba..3a18aec5d332 100644
@@ -15,9 +15,6 @@
 #include <configs/bur_am335x_common.h>
 #include <linux/stringify.h>
 /* ------------------------------------------------------------------------- */
-#if !defined(CONFIG_AM335X_LCD)
-#define CONFIG_AM335X_LCD
-#endif
 #define LCD_BPP				LCD_COLOR32
 
 /* memory */
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH v2 1/31 Convert CONFIG_AM335X_LCD to Kconfig

Quoted 4 lines · Tom Rini

This converts the following to Kconfig:

   CONFIG_AM335X_LCD

Applied to u-boot/next, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200630/7cb3cce6/attachment.sig>
author
#2 lore raw

PATCH v2 2/31 Convert CONFIG_ARCH_MISC_INIT to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_ARCH_MISC_INIT

---
 configs/apalis-tk1_defconfig | 1 +
 configs/chiliboard_defconfig | 1 +
 include/configs/apalis-tk1.h | 2 --
 include/configs/chiliboard.h | 1 -
 4 files changed, 2 insertions(+), 3 deletions(-)
configs/apalis-tk1_defconfig +1 -0
index 868303a29cca..6538f9a5b8cd 100644
@@ -17,6 +17,7 @@ CONFIG_SYS_STDIO_DEREGISTER=y
 CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_DISPLAY_BOARDINFO_LATE=y
+CONFIG_ARCH_MISC_INIT=y
 CONFIG_SYS_PROMPT="Apalis TK1 # "
 # CONFIG_CMD_IMI is not set
 CONFIG_CMD_GPIO=y
configs/chiliboard_defconfig +1 -0
index 30100a3151d0..afc73dc89c52 100644
@@ -19,6 +19,7 @@ CONFIG_BOOTDELAY=1
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_DEFAULT_FDT_FILE="am335x-chiliboard.dtb"
+CONFIG_ARCH_MISC_INIT=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
include/configs/apalis-tk1.h +0 -2
index 965259c5e1e9..af008e4f4404 100644
@@ -12,8 +12,6 @@
 
 #include "tegra124-common.h"
 
-#define CONFIG_ARCH_MISC_INIT
-
 /* Board-specific serial config */
 #define CONFIG_TEGRA_ENABLE_UARTA
 #define CONFIG_SYS_NS16550_COM1		NV_PA_APB_UARTA_BASE
include/configs/chiliboard.h +0 -1
index f4dcc54508ce..a2d198c5197b 100644
@@ -147,7 +147,6 @@
 /* NAND: SPL related configs */
 
 /* USB configuration */
-#define CONFIG_ARCH_MISC_INIT
 #define CONFIG_AM335X_USB1
 #define CONFIG_AM335X_USB1_MODE MUSB_HOST
 
Signature · 1 line
2.17.1
author
#3 lore raw

PATCH v2 2/31 Convert CONFIG_ARCH_MISC_INIT to Kconfig

Quoted 4 lines · Tom Rini

This converts the following to Kconfig:
CONFIG_ARCH_MISC_INIT

Applied to u-boot/next, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200630/8203c033/attachment.sig>
author
#4 lore raw

PATCH v2 3/31 Convert CONFIG_ARM_PL180_MMCI to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_ARM_PL180_MMCI

---
 configs/vexpress_ca15_tc2_defconfig | 1 +
 configs/vexpress_ca5x2_defconfig    | 1 +
 configs/vexpress_ca9x4_defconfig    | 1 +
 drivers/mmc/Kconfig                 | 1 -
 include/configs/vexpress_common.h   | 1 -
 5 files changed, 3 insertions(+), 2 deletions(-)
configs/vexpress_ca15_tc2_defconfig +1 -0
index d2a59774420d..2c78e12df6a1 100644
@@ -23,6 +23,7 @@ CONFIG_CMD_MMC=y
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_ENV_ADDR=0xFF80000
+CONFIG_ARM_PL180_MMCI=y
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
configs/vexpress_ca5x2_defconfig +1 -0
index bedf99a7e163..8395bb74cdb2 100644
@@ -22,6 +22,7 @@ CONFIG_CMD_MMC=y
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_ENV_ADDR=0xFF80000
+CONFIG_ARM_PL180_MMCI=y
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
configs/vexpress_ca9x4_defconfig +1 -0
index 8234b5d1bbcf..1811782128ff 100644
@@ -23,6 +23,7 @@ CONFIG_CMD_MMC=y
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_ENV_ADDR=0x47F80000
+CONFIG_ARM_PL180_MMCI=y
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
drivers/mmc/Kconfig +0 -1
index 8f56572c39a0..33b128ddc5a4 100644
@@ -66,7 +66,6 @@ config MMC_SPI_CRC_ON
 
 config ARM_PL180_MMCI
 	bool "ARM AMBA Multimedia Card Interface and compatible support"
-	depends on DM_MMC && OF_CONTROL
 	help
 	  This selects the ARM(R) AMBA(R) PrimeCell Multimedia Card
 	  Interface (PL180, PL181 and compatible) support.
include/configs/vexpress_common.h +0 -1
index ca765579e821..ffc3b43fc557 100644
@@ -135,7 +135,6 @@
 #define CONFIG_SYS_SERIAL0		V2M_UART0
 #define CONFIG_SYS_SERIAL1		V2M_UART1
 
-#define CONFIG_ARM_PL180_MMCI
 #define CONFIG_ARM_PL180_MMCI_BASE	V2M_MMCI
 #define CONFIG_SYS_MMC_MAX_BLK_COUNT	127
 #define CONFIG_ARM_PL180_MMCI_CLOCK_FREQ 6250000
Signature · 1 line
2.17.1
author
#5 lore raw

PATCH v2 3/31 Convert CONFIG_ARM_PL180_MMCI to Kconfig

Quoted 4 lines · Tom Rini

This converts the following to Kconfig:

   CONFIG_ARM_PL180_MMCI

Applied to u-boot/next, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200630/e6f994c6/attachment.sig>
author
#6 lore raw

PATCH v2 4/31 Convert CONFIG_ARMV7_PSCI et al to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_ARMV7_PSCI
CONFIG_ARMV7_PSCI_NR_CPUS

Cc Tom Warren <[email protected]>
Cc Peter.Chubb at data61.csiro.au
---
 arch/arm/mach-tegra/tegra124/Kconfig | 1 +
 include/configs/cei-tk1-som.h        | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)
arch/arm/mach-tegra/tegra124/Kconfig +1 -0
index 6fa31ea0a16c..fb016aa46c90 100644
@@ -19,6 +19,7 @@ config TARGET_JETSON_TK1
 
 config TARGET_CEI_TK1_SOM
 	bool "Colorado Engineering Inc Tegra124 TK1-som board"
+	select ARCH_SUPPORT_PSCI
 	select BOARD_LATE_INIT
 	select CPU_V7_HAS_NONSEC if !SPL_BUILD
 	select CPU_V7_HAS_VIRT if !SPL_BUILD
include/configs/cei-tk1-som.h +0 -2
index dbebef34e386..2541f2fc27c2 100644
@@ -32,8 +32,6 @@
 #include "tegra-common-usb-gadget.h"
 #include "tegra-common-post.h"
 
-#define CONFIG_ARMV7_PSCI			1
-#define CONFIG_ARMV7_PSCI_NR_CPUS		4
 /* Reserve top 1M for secure RAM */
 #define CONFIG_ARMV7_SECURE_BASE		0xfff00000
 #define CONFIG_ARMV7_SECURE_RESERVE_SIZE	0x00100000
Signature · 1 line
2.17.1
#7 lore raw

PATCH v2 4/31 Convert CONFIG_ARMV7_PSCI et al to Kconfig

-----Original Message-----
From: Tom Rini <[email protected]>
Sent: Tuesday, June 16, 2020 4:06 PM
To: u-boot at lists.denx.de
Cc: Tom Warren <[email protected]>; Peter.Chubb at data61.csiro.au
Subject: [PATCHv2 04/31] Convert CONFIG_ARMV7_PSCI et al to Kconfig

External email: Use caution opening links or attachments

This converts the following to Kconfig:
CONFIG_ARMV7_PSCI
CONFIG_ARMV7_PSCI_NR_CPUS

Cc Tom Warren <[email protected]>
Cc Peter.Chubb at data61.csiro.au
---
 arch/arm/mach-tegra/tegra124/Kconfig | 1 +
 include/configs/cei-tk1-som.h        | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)
arch/arm/mach-tegra/tegra124/Kconfig +1 -0
index 6fa31ea0a16c..fb016aa46c90 100644
@@ -19,6 +19,7 @@ config TARGET_JETSON_TK1
 
 config TARGET_CEI_TK1_SOM
        bool "Colorado Engineering Inc Tegra124 TK1-som board"
+       select ARCH_SUPPORT_PSCI
        select BOARD_LATE_INIT
        select CPU_V7_HAS_NONSEC if !SPL_BUILD
        select CPU_V7_HAS_VIRT if !SPL_BUILD diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h index dbebef34e386..2541f2fc27c2 100644
include/configs/cei-tk1-som.h +0 -2
@@ -32,8 +32,6 @@
 #include "tegra-common-usb-gadget.h"
 #include "tegra-common-post.h"
 
-#define CONFIG_ARMV7_PSCI                      1
-#define CONFIG_ARMV7_PSCI_NR_CPUS              4
 /* Reserve top 1M for secure RAM */
 #define CONFIG_ARMV7_SECURE_BASE               0xfff00000
 #define CONFIG_ARMV7_SECURE_RESERVE_SIZE       0x00100000

--
2.17.1

--
nvpublic

author
#8 lore raw

PATCH v2 5/31 Convert CONFIG_AT91_GPIO to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_AT91_GPIO

---
 arch/arm/mach-at91/include/mach/at91rm9200.h | 2 --
 configs/at91rm9200ek_defconfig               | 1 +
 configs/at91rm9200ek_ram_defconfig           | 1 +
 configs/axm_defconfig                        | 1 +
 configs/corvus_defconfig                     | 1 +
 configs/gurnard_defconfig                    | 1 +
 configs/picosam9g45_defconfig                | 1 +
 configs/smartweb_defconfig                   | 1 +
 configs/snapper9260_defconfig                | 1 +
 configs/snapper9g20_defconfig                | 1 +
 configs/taurus_defconfig                     | 1 +
 configs/vinco_defconfig                      | 1 +
 configs/wb45n_defconfig                      | 1 +
 configs/wb50n_defconfig                      | 1 +
 drivers/gpio/Kconfig                         | 1 -
 include/configs/at91-sama5_common.h          | 5 -----
 include/configs/corvus.h                     | 1 -
 include/configs/picosam9g45.h                | 1 -
 include/configs/smartweb.h                   | 1 -
 include/configs/snapper9260.h                | 1 -
 include/configs/snapper9g45.h                | 1 -
 include/configs/taurus.h                     | 1 -
 include/configs/wb45n.h                      | 1 -
 include/configs/wb50n.h                      | 3 ---
 24 files changed, 13 insertions(+), 18 deletions(-)
arch/arm/mach-at91/include/mach/at91rm9200.h +0 -2
index 3412df0f06c7..309039347c84 100644
@@ -5,8 +5,6 @@
 #ifndef __AT91RM9200_H__
 #define __AT91RM9200_H__
 
-#define CONFIG_AT91_GPIO	/* and require always gpio features */
-
 /* Periperial Identifiers */
 
 #define ATMEL_ID_SYS	1	/* System Peripheral */
configs/at91rm9200ek_defconfig +1 -0
index 0b025911d69c..2aaf87904562 100644
@@ -22,6 +22,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_ENV_ADDR=0x10040000
+CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
configs/at91rm9200ek_ram_defconfig +1 -0
index 09c996b8b225..9d2fc473430b 100644
@@ -23,6 +23,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_ENV_ADDR=0x10040000
+CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
configs/axm_defconfig +1 -0
index 78e6c8d34569..1615d8af0eba 100644
@@ -58,6 +58,7 @@ CONFIG_BLK=y
 CONFIG_HAVE_BLOCK_DEVICE=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y
+CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
 CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
configs/corvus_defconfig +1 -0
index 0eedaa93667a..c6e5955bf329 100644
@@ -48,6 +48,7 @@ CONFIG_BLK=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y
 CONFIG_DFU_NAND=y
+CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
 CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
configs/gurnard_defconfig +1 -0
index 0d1a46315bd3..a679c0f6700b 100644
@@ -32,6 +32,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="at91sam9g45-gurnard"
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_AT91_GPIO=y
 CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 # CONFIG_SYS_NAND_USE_FLASH_BBT is not set
configs/picosam9g45_defconfig +1 -0
index 0157f5172e13..2921f2dfd4f7 100644
@@ -39,6 +39,7 @@ CONFIG_ENV_IS_IN_FAT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM=y
 CONFIG_SPL_DM=y
+CONFIG_AT91_GPIO=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
configs/smartweb_defconfig +1 -0
index 8f9a19f695ba..4545c7075b3f 100644
@@ -49,6 +49,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y
 CONFIG_DFU_NAND=y
+CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
 CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
configs/snapper9260_defconfig +1 -0
index c684e2b20a11..9e44395f03f0 100644
@@ -30,6 +30,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_AT91_GPIO=y
 CONFIG_CMD_PCA953X=y
 # CONFIG_MMC is not set
 CONFIG_MTD=y
configs/snapper9g20_defconfig +1 -0
index 3ef091fab48f..e1c5c2ef4c1f 100644
@@ -29,6 +29,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_AT91_GPIO=y
 CONFIG_CMD_PCA953X=y
 # CONFIG_MMC is not set
 CONFIG_MTD=y
configs/taurus_defconfig +1 -0
index d9a2d61ecb60..16a804b879f0 100644
@@ -66,6 +66,7 @@ CONFIG_BLK=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y
 CONFIG_DFU_NAND=y
+CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
 CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
configs/vinco_defconfig +1 -0
index 2684324cace6..8ca7556772b8 100644
@@ -31,6 +31,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="at91-vinco"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_AT91_GPIO=y
 CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_SPI_FLASH=y
 CONFIG_SF_DEFAULT_MODE=0
configs/wb45n_defconfig +1 -0
index 5728cfb45481..d770e007a655 100644
@@ -33,6 +33,7 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_AT91_GPIO=y
 CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 # CONFIG_SYS_NAND_USE_FLASH_BBT is not set
configs/wb50n_defconfig +1 -0
index 86a8549406bf..e764c303d069 100644
@@ -33,6 +33,7 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+CONFIG_AT91_GPIO=y
 CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 # CONFIG_SYS_NAND_USE_FLASH_BBT is not set
drivers/gpio/Kconfig +0 -1
index d87f6cc10517..af608b7b0ef1 100644
@@ -77,7 +77,6 @@ config DWAPB_GPIO
 
 config AT91_GPIO
 	bool "AT91 PIO GPIO driver"
-	depends on DM_GPIO
 	default n
 	help
 	  Say yes here to select AT91 PIO GPIO driver. AT91 PIO
include/configs/at91-sama5_common.h +0 -5
index 624b05ad08ce..53629743d9d4 100644
@@ -19,11 +19,6 @@
 #define CONFIG_SKIP_LOWLEVEL_INIT
 #endif
 
-/* general purpose I/O */
-#if !CONFIG_IS_ENABLED(DM_GPIO)
-#define CONFIG_AT91_GPIO
-#endif
-
 /*
  * BOOTP options
  */
include/configs/corvus.h +0 -1
index e9064a200d32..1dc946d78990 100644
@@ -36,7 +36,6 @@
 
 /* general purpose I/O */
 #define CONFIG_ATMEL_LEGACY		/* required until (g)pio is fixed */
-#define CONFIG_AT91_GPIO
 #define CONFIG_AT91_GPIO_PULLUP	1	/* keep pullups on peripheral pins */
 
 /* serial console */
include/configs/picosam9g45.h +0 -1
index 2747c0cb9307..94d9111cbaae 100644
@@ -28,7 +28,6 @@
 
 /* general purpose I/O */
 #define CONFIG_ATMEL_LEGACY		/* required until (g)pio is fixed */
-#define CONFIG_AT91_GPIO
 #define CONFIG_AT91_GPIO_PULLUP	1	/* keep pullups on peripheral pins */
 
 /* serial console */
include/configs/smartweb.h +0 -1
index aacdd1263e7b..8c964087131d 100644
@@ -85,7 +85,6 @@
 
 /* general purpose I/O */
 #define CONFIG_ATMEL_LEGACY		/* required until (g)pio is fixed */
-#define CONFIG_AT91_GPIO		/* enable the GPIO features */
 #define CONFIG_AT91_GPIO_PULLUP	1	/* keep pullups on peripheral pins */
 
 /* serial console */
include/configs/snapper9260.h +0 -1
index 35cd7f69c1d8..32dd544a6c75 100644
@@ -62,7 +62,6 @@
 
 /* GPIOs and IO expander */
 #define CONFIG_ATMEL_LEGACY
-#define CONFIG_AT91_GPIO
 #define CONFIG_AT91_GPIO_PULLUP		1
 #define CONFIG_PCA953X
 #define CONFIG_SYS_I2C_PCA953X_ADDR	0x28
include/configs/snapper9g45.h +0 -1
index fcd35b715ce1..db4fd9be247f 100644
@@ -60,7 +60,6 @@
 
 /* GPIOs and IO expander */
 #define CONFIG_ATMEL_LEGACY
-#define CONFIG_AT91_GPIO
 #define CONFIG_AT91_GPIO_PULLUP		1
 
 /* UARTs/Serial console */
include/configs/taurus.h +0 -1
index 9990c9340a3d..b9b9292502e1 100644
@@ -41,7 +41,6 @@
 
 /* general purpose I/O */
 #define CONFIG_ATMEL_LEGACY		/* required until (g)pio is fixed */
-#define CONFIG_AT91_GPIO
 #define CONFIG_AT91_GPIO_PULLUP	1	/* keep pullups on peripheral pins */
 
 #define CONFIG_USART_BASE		ATMEL_BASE_DBGU
include/configs/wb45n.h +0 -1
index d256ce8e4b9b..f13ad112f793 100644
@@ -20,7 +20,6 @@
 
 /* general purpose I/O */
 #define CONFIG_ATMEL_LEGACY	/* required until (g)pio is fixed */
-#define CONFIG_AT91_GPIO
 
 /* serial console */
 #define CONFIG_ATMEL_USART
include/configs/wb50n.h +0 -3
index bb4deeac9b7d..ffcc9877eddb 100644
@@ -20,9 +20,6 @@
 #define CONFIG_SKIP_LOWLEVEL_INIT
 #endif
 
-/* general purpose I/O */
-#define CONFIG_AT91_GPIO
-
 /* serial console */
 #define CONFIG_ATMEL_USART
 #define CONFIG_USART_BASE       ATMEL_BASE_DBGU
Signature · 1 line
2.17.1
author
#9 lore raw

PATCH v2 5/31 Convert CONFIG_AT91_GPIO to Kconfig

Quoted 4 lines · Tom Rini

This converts the following to Kconfig:
CONFIG_AT91_GPIO

Applied to u-boot/next, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200630/38048b4c/attachment.sig>
author
#10 lore raw

PATCH v2 6/31 Convert CONFIG_ATMEL_HLCD to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_ATMEL_HLCD

---
 configs/at91sam9n12ek_mmc_defconfig       | 1 +
 configs/at91sam9n12ek_nandflash_defconfig | 1 +
 configs/at91sam9n12ek_spiflash_defconfig  | 1 +
 drivers/video/Kconfig                     | 1 -
 include/configs/at91sam9n12ek.h           | 1 -
 5 files changed, 3 insertions(+), 2 deletions(-)
configs/at91sam9n12ek_mmc_defconfig +1 -0
index 6f159aaccfa0..5a147a0bf628 100644
@@ -61,4 +61,5 @@ CONFIG_ATMEL_PIT_TIMER=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_ATMEL_HLCD=y
 CONFIG_LCD=y
configs/at91sam9n12ek_nandflash_defconfig +1 -0
index 490addbedfd6..8263ffb1312e 100644
@@ -62,4 +62,5 @@ CONFIG_ATMEL_PIT_TIMER=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_ATMEL_HLCD=y
 CONFIG_LCD=y
configs/at91sam9n12ek_spiflash_defconfig +1 -0
index 688f0c3a286e..0e95cff73363 100644
@@ -63,4 +63,5 @@ CONFIG_ATMEL_PIT_TIMER=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_ATMEL_HLCD=y
 CONFIG_LCD=y
drivers/video/Kconfig +0 -1
index 05c173b9331c..026c6572489d 100644
@@ -469,7 +469,6 @@ config NXP_TDA19988
 
 config ATMEL_HLCD
 	bool "Enable ATMEL video support using HLCDC"
-	depends on DM_VIDEO
 	help
 	   HLCDC supports video output to an attached LCD panel.
 
include/configs/at91sam9n12ek.h +0 -1
index 706217fef9a4..c2d4e485a9d3 100644
@@ -25,7 +25,6 @@
 #define CONFIG_LCD_LOGO
 #define CONFIG_LCD_INFO
 #define CONFIG_LCD_INFO_BELOW_LOGO
-#define CONFIG_ATMEL_HLCD
 #define CONFIG_ATMEL_LCD_RGB565
 
 /*
Signature · 1 line
2.17.1
author
#11 lore raw

PATCH v2 6/31 Convert CONFIG_ATMEL_HLCD to Kconfig

Quoted 4 lines · Tom Rini

This converts the following to Kconfig:
CONFIG_ATMEL_HLCD

Applied to u-boot/next, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200630/404b2d20/attachment.sig>
author
#12 lore raw

PATCH v2 7/31 Convert CONFIG_ATMEL_NAND_HW_PMECC et al to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_ATMEL_NAND_HW_PMECC
CONFIG_ATMEL_NAND_HWECC
CONFIG_NAND_ATMEL
CONFIG_PMECC_CAP
CONFIG_PMECC_SECTOR_SIZE

---
 configs/sam9x60ek_nandflash_defconfig | 4 ++++
 configs/sam9x60ek_qspiflash_defconfig | 4 ++++
 include/configs/sam9x60ek.h           | 7 -------
 3 files changed, 8 insertions(+), 7 deletions(-)
configs/sam9x60ek_nandflash_defconfig +4 -0
index b59e4be4be80..d09f78828fa8 100644
@@ -50,6 +50,10 @@ CONFIG_MICROCHIP_FLEXCOM=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
 CONFIG_MTD=y
+# CONFIG_SYS_NAND_USE_FLASH_BBT is not set
+CONFIG_NAND_ATMEL=y
+CONFIG_ATMEL_NAND_HW_PMECC=y
+CONFIG_PMECC_CAP=8
 CONFIG_PHY_MICREL=y
 CONFIG_DM_ETH=y
 CONFIG_MACB=y
configs/sam9x60ek_qspiflash_defconfig +4 -0
index 37de4044e9dc..6c4f534974e8 100644
@@ -60,6 +60,10 @@ CONFIG_GENERIC_ATMEL_MCI=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_RAW_NAND=y
+# CONFIG_SYS_NAND_USE_FLASH_BBT is not set
+CONFIG_NAND_ATMEL=y
+CONFIG_ATMEL_NAND_HW_PMECC=y
+CONFIG_PMECC_CAP=8
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_SPANSION=y
include/configs/sam9x60ek.h +0 -7
index 9b439a644161..19714402ca45 100644
@@ -44,7 +44,6 @@
 
 /* NAND flash */
 #ifdef CONFIG_CMD_NAND
-#define CONFIG_NAND_ATMEL
 #define CONFIG_SYS_MAX_NAND_DEVICE	1
 #define CONFIG_SYS_NAND_BASE		0x40000000
 #define CONFIG_SYS_NAND_MASK_ALE	BIT(21)
@@ -54,12 +53,6 @@
 #define CONFIG_SYS_NAND_ONFI_DETECTION
 #endif
 
-/* PMECC & PMERRLOC */
-#define CONFIG_ATMEL_NAND_HWECC
-#define CONFIG_ATMEL_NAND_HW_PMECC
-#define CONFIG_PMECC_CAP		8
-#define CONFIG_PMECC_SECTOR_SIZE	512
-
 #define CONFIG_SYS_LOAD_ADDR		0x22000000	/* load address */
 
 #ifdef CONFIG_SD_BOOT
Signature · 1 line
2.17.1
author
#13 lore raw

PATCH v2 7/31 Convert CONFIG_ATMEL_NAND_HW_PMECC et al to Kconfig

Quoted 8 lines · Tom Rini

This converts the following to Kconfig:
CONFIG_ATMEL_NAND_HW_PMECC
CONFIG_ATMEL_NAND_HWECC
CONFIG_NAND_ATMEL
CONFIG_PMECC_CAP
CONFIG_PMECC_SECTOR_SIZE

Applied to u-boot/next, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200630/1568a6a4/attachment.sig>
author
#14 lore raw

PATCH v2 8/31 Convert CONFIG_ATMEL_USART to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_ATMEL_USART

---
 configs/at91rm9200ek_defconfig     | 1 +
 configs/at91rm9200ek_ram_defconfig | 1 +
 configs/gurnard_defconfig          | 1 +
 configs/picosam9g45_defconfig      | 1 +
 configs/smartweb_defconfig         | 1 +
 configs/snapper9260_defconfig      | 1 +
 configs/snapper9g20_defconfig      | 1 +
 configs/vinco_defconfig            | 1 +
 configs/wb45n_defconfig            | 1 +
 configs/wb50n_defconfig            | 1 +
 include/configs/at91rm9200ek.h     | 1 -
 include/configs/picosam9g45.h      | 1 -
 include/configs/smartweb.h         | 1 -
 include/configs/snapper9260.h      | 1 -
 include/configs/snapper9g45.h      | 1 -
 include/configs/vinco.h            | 1 -
 include/configs/wb45n.h            | 1 -
 include/configs/wb50n.h            | 1 -
 18 files changed, 10 insertions(+), 8 deletions(-)
configs/at91rm9200ek_defconfig +1 -0
index 2aaf87904562..a990360794f4 100644
@@ -29,6 +29,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_MII=y
+CONFIG_ATMEL_USART=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y
configs/at91rm9200ek_ram_defconfig +1 -0
index 9d2fc473430b..143346158b47 100644
@@ -30,6 +30,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_MII=y
+CONFIG_ATMEL_USART=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y
configs/gurnard_defconfig +1 -0
index a679c0f6700b..5e0d6f7c2329 100644
@@ -39,6 +39,7 @@ CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_ATMEL_NAND_HWECC=y
 CONFIG_PHYLIB=y
+CONFIG_ATMEL_USART=y
 CONFIG_TIMER=y
 CONFIG_ATMEL_PIT_TIMER=y
 CONFIG_USB=y
configs/picosam9g45_defconfig +1 -0
index 2921f2dfd4f7..03783a2af067 100644
@@ -40,6 +40,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM=y
 CONFIG_SPL_DM=y
 CONFIG_AT91_GPIO=y
+CONFIG_ATMEL_USART=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
configs/smartweb_defconfig +1 -0
index 4545c7075b3f..e7edb01c41d9 100644
@@ -56,6 +56,7 @@ CONFIG_MTD_RAW_NAND=y
 # CONFIG_SYS_NAND_USE_FLASH_BBT is not set
 CONFIG_NAND_ATMEL=y
 CONFIG_PHYLIB=y
+CONFIG_ATMEL_USART=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
configs/snapper9260_defconfig +1 -0
index 9e44395f03f0..fa4697989b85 100644
@@ -37,5 +37,6 @@ CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 # CONFIG_SYS_NAND_USE_FLASH_BBT is not set
 CONFIG_NAND_ATMEL=y
+CONFIG_ATMEL_USART=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
configs/snapper9g20_defconfig +1 -0
index e1c5c2ef4c1f..abe033373459 100644
@@ -36,5 +36,6 @@ CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 # CONFIG_SYS_NAND_USE_FLASH_BBT is not set
 CONFIG_NAND_ATMEL=y
+CONFIG_ATMEL_USART=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
configs/vinco_defconfig +1 -0
index 8ca7556772b8..d4852eafe0d4 100644
@@ -38,6 +38,7 @@ CONFIG_SF_DEFAULT_MODE=0
 CONFIG_SF_DEFAULT_SPEED=50000000
 CONFIG_PHY_SMSC=y
 CONFIG_ETH_DESIGNWARE=y
+CONFIG_ATMEL_USART=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
configs/wb45n_defconfig +1 -0
index d770e007a655..ef069a672cc2 100644
@@ -40,6 +40,7 @@ CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_PMECC_CAP=4
 CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER=y
+CONFIG_ATMEL_USART=y
 CONFIG_LZMA=y
 CONFIG_LZO=y
 CONFIG_OF_LIBFDT=y
configs/wb50n_defconfig +1 -0
index e764c303d069..1b444f07529d 100644
@@ -43,5 +43,6 @@ CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
+CONFIG_ATMEL_USART=y
 CONFIG_LZMA=y
 CONFIG_OF_LIBFDT=y
include/configs/at91rm9200ek.h +0 -1
index 378f9dc48be4..5e1e59074758 100644
@@ -96,7 +96,6 @@
  * CONFIG_DBGU is DBGU unit on J10
  * CONFIG_USART1 is USART1 on J14
  */
-#define CONFIG_ATMEL_USART
 #define CONFIG_USART_BASE	ATMEL_BASE_DBGU
 #define CONFIG_USART_ID		0/* ignored in arm */
 
include/configs/picosam9g45.h +0 -1
index 94d9111cbaae..3eb70d5e7821 100644
@@ -31,7 +31,6 @@
 #define CONFIG_AT91_GPIO_PULLUP	1	/* keep pullups on peripheral pins */
 
 /* serial console */
-#define CONFIG_ATMEL_USART
 #define CONFIG_USART_BASE		ATMEL_BASE_DBGU
 #define	CONFIG_USART_ID			ATMEL_ID_SYS
 
include/configs/smartweb.h +0 -1
index 8c964087131d..9498513f76f1 100644
@@ -88,7 +88,6 @@
 #define CONFIG_AT91_GPIO_PULLUP	1	/* keep pullups on peripheral pins */
 
 /* serial console */
-#define CONFIG_ATMEL_USART
 #define CONFIG_USART_BASE		ATMEL_BASE_DBGU
 #define CONFIG_USART_ID			ATMEL_ID_SYS
 
include/configs/snapper9260.h +0 -1
index 32dd544a6c75..cbef61877e28 100644
@@ -68,7 +68,6 @@
 #define CONFIG_SYS_I2C_PCA953X_WIDTH	{ {0x28, 16} }
 
 /* UARTs/Serial console */
-#define CONFIG_ATMEL_USART
 #ifndef CONFIG_DM_SERIAL
 #define CONFIG_USART_BASE		ATMEL_BASE_DBGU
 #define CONFIG_USART_ID			ATMEL_ID_SYS
include/configs/snapper9g45.h +0 -1
index db4fd9be247f..24bbea7d03b5 100644
@@ -63,7 +63,6 @@
 #define CONFIG_AT91_GPIO_PULLUP		1
 
 /* UARTs/Serial console */
-#define CONFIG_ATMEL_USART
 
 /* Boot options */
 #define CONFIG_SYS_LOAD_ADDR		0x23000000
include/configs/vinco.h +0 -1
index 83ec78dc4315..496c228b58ea 100644
@@ -17,7 +17,6 @@
 /* The value in the common file is too far away for the VInCo platform */
 
 /* serial console */
-#define CONFIG_ATMEL_USART
 #define CONFIG_USART_BASE		0xfc00c000
 #define CONFIG_USART_ID			30
 
include/configs/wb45n.h +0 -1
index f13ad112f793..8b333de8cffd 100644
@@ -22,7 +22,6 @@
 #define CONFIG_ATMEL_LEGACY	/* required until (g)pio is fixed */
 
 /* serial console */
-#define CONFIG_ATMEL_USART
 #define CONFIG_USART_BASE   ATMEL_BASE_DBGU
 #define CONFIG_USART_ID     ATMEL_ID_SYS
 
include/configs/wb50n.h +0 -1
index ffcc9877eddb..c2112763a2bb 100644
@@ -21,7 +21,6 @@
 #endif
 
 /* serial console */
-#define CONFIG_ATMEL_USART
 #define CONFIG_USART_BASE       ATMEL_BASE_DBGU
 #define CONFIG_USART_ID         ATMEL_ID_DBGU
 
Signature · 1 line
2.17.1
author
#15 lore raw

PATCH v2 8/31 Convert CONFIG_ATMEL_USART to Kconfig

Quoted 4 lines · Tom Rini

This converts the following to Kconfig:
CONFIG_ATMEL_USART

Applied to u-boot/next, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200630/114d681c/attachment.sig>
author
#16 lore raw

PATCH v2 9/31 bk4r1: Re-convert CONFIG_AUTOBOOT_PROMPT et al to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_AUTOBOOT_PROMPT
CONFIG_AUTOBOOT_KEYED
CONFIG_AUTOBOOT_STOP_STR

---
 configs/bk4r1_defconfig | 3 +++
 include/configs/bk4r1.h | 6 ------
 2 files changed, 3 insertions(+), 6 deletions(-)
configs/bk4r1_defconfig +3 -0
index 8c2bda6984ae..bcad243dd2bd 100644
@@ -18,6 +18,9 @@ CONFIG_BOOTDELAY=3
 CONFIG_USE_PREBOOT=y
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_HUSH_PARSER=y
+CONFIG_AUTOBOOT_KEYED=y
+CONFIG_AUTOBOOT_PROMPT="Enter passphrase to stop autoboot, booting in %d seconds\n"
+CONFIG_AUTOBOOT_STOP_STR="123"
 # CONFIG_CMD_ELF is not set
 CONFIG_CMD_MEMTEST=y
 CONFIG_SYS_MEMTEST_START=0x80010000
include/configs/bk4r1.h +0 -6
index f88172a05c55..300b9c7b7afb 100644
@@ -57,12 +57,6 @@
 						"saveenv; " \
 						"fi; "
 
-/* Autoboot options */
-#define CONFIG_AUTOBOOT_KEYED
-#define CONFIG_AUTOBOOT_PROMPT	\
-	"Enter passphrase to stop autoboot, booting in %d seconds\n"
-#define CONFIG_AUTOBOOT_STOP_STR "123"
-
 #include <asm/arch/imx-regs.h>
 #include <linux/sizes.h>
 
Signature · 1 line
2.17.1
author
#17 lore raw

PATCH v2 9/31 bk4r1: Re-convert CONFIG_AUTOBOOT_PROMPT et al to Kconfig

Quoted 6 lines · Tom Rini

This converts the following to Kconfig:
CONFIG_AUTOBOOT_PROMPT
CONFIG_AUTOBOOT_KEYED
CONFIG_AUTOBOOT_STOP_STR

Applied to u-boot/next, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200630/4ee00aa1/attachment.sig>
author
#18 lore raw

PATCH v2 10/31 Convert CONFIG_BAUDRATE to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_BAUDRATE

---
 README                            | 5 -----
 include/configs/apalis-imx8.h     | 3 ---
 include/configs/bcm_northstar2.h  | 1 -
 include/configs/bcmstb.h          | 1 -
 include/configs/colibri-imx8x.h   | 3 ---
 include/configs/controlcenterdc.h | 2 --
 include/configs/dh_imx6.h         | 1 -
 include/configs/display5.h        | 1 -
 include/configs/grpeach.h         | 3 ---
 include/configs/imx8mq_evk.h      | 2 --
 include/configs/imx8qm_mek.h      | 3 ---
 include/configs/imx8qm_rom7720.h  | 3 ---
 include/configs/imx8qxp_mek.h     | 3 ---
 include/configs/ls1021atsn.h      | 2 --
 include/configs/ls1028a_common.h  | 1 -
 include/configs/ls1088a_common.h  | 1 -
 include/configs/lx2160a_common.h  | 1 -
 include/configs/mx53ppd.h         | 1 -
 include/configs/mx6memcal.h       | 1 -
 include/configs/mx7ulp_evk.h      | 1 -
 include/configs/owl-common.h      | 3 ---
 include/configs/pdu001.h          | 1 -
 include/configs/pico-imx8mq.h     | 2 --
 include/configs/presidio_asic.h   | 1 -
 include/configs/rk3128_common.h   | 1 -
 include/configs/rk3368_common.h   | 1 -
 include/configs/wb50n.h           | 2 --
 27 files changed, 50 deletions(-)
README +0 -5
index bcf198363111..a0f54645fc26 100644
@@ -670,11 +670,6 @@ The following options need to be configured:
 		Define this variable to enable hw flow control in serial driver.
 		Current user of this option is drivers/serial/nsl16550.c driver
 
-- Console Baudrate:
-		CONFIG_BAUDRATE - in bps
-		Select one of the baudrates listed in
-		CONFIG_SYS_BAUDRATE_TABLE, see below.
-
 - Autoboot Command:
 		CONFIG_BOOTCOMMAND
 		Only needed when CONFIG_BOOTDELAY is enabled;
include/configs/apalis-imx8.h +0 -3
index 08d34db1061e..6dad8216e969 100644
@@ -103,9 +103,6 @@
 #define PHYS_SDRAM_1_SIZE		SZ_2G		/* 2 GB */
 #define PHYS_SDRAM_2_SIZE		SZ_2G		/* 2 GB */
 
-/* Serial */
-#define CONFIG_BAUDRATE			115200
-
 /* Monitor Command Prompt */
 #define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_CBSIZE		SZ_2K
include/configs/bcm_northstar2.h +0 -1
index 45dc7b29c9e4..fbfab288b372 100644
@@ -31,7 +31,6 @@
 #define CONFIG_SYS_NS16550_COM2			0x66110000
 #define CONFIG_SYS_NS16550_COM3			0x66120000
 #define CONFIG_SYS_NS16550_COM4			0x66130000
-#define CONFIG_BAUDRATE				115200
 
 /* console configuration */
 #define CONFIG_SYS_CBSIZE			SZ_1K
include/configs/bcmstb.h +0 -1
index 24569f7d94a8..01cfed0b869d 100644
@@ -115,7 +115,6 @@ extern phys_addr_t prior_stage_fdt_address;
 /*
  * Serial console configuration.
  */
-#define CONFIG_BAUDRATE			115200
 #define CONFIG_SYS_BAUDRATE_TABLE	{4800, 9600, 19200, 38400, 57600, \
 					 115200}
 
include/configs/colibri-imx8x.h +0 -3
index da9226e2fbed..0ac4e7095de9 100644
@@ -135,9 +135,6 @@
 #define PHYS_SDRAM_1_SIZE		SZ_2G		/* 2 GB */
 #define PHYS_SDRAM_2_SIZE		0x00000000	/* 0 GB */
 
-/* Serial */
-#define CONFIG_BAUDRATE			115200
-
 /* Monitor Command Prompt */
 #define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_CBSIZE		SZ_2K
include/configs/controlcenterdc.h +0 -2
index 00e5c8f7943e..0c36ea661057 100644
@@ -112,8 +112,6 @@
  */
 #define CONFIG_ENV_OVERWRITE
 
-#define CONFIG_BAUDRATE 115200
-
 #define CONFIG_HOSTNAME		"ccdc"
 #define CONFIG_ROOTPATH		"/opt/nfsroot"
 #define CONFIG_BOOTFILE		"ccdc.img"
include/configs/dh_imx6.h +0 -1
index 5bfdf4044bee..0b6617fa82e9 100644
@@ -62,7 +62,6 @@
 /* UART */
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE		UART1_BASE
-#define CONFIG_BAUDRATE			115200
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
include/configs/display5.h +0 -1
index 3348ecc7c7ba..94baa6561022 100644
@@ -66,7 +66,6 @@
 
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
-#define CONFIG_BAUDRATE			115200
 
 #ifndef CONFIG_BOOTCOMMAND
 #define CONFIG_BOOTCOMMAND "if run check_em_pad; then " \
include/configs/grpeach.h +0 -3
index 001e9d385ba1..bde168d47505 100644
@@ -11,9 +11,6 @@
 /* Board Clock , P1 clock frequency (XTAL=13.33MHz) */
 #define CONFIG_SYS_CLK_FREQ	66666666
 
-/* Serial Console */
-#define CONFIG_BAUDRATE		115200
-
 /* Miscellaneous */
 #define CONFIG_SYS_PBSIZE	256
 #define CONFIG_CMDLINE_TAG
include/configs/imx8mq_evk.h +0 -2
index f71efd45abdb..33a301409520 100644
@@ -175,8 +175,6 @@
 #define PHYS_SDRAM                      0x40000000
 #define PHYS_SDRAM_SIZE			0xC0000000 /* 3GB DDR */
 
-#define CONFIG_BAUDRATE			115200
-
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE		UART1_BASE_ADDR
 
include/configs/imx8qm_mek.h +0 -3
index 8324767eb557..fd68c4f052e7 100644
@@ -175,9 +175,6 @@
 #define PHYS_SDRAM_1_SIZE		0x80000000	/* 2 GB */
 #define PHYS_SDRAM_2_SIZE		0x100000000	/* 4 GB */
 
-/* Serial */
-#define CONFIG_BAUDRATE			115200
-
 /* Generic Timer Definitions */
 #define COUNTER_FREQUENCY		8000000	/* 8MHz */
 
include/configs/imx8qm_rom7720.h +0 -3
index 89d7adabea84..9808e72474f0 100644
@@ -163,9 +163,6 @@
 /* LPDDR4 board total DDR is 6GB, DDR4 board total DDR is 4 GB */
 #define PHYS_SDRAM_2_SIZE		0x80000000	/* 2 GB */
 
-/* Serial */
-#define CONFIG_BAUDRATE			115200
-
 /* Generic Timer Definitions */
 #define COUNTER_FREQUENCY		8000000	/* 8MHz */
 
include/configs/imx8qxp_mek.h +0 -3
index a58f68c17e6c..b442b48becf5 100644
@@ -175,9 +175,6 @@
 /* LPDDR4 board total DDR is 3GB */
 #define PHYS_SDRAM_2_SIZE		0x40000000	/* 1 GB */
 
-/* Serial */
-#define CONFIG_BAUDRATE			115200
-
 /* Generic Timer Definitions */
 #define COUNTER_FREQUENCY		8000000	/* 8MHz */
 
include/configs/ls1021atsn.h +0 -2
index 46c60aaf5cbc..ec2ed7c60969 100644
@@ -104,8 +104,6 @@
 #endif
 #define CONFIG_SYS_NS16550_CLK		get_serial_clock()
 
-#define CONFIG_BAUDRATE			115200
-
 /* I2C */
 #ifndef CONFIG_DM_I2C
 #define CONFIG_SYS_I2C
include/configs/ls1028a_common.h +0 -1
index f9040e661d01..44f2dc8f9b41 100644
@@ -48,7 +48,6 @@
 #define CONFIG_SYS_NS16550_REG_SIZE     1
 #define CONFIG_SYS_NS16550_CLK          (get_bus_freq(0) / 2)
 
-#define CONFIG_BAUDRATE			115200
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /* Miscellaneous configurable options */
include/configs/ls1088a_common.h +0 -1
index 596f14bf3e9e..3ea16752de09 100644
@@ -64,7 +64,6 @@
 #define CONFIG_SYS_NS16550_REG_SIZE     1
 #define CONFIG_SYS_NS16550_CLK          (get_bus_freq(0) / 2)
 
-#define CONFIG_BAUDRATE			115200
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 #if !defined(SPL_NO_IFC) || defined(CONFIG_TARGET_LS1088AQDS)
include/configs/lx2160a_common.h +0 -1
index 5ab924457efb..a8636d398eeb 100644
@@ -78,7 +78,6 @@
 					(void *)CONFIG_SYS_SERIAL1, \
 					(void *)CONFIG_SYS_SERIAL2, \
 					(void *)CONFIG_SYS_SERIAL3 }
-#define CONFIG_BAUDRATE			115200
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /* MC firmware */
include/configs/mx53ppd.h +0 -1
index bb6d82d32749..2ee66612c21b 100644
@@ -33,7 +33,6 @@
 
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
-#define CONFIG_BAUDRATE			115200
 
 /* Command definition */
 
include/configs/mx6memcal.h +0 -1
index b774b167f648..0a28d61703a2 100644
@@ -27,7 +27,6 @@
 #else
 #error please define serial console (CONFIG_SERIAL_CONSOLE_UARTx)
 #endif
-#define CONFIG_BAUDRATE			115200
 
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + 16)
 
include/configs/mx7ulp_evk.h +0 -1
index 942b7dd41483..5e05b8c16693 100644
@@ -39,7 +39,6 @@
 
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
-#define CONFIG_BAUDRATE			115200
 
 #define CONFIG_SYS_CACHELINE_SIZE      64
 
include/configs/owl-common.h +0 -3
index f77a5fa4c114..98b5a96cf61c 100644
@@ -29,9 +29,6 @@
  */
 #define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_TEXT_BASE + 0x7ff00)
 
-/* UART Definitions */
-#define CONFIG_BAUDRATE			115200
-
 /* Console configuration */
 #define CONFIG_SYS_CBSIZE		1024	/* Console buffer size */
 #define CONFIG_SYS_MAXARGS		64
include/configs/pdu001.h +0 -1
index d524f3cbcf01..e4b14c5ecd6b 100644
@@ -73,6 +73,5 @@
 #define CONFIG_SYS_NS16550_COM4	UART3_BASE
 #define CONFIG_SYS_NS16550_COM5	UART4_BASE
 #define CONFIG_SYS_NS16550_COM6	UART5_BASE
-#define CONFIG_BAUDRATE		115200
 
 #endif	/* ! __CONFIG_PDU001_H */
include/configs/pico-imx8mq.h +0 -2
index 2ae13b30ee53..7b7d633f2828 100644
@@ -150,8 +150,6 @@
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + \
 					(PHYS_SDRAM_SIZE >> 1))
 
-#define CONFIG_BAUDRATE			115200
-
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE		UART1_BASE_ADDR
 
include/configs/presidio_asic.h +0 -1
index 51177f44feed..34235b5a00c1 100644
@@ -41,7 +41,6 @@
 #define CORTINA_SERIAL_PORTS		{(void *)CONFIG_SYS_SERIAL0, \
 					 (void *)CONFIG_SYS_SERIAL1}
 
-#define CONFIG_BAUDRATE			115200
 #define CONFIG_SYS_SERIAL0		PER_UART0_CFG
 #define CONFIG_SYS_SERIAL1		PER_UART1_CFG
 
include/configs/rk3128_common.h +0 -1
index d0c9e5c809df..8f1d508b8ce2 100644
@@ -9,7 +9,6 @@
 #include "rockchip-common.h"
 
 #define CONFIG_SYS_MAXARGS		16
-#define CONFIG_BAUDRATE			115200
 #define CONFIG_SYS_CBSIZE		1024
 #define CONFIG_SKIP_LOWLEVEL_INIT
 
include/configs/rk3368_common.h +0 -1
index e57d0efa7f92..f178a06945db 100644
@@ -15,7 +15,6 @@
 
 #define CONFIG_SYS_SDRAM_BASE		0
 #define SDRAM_MAX_SIZE			0xff000000
-#define CONFIG_BAUDRATE			115200
 #define CONFIG_SYS_CBSIZE		1024
 #define CONFIG_SKIP_LOWLEVEL_INIT
 
include/configs/wb50n.h +0 -2
index c2112763a2bb..a210449dae49 100644
@@ -72,8 +72,6 @@
 #define CONFIG_BOOTARGS \
     "rw rootfstype=ubifs ubi.mtd=6 root=ubi0:rootfs"
 
-#define CONFIG_BAUDRATE             115200
-
 #define CONFIG_SYS_CBSIZE           1024
 #define CONFIG_SYS_MAXARGS          16
 #define CONFIG_SYS_PBSIZE \
Signature · 1 line
2.17.1
author
#19 lore raw

PATCH v2 10/31 Convert CONFIG_BAUDRATE to Kconfig

Quoted 4 lines · Tom Rini

This converts the following to Kconfig:
CONFIG_BAUDRATE

Applied to u-boot/next, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200630/66c2b4fe/attachment.sig>
author
#20 lore raw

PATCH v2 11/31 Convert CONFIG_BOARD_EARLY_INIT_F et al to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_BOARD_EARLY_INIT_F
CONFIG_BOARD_EARLY_INIT_R

---
 configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig | 1 +
 configs/deneb_defconfig                                        | 1 +
 configs/giedi_defconfig                                        | 1 +
 configs/imx8mq_evk_defconfig                                   | 1 +
 configs/imx8mq_phanbell_defconfig                              | 1 +
 configs/imx8qm_mek_defconfig                                   | 1 +
 configs/imx8qxp_mek_defconfig                                  | 1 +
 configs/mscc_jr2_defconfig                                     | 1 +
 configs/mscc_luton_defconfig                                   | 1 +
 configs/mscc_ocelot_defconfig                                  | 1 +
 configs/mscc_serval_defconfig                                  | 1 +
 configs/mscc_servalt_defconfig                                 | 1 +
 configs/mx7ulp_evk_defconfig                                   | 1 +
 configs/mx7ulp_evk_plugin_defconfig                            | 1 +
 configs/pico-imx8mq_defconfig                                  | 1 +
 configs/xilinx_zynqmp_mini_defconfig                           | 1 +
 configs/xilinx_zynqmp_mini_emmc0_defconfig                     | 1 +
 configs/xilinx_zynqmp_mini_emmc1_defconfig                     | 1 +
 configs/xilinx_zynqmp_mini_nand_defconfig                      | 1 +
 configs/xilinx_zynqmp_mini_nand_single_defconfig               | 1 +
 configs/xilinx_zynqmp_mini_qspi_defconfig                      | 1 +
 configs/xilinx_zynqmp_virt_defconfig                           | 1 +
 include/configs/capricorn-common.h                             | 2 --
 include/configs/imx8mq_evk.h                                   | 2 --
 include/configs/imx8mq_phanbell.h                              | 2 --
 include/configs/imx8qm_mek.h                                   | 2 --
 include/configs/imx8qxp_mek.h                                  | 2 --
 include/configs/lx2160a_common.h                               | 1 -
 include/configs/mx7ulp_evk.h                                   | 2 --
 include/configs/pico-imx8mq.h                                  | 2 --
 include/configs/vcoreiii.h                                     | 1 -
 include/configs/xilinx_zynqmp.h                                | 2 --
 32 files changed, 22 insertions(+), 18 deletions(-)
configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig +1 -0
index 030d28a5dfc7..227a5416c63f 100644
@@ -15,6 +15,7 @@ CONFIG_FIT_VERBOSE=y
 CONFIG_SPL_LOAD_FIT=y
 CONFIG_BOOTDELAY=0
 # CONFIG_DISPLAY_CPUINFO is not set
+CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL_OS_BOOT=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_SYS_MEMTEST_START=0x00000000
configs/deneb_defconfig +1 -0
index 9682cb7ca1a2..31a68f824025 100644
@@ -23,6 +23,7 @@ CONFIG_OF_SYSTEM_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/siemens/capricorn/imximage.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_LOG=y
+CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL_BOARD_INIT=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 CONFIG_SPL_SEPARATE_BSS=y
configs/giedi_defconfig +1 -0
index 4e22a02aacd5..5dd34227af01 100644
@@ -23,6 +23,7 @@ CONFIG_OF_SYSTEM_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/siemens/capricorn/imximage.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_LOG=y
+CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL_BOARD_INIT=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 CONFIG_SPL_SEPARATE_BSS=y
configs/imx8mq_evk_defconfig +1 -0
index 871f784b49b0..caa56e38c525 100644
@@ -15,6 +15,7 @@ CONFIG_SPL_LOAD_FIT=y
 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage.cfg"
 CONFIG_BOARD_LATE_INIT=y
+CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL_BOARD_INIT=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_BOOTM_NETBSD is not set
configs/imx8mq_phanbell_defconfig +1 -0
index 5364b58b7bff..65d952503f74 100644
@@ -16,6 +16,7 @@ CONFIG_SPL_LOAD_FIT=y
 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage.cfg"
 CONFIG_SD_BOOT=y
+CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL_BOARD_INIT=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_BOOTM_NETBSD is not set
configs/imx8qm_mek_defconfig +1 -0
index dc490bcf573a..5f68f9cac258 100644
@@ -21,6 +21,7 @@ CONFIG_OF_SYSTEM_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qm_mek/imximage.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_LOG=y
+CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL_BOARD_INIT=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 CONFIG_SPL_SEPARATE_BSS=y
configs/imx8qxp_mek_defconfig +1 -0
index 9a31fb8e80ed..5f8513ae53c2 100644
@@ -21,6 +21,7 @@ CONFIG_OF_SYSTEM_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qxp_mek/imximage.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_LOG=y
+CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL_BOARD_INIT=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 CONFIG_SPL_SEPARATE_BSS=y
configs/mscc_jr2_defconfig +1 -0
index 9bd90ddc3d70..ab4f9b6255ba 100644
@@ -19,6 +19,7 @@ CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS0,115200"
 CONFIG_LOGLEVEL=7
 CONFIG_DISPLAY_CPUINFO=y
+CONFIG_BOARD_EARLY_INIT_R=y
 CONFIG_SYS_PROMPT="jr2 # "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_CONSOLE is not set
configs/mscc_luton_defconfig +1 -0
index a57d033d30a9..55edb199993b 100644
@@ -21,6 +21,7 @@ CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS0,115200"
 CONFIG_LOGLEVEL=7
 CONFIG_DISPLAY_CPUINFO=y
+CONFIG_BOARD_EARLY_INIT_R=y
 CONFIG_SYS_PROMPT="luton # "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_CONSOLE is not set
configs/mscc_ocelot_defconfig +1 -0
index 32f4148e755f..3fe9e060bb56 100644
@@ -18,6 +18,7 @@ CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS0,115200"
 CONFIG_LOGLEVEL=7
 CONFIG_DISPLAY_CPUINFO=y
+CONFIG_BOARD_EARLY_INIT_R=y
 CONFIG_SYS_PROMPT="ocelot # "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_CONSOLE is not set
configs/mscc_serval_defconfig +1 -0
index e35219e3ce48..e423fc4efc52 100644
@@ -16,6 +16,7 @@ CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS0,115200"
 CONFIG_LOGLEVEL=7
 CONFIG_DISPLAY_CPUINFO=y
+CONFIG_BOARD_EARLY_INIT_R=y
 CONFIG_SYS_PROMPT="serval # "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_CONSOLE is not set
configs/mscc_servalt_defconfig +1 -0
index 669d9f6c23ff..49d8468226fc 100644
@@ -15,6 +15,7 @@ CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS0,115200"
 CONFIG_LOGLEVEL=7
 CONFIG_DISPLAY_CPUINFO=y
+CONFIG_BOARD_EARLY_INIT_R=y
 CONFIG_SYS_PROMPT="servalt # "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_CONSOLE is not set
configs/mx7ulp_evk_defconfig +1 -0
index 6908aeb2cc3f..32169c72403d 100644
@@ -9,6 +9,7 @@ CONFIG_NR_DRAM_BANKS=1
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7ulp_evk/imximage.cfg"
 CONFIG_BOUNCE_BUFFER=y
+CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_MEMTEST=y
configs/mx7ulp_evk_plugin_defconfig +1 -0
index 4cc7cca349fe..6c8e40b5b77a 100644
@@ -8,6 +8,7 @@ CONFIG_TARGET_MX7ULP_EVK=y
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7ulp_evk/imximage.cfg"
 CONFIG_BOUNCE_BUFFER=y
+CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_SYS_MEMTEST_START=0x60000000
configs/pico-imx8mq_defconfig +1 -0
index 2eeec09f1bbd..c51cfcc3a2bb 100644
@@ -15,6 +15,7 @@ CONFIG_SPL_LOAD_FIT=y
 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage.cfg"
 CONFIG_BOARD_LATE_INIT=y
+CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL_BOARD_INIT=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_BOOTM_NETBSD is not set
configs/xilinx_zynqmp_mini_defconfig +1 -0
index 4305db405839..0ca126f92961 100644
@@ -10,6 +10,7 @@ CONFIG_ZYNQMP_PSU_INIT_ENABLED=y
 # CONFIG_LEGACY_IMAGE_FORMAT is not set
 # CONFIG_BOARD_LATE_INIT is not set
 # CONFIG_DISPLAY_CPUINFO is not set
+CONFIG_BOARD_EARLY_INIT_F=y
 # CONFIG_CMDLINE_EDITING is not set
 # CONFIG_AUTO_COMPLETE is not set
 # CONFIG_SYS_LONGHELP is not set
configs/xilinx_zynqmp_mini_emmc0_defconfig +1 -0
index b041b40b84b9..7590f2f9ffbc 100644
@@ -11,6 +11,7 @@ CONFIG_FIT=y
 CONFIG_SUPPORT_RAW_INITRD=y
 # CONFIG_BOARD_LATE_INIT is not set
 # CONFIG_DISPLAY_CPUINFO is not set
+CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_BOARD_EARLY_INIT_R=y
 # CONFIG_CMDLINE_EDITING is not set
 # CONFIG_AUTO_COMPLETE is not set
configs/xilinx_zynqmp_mini_emmc1_defconfig +1 -0
index bd5603a6a13d..7e1ca1220894 100644
@@ -11,6 +11,7 @@ CONFIG_FIT=y
 CONFIG_SUPPORT_RAW_INITRD=y
 # CONFIG_BOARD_LATE_INIT is not set
 # CONFIG_DISPLAY_CPUINFO is not set
+CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_BOARD_EARLY_INIT_R=y
 # CONFIG_CMDLINE_EDITING is not set
 # CONFIG_AUTO_COMPLETE is not set
configs/xilinx_zynqmp_mini_nand_defconfig +1 -0
index 4f4efa0cfabf..834b344328bc 100644
@@ -10,6 +10,7 @@ CONFIG_FIT=y
 CONFIG_SUPPORT_RAW_INITRD=y
 # CONFIG_BOARD_LATE_INIT is not set
 # CONFIG_DISPLAY_CPUINFO is not set
+CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_BOARD_EARLY_INIT_R=y
 # CONFIG_CMDLINE_EDITING is not set
 # CONFIG_AUTO_COMPLETE is not set
configs/xilinx_zynqmp_mini_nand_single_defconfig +1 -0
index 3f780f746cfc..38d42d60212d 100644
@@ -10,6 +10,7 @@ CONFIG_FIT=y
 CONFIG_SUPPORT_RAW_INITRD=y
 # CONFIG_BOARD_LATE_INIT is not set
 # CONFIG_DISPLAY_CPUINFO is not set
+CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_BOARD_EARLY_INIT_R=y
 # CONFIG_CMDLINE_EDITING is not set
 # CONFIG_AUTO_COMPLETE is not set
configs/xilinx_zynqmp_mini_qspi_defconfig +1 -0
index 1f36f5c8e90a..866faddbeed6 100644
@@ -14,6 +14,7 @@ CONFIG_ZYNQMP_NO_DDR=y
 # CONFIG_LEGACY_IMAGE_FORMAT is not set
 # CONFIG_BOARD_LATE_INIT is not set
 # CONFIG_DISPLAY_CPUINFO is not set
+CONFIG_BOARD_EARLY_INIT_F=y
 # CONFIG_CMDLINE_EDITING is not set
 # CONFIG_AUTO_COMPLETE is not set
 # CONFIG_SYS_LONGHELP is not set
configs/xilinx_zynqmp_virt_defconfig +1 -0
index 7886d5a38f29..fe60d10c991d 100644
@@ -14,6 +14,7 @@ CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_SPL_LOAD_FIT=y
 # CONFIG_DISPLAY_CPUINFO is not set
+CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_BOARD_EARLY_INIT_R=y
 CONFIG_SPL_OS_BOOT=y
 CONFIG_SPL_RAM_SUPPORT=y
include/configs/capricorn-common.h +0 -2
index c671cb50afce..c2e9d0f11f9c 100644
@@ -42,8 +42,6 @@
 
 #define CONFIG_REMAKE_ELF
 
-#define CONFIG_BOARD_EARLY_INIT_F
-
 /* Commands */
 
 #undef CONFIG_BOOTM_NETBSD
include/configs/imx8mq_evk.h +0 -2
index 33a301409520..b564f3831e8c 100644
@@ -58,8 +58,6 @@
 
 #define CONFIG_REMAKE_ELF
 
-#define CONFIG_BOARD_EARLY_INIT_F
-
 /* ENET Config */
 /* ENET1 */
 #if defined(CONFIG_CMD_NET)
include/configs/imx8mq_phanbell.h +0 -2
index 6d038f21b74f..c655bb24a0ae 100644
@@ -55,8 +55,6 @@
 
 #define CONFIG_REMAKE_ELF
 
-#define CONFIG_BOARD_EARLY_INIT_F
-
 /* ENET Config */
 /* ENET1 */
 #if defined(CONFIG_CMD_NET)
include/configs/imx8qm_mek.h +0 -2
index fd68c4f052e7..1864374a4fc8 100644
@@ -35,8 +35,6 @@
 
 #define CONFIG_REMAKE_ELF
 
-#define CONFIG_BOARD_EARLY_INIT_F
-
 /* Flat Device Tree Definitions */
 #define CONFIG_OF_BOARD_SETUP
 
include/configs/imx8qxp_mek.h +0 -2
index b442b48becf5..5fdb67f0ece6 100644
@@ -35,8 +35,6 @@
 
 #define CONFIG_REMAKE_ELF
 
-#define CONFIG_BOARD_EARLY_INIT_F
-
 /* Flat Device Tree Definitions */
 #define CONFIG_OF_BOARD_SETUP
 
include/configs/lx2160a_common.h +0 -1
index a8636d398eeb..9bc287f7aa43 100644
@@ -20,7 +20,6 @@
 #define CONFIG_SYS_FLASH_BASE		0x20000000
 
 #define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_BOARD_EARLY_INIT_F	1
 
 /* DDR */
 #define CONFIG_FSL_DDR_INTERACTIVE	/* Interactive debugging */
include/configs/mx7ulp_evk.h +0 -2
index 5e05b8c16693..9e932690746a 100644
@@ -32,8 +32,6 @@
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN		(8 * SZ_1M)
 
-#define CONFIG_BOARD_EARLY_INIT_F
-
 /* UART */
 #define LPUART_BASE			LPUART4_RBASE
 
include/configs/pico-imx8mq.h +0 -2
index 7b7d633f2828..da2842934b5c 100644
@@ -54,8 +54,6 @@
 
 #define CONFIG_REMAKE_ELF
 
-#define CONFIG_BOARD_EARLY_INIT_F
-
 /* ENET Config */
 /* ENET1 */
 #if defined(CONFIG_CMD_NET)
include/configs/vcoreiii.h +0 -1
index d5b2a785bcf7..020f02caae9c 100644
@@ -40,7 +40,6 @@
 
 #define CONFIG_SYS_MONITOR_BASE         CONFIG_SYS_TEXT_BASE
 
-#define CONFIG_BOARD_EARLY_INIT_R
 #if defined(CONFIG_MTDIDS_DEFAULT) && defined(CONFIG_MTDPARTS_DEFAULT)
 #define VCOREIII_DEFAULT_MTD_ENV		    \
 	"mtdparts="CONFIG_MTDPARTS_DEFAULT"\0"	    \
include/configs/xilinx_zynqmp.h +0 -2
index e868c1341657..e7cfebee7c46 100644
@@ -256,6 +256,4 @@
 # error "Disable CONFIG_SPL_SYS_MALLOC_SIMPLE. Full malloc needs to be used"
 #endif
 
-#define CONFIG_BOARD_EARLY_INIT_F
-
 #endif /* __XILINX_ZYNQMP_H */
Signature · 1 line
2.17.1
author
#21 lore raw

PATCH v2 11/31 Convert CONFIG_BOARD_EARLY_INIT_F et al to Kconfig

Quoted 5 lines · Tom Rini

This converts the following to Kconfig:
CONFIG_BOARD_EARLY_INIT_F
CONFIG_BOARD_EARLY_INIT_R

Applied to u-boot/next, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200630/03a4fcbb/attachment.sig>
author
#22 lore raw

PATCH v2 12/31 Convert CONFIG_BOOTARGS to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_BOOTARGS

---
 configs/grpeach_defconfig              | 2 ++
 configs/imx28_xea_defconfig            | 2 ++
 configs/sama5d2_icp_mmc_defconfig      | 1 +
 configs/socfpga_agilex_defconfig       | 2 ++
 configs/socfpga_secu1_defconfig        | 2 ++
 configs/socfpga_stratix10_defconfig    | 2 ++
 configs/stmark2_defconfig              | 2 ++
 configs/wb45n_defconfig                | 2 ++
 configs/wb50n_defconfig                | 2 ++
 include/configs/grpeach.h              | 3 ---
 include/configs/sama5d27_som1_ek.h     | 6 ------
 include/configs/sama5d2_icp.h          | 3 ---
 include/configs/socfpga_arria5_secu1.h | 4 ----
 include/configs/socfpga_soc64_common.h | 1 -
 include/configs/stmark2.h              | 6 ------
 include/configs/wb45n.h                | 4 ----
 include/configs/wb50n.h                | 3 ---
 include/configs/xea.h                  | 1 -
 18 files changed, 17 insertions(+), 31 deletions(-)
configs/grpeach_defconfig +2 -0
index 417938a512ed..c4a2b449d676 100644
@@ -9,6 +9,8 @@ CONFIG_DM_GPIO=y
 CONFIG_RZA1=y
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_BOOTDELAY=3
+CONFIG_USE_BOOTARGS=y
+CONFIG_BOOTARGS="ignore_loglevel"
 # CONFIG_DISPLAY_CPUINFO is not set
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_ELF is not set
configs/imx28_xea_defconfig +2 -0
index d4feb661629f..592f3e387cc0 100644
@@ -22,6 +22,8 @@ CONFIG_SPL_TEXT_BASE=0x1000
 CONFIG_SPL_PAYLOAD="u-boot.img"
 CONFIG_FIT=y
 CONFIG_OF_BOARD_SETUP=y
+CONFIG_USE_BOOTARGS=y
+CONFIG_BOOTARGS="console=ttyAMA0,115200n8"
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL_BOARD_INIT=y
 # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
configs/sama5d2_icp_mmc_defconfig +1 -0
index dc4e815ec127..8f3efd81a032 100644
@@ -25,6 +25,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2"
 CONFIG_SD_BOOT=y
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
+CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait"
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_SPL_SEPARATE_BSS=y
 CONFIG_SPL_DISPLAY_PRINT=y
configs/socfpga_agilex_defconfig +2 -0
index 35316d7c252f..60397a8ccea6 100644
@@ -12,6 +12,8 @@ CONFIG_IDENT_STRING="socfpga_agilex"
 CONFIG_SPL_FS_FAT=y
 CONFIG_SPL_TEXT_BASE=0xFFE00000
 CONFIG_BOOTDELAY=5
+CONFIG_USE_BOOTARGS=y
+CONFIG_BOOTARGS="earlycon"
 CONFIG_SPL_CACHE=y
 CONFIG_SPL_SPI_LOAD=y
 CONFIG_HUSH_PARSER=y
configs/socfpga_secu1_defconfig +2 -0
index df30c7c5f0e2..8ebbf73148a4 100644
@@ -14,6 +14,8 @@ CONFIG_SPL_TEXT_BASE=0xFFFF0000
 CONFIG_BUILD_TARGET="u-boot-with-nand-spl.sfp"
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
+CONFIG_USE_BOOTARGS=y
+CONFIG_BOOTARGS="console=ttyS0,115200 ubi.fm_autoconvert=1 uio_pdrv_genirq.of_id=\"idq,regbank\""
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
configs/socfpga_stratix10_defconfig +2 -0
index 21014f9f8cde..16ae0feb6807 100644
@@ -12,6 +12,8 @@ CONFIG_IDENT_STRING="socfpga_stratix10"
 CONFIG_SPL_FS_FAT=y
 CONFIG_SPL_TEXT_BASE=0xFFE00000
 CONFIG_BOOTDELAY=5
+CONFIG_USE_BOOTARGS=y
+CONFIG_BOOTARGS="earlycon"
 CONFIG_SPL_SPI_LOAD=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="SOCFPGA_STRATIX10 # "
configs/stmark2_defconfig +2 -0
index 036ff707d19a..262f169d6cca 100644
@@ -5,6 +5,8 @@ CONFIG_ENV_OFFSET=0x40000
 CONFIG_ENV_SECT_SIZE=0x10000
 CONFIG_TARGET_STMARK2=y
 CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_INPUT_CLKSRC=30000000"
+CONFIG_USE_BOOTARGS=y
+CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 rw rootfstype=ramfs rdinit=/bin/init devtmpfs.mount=1"
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMDLINE_EDITING is not set
configs/wb45n_defconfig +2 -0
index ef069a672cc2..0a0120fe5edf 100644
@@ -15,6 +15,8 @@ CONFIG_SPL_TEXT_BASE=0x300000
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_NANDFLASH"
 CONFIG_BOOTDELAY=3
+CONFIG_USE_BOOTARGS=y
+CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk rw noinitrd mem=64M rootfstype=ubifs root=ubi0:rootfs ubi.mtd=6"
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/wb50n_defconfig +2 -0
index 1b444f07529d..b2f490a03c54 100644
@@ -15,6 +15,8 @@ CONFIG_SPL_TEXT_BASE=0x300000
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_NANDFLASH"
 CONFIG_BOOTDELAY=3
+CONFIG_USE_BOOTARGS=y
+CONFIG_BOOTARGS="rw rootfstype=ubifs ubi.mtd=6 root=ubi0:rootfs"
 CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
include/configs/grpeach.h +0 -3
index bde168d47505..67301fabeb62 100644
@@ -29,9 +29,6 @@
 #define CONFIG_SYS_MALLOC_LEN		(1024 * 1024)
 #define CONFIG_SYS_MONITOR_LEN		(512 * 1024)
 
-/* Kernel Boot */
-#define CONFIG_BOOTARGS			"ignore_loglevel"
-
 /* Network interface */
 #define CONFIG_SH_ETHER_USE_PORT	0
 #define CONFIG_SH_ETHER_PHY_ADDR	0
include/configs/sama5d27_som1_ek.h +0 -6
index 8e98254e2d39..4d66490cd68f 100644
@@ -39,12 +39,6 @@
 				"bootz 0x22000000 - 0x21000000"
 #endif
 
-#ifdef CONFIG_QSPI_BOOT
-#undef CONFIG_BOOTARGS
-#define CONFIG_BOOTARGS \
-	"console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait"
-#endif
-
 /* SPL */
 #define CONFIG_SPL_MAX_SIZE		0x10000
 #define CONFIG_SPL_BSS_START_ADDR	0x20000000
include/configs/sama5d2_icp.h +0 -3
index 2d1ba757fe74..7d6886ea73e1 100644
@@ -44,9 +44,6 @@
 #define CONFIG_BOOTCOMMAND	"fatload mmc 0:1 0x21000000 at91-sama5d2_icp.dtb; " \
 				"fatload mmc 0:1 0x22000000 zImage; " \
 				"bootz 0x22000000 - 0x21000000"
-#undef CONFIG_BOOTARGS
-#define CONFIG_BOOTARGS \
-	"console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait"
 #endif
 
 /* SPL */
include/configs/socfpga_arria5_secu1.h +0 -4
index ad4c3c0786c1..77914438bfa0 100644
@@ -30,10 +30,6 @@
 /* Booting Linux */
 #define CONFIG_BOOTDELAY	2
 #define CONFIG_BOOTFILE		"zImage"
-#define CONFIG_BOOTARGS		\
-	"console=ttyS0," __stringify(CONFIG_BAUDRATE) \
-	" ubi.fm_autoconvert=1" \
-	" uio_pdrv_genirq.of_id=\"idq,regbank\""
 
 #define CONFIG_BOOTCOMMAND	\
 	"setenv bootcmd '"	\
include/configs/socfpga_soc64_common.h +0 -1
index 7237ec95e345..775a122f1f12 100644
@@ -79,7 +79,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
  * CONFIG_BOOTARGS goes into the environment value "bootargs".
  * Do note the value will override also the chosen node in FDT blob.
  */
-#define CONFIG_BOOTARGS "earlycon"
 #define CONFIG_BOOTCOMMAND "run fatscript; run mmcload;run linux_qspi_enable;" \
 			   "run mmcboot"
 
include/configs/stmark2.h +0 -6
index b5bfac77f1b1..d9c79907acdb 100644
@@ -19,12 +19,6 @@
 
 #define CONFIG_TIMESTAMP
 
-#define CONFIG_BOOTARGS						\
-	"console=ttyS0,115200 root=/dev/ram0 rw "		\
-		"rootfstype=ramfs "				\
-		"rdinit=/bin/init "				\
-		"devtmpfs.mount=1"
-
 #define CONFIG_BOOTCOMMAND					\
 	"sf probe 0:1 50000000; "				\
 	"sf read ${loadaddr} 0x100000 ${kern_size}; "		\
include/configs/wb45n.h +0 -4
index 8b333de8cffd..6ae777507f8f 100644
@@ -83,10 +83,6 @@
 #error No boot method selected, please select 'CONFIG_SYS_USE_NANDFLASH'
 #endif
 
-#define CONFIG_BOOTARGS     "console=ttyS0,115200 earlyprintk " \
-                            "rw noinitrd mem=64M "              \
-                            "rootfstype=ubifs root=ubi0:rootfs ubi.mtd=6"
-
 #define CONFIG_EXTRA_ENV_SETTINGS       \
     "_mtd=mtdparts default; setenv bootargs ${bootargs} ${mtdparts}\0" \
     "autoload=no\0" \
include/configs/wb50n.h +0 -3
index a210449dae49..c65e59134257 100644
@@ -69,9 +69,6 @@
     "nand read 0x22000000 0x000e0000 0x500000; " \
     "bootm"
 
-#define CONFIG_BOOTARGS \
-    "rw rootfstype=ubifs ubi.mtd=6 root=ubi0:rootfs"
-
 #define CONFIG_SYS_CBSIZE           1024
 #define CONFIG_SYS_MAXARGS          16
 #define CONFIG_SYS_PBSIZE \
include/configs/xea.h +0 -1
index 65109566d3b8..144f62e8f980 100644
@@ -43,7 +43,6 @@
 
 /* Booting Linux */
 #define CONFIG_BOOTFILE		"uImage"
-#define CONFIG_BOOTARGS		"console=ttyAMA0,115200n8 "
 #define CONFIG_BOOTCOMMAND	"run ${bootpri} ; run ${bootsec}"
 #define CONFIG_LOADADDR		0x42000000
 #define CONFIG_SYS_LOAD_ADDR	CONFIG_LOADADDR
Signature · 1 line
2.17.1
author
#23 lore raw

PATCH v2 12/31 Convert CONFIG_BOOTARGS to Kconfig

Quoted 4 lines · Tom Rini

This converts the following to Kconfig:
CONFIG_BOOTARGS

Applied to u-boot/next, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200630/c85ef6a8/attachment-0001.sig>
author
#24 lore raw

PATCH v2 13/31 Convert CONFIG_BCH to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_BCH

---
 configs/ge_bx50v3_defconfig | 1 +
 configs/mx53ppd_defconfig   | 1 +
 include/configs/ge_bx50v3.h | 2 --
 include/configs/mx53ppd.h   | 2 --
 4 files changed, 2 insertions(+), 4 deletions(-)
configs/ge_bx50v3_defconfig +1 -0
index 58778e670c99..d61c23804656 100644
@@ -99,4 +99,5 @@ CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_IPUV3=y
 CONFIG_WATCHDOG_TIMEOUT_MSECS=6000
 CONFIG_IMX_WATCHDOG=y
+CONFIG_BCH=y
 # CONFIG_EFI_LOADER is not set
configs/mx53ppd_defconfig +1 -0
index 1dca2455c819..4b561adc7d31 100644
@@ -77,3 +77,4 @@ CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_IPUV3=y
 CONFIG_WATCHDOG_TIMEOUT_MSECS=8000
 CONFIG_IMX_WATCHDOG=y
+CONFIG_BCH=y
include/configs/ge_bx50v3.h +0 -2
index 47c5974b2ed8..a959488cb9bd 100644
@@ -176,6 +176,4 @@
 #define CONFIG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(7, 12)
 #define CONFIG_PCIE_IMX_POWER_GPIO	IMX_GPIO_NR(1, 5)
 
-#define CONFIG_BCH
-
 #endif	/* __GE_BX50V3_CONFIG_H */
include/configs/mx53ppd.h +0 -2
index 2ee66612c21b..8c7d1395d087 100644
@@ -144,8 +144,6 @@
 
 #define CONFIG_FSL_IIM
 
-#define CONFIG_BCH
-
 /* Backlight Control */
 #define CONFIG_IMX6_PWM_PER_CLK 66666000
 
Signature · 1 line
2.17.1
author
#25 lore raw

PATCH v2 13/31 Convert CONFIG_BCH to Kconfig

Quoted 4 lines · Tom Rini

This converts the following to Kconfig:
CONFIG_BCH

Applied to u-boot/next, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200630/b7ae612b/attachment-0001.sig>
author
#26 lore raw

PATCH v2 14/31 Convert CONFIG_BOARD_TYPES to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_BOARD_TYPES

---
 configs/brsmarc1_defconfig     | 1 +
 configs/mscc_jr2_defconfig     | 1 +
 configs/mscc_luton_defconfig   | 1 +
 configs/mscc_ocelot_defconfig  | 1 +
 configs/mscc_serval_defconfig  | 1 +
 configs/mscc_servalt_defconfig | 1 +
 include/configs/brsmarc1.h     | 1 -
 include/configs/vcoreiii.h     | 2 --
 8 files changed, 6 insertions(+), 3 deletions(-)
configs/brsmarc1_defconfig +1 -0
index a7cf98fc746c..8333038c61b7 100644
@@ -30,6 +30,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_CPUINFO is not set
 # CONFIG_DISPLAY_BOARDINFO is not set
+CONFIG_BOARD_TYPES=y
 CONFIG_ARCH_MISC_INIT=y
 # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
configs/mscc_jr2_defconfig +1 -0
index ab4f9b6255ba..d9173f408666 100644
@@ -19,6 +19,7 @@ CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS0,115200"
 CONFIG_LOGLEVEL=7
 CONFIG_DISPLAY_CPUINFO=y
+CONFIG_BOARD_TYPES=y
 CONFIG_BOARD_EARLY_INIT_R=y
 CONFIG_SYS_PROMPT="jr2 # "
 # CONFIG_CMD_BDI is not set
configs/mscc_luton_defconfig +1 -0
index 55edb199993b..d5639016958d 100644
@@ -21,6 +21,7 @@ CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS0,115200"
 CONFIG_LOGLEVEL=7
 CONFIG_DISPLAY_CPUINFO=y
+CONFIG_BOARD_TYPES=y
 CONFIG_BOARD_EARLY_INIT_R=y
 CONFIG_SYS_PROMPT="luton # "
 # CONFIG_CMD_BDI is not set
configs/mscc_ocelot_defconfig +1 -0
index 3fe9e060bb56..a0e04bd4c749 100644
@@ -18,6 +18,7 @@ CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS0,115200"
 CONFIG_LOGLEVEL=7
 CONFIG_DISPLAY_CPUINFO=y
+CONFIG_BOARD_TYPES=y
 CONFIG_BOARD_EARLY_INIT_R=y
 CONFIG_SYS_PROMPT="ocelot # "
 # CONFIG_CMD_BDI is not set
configs/mscc_serval_defconfig +1 -0
index e423fc4efc52..1c86c0dca39b 100644
@@ -16,6 +16,7 @@ CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS0,115200"
 CONFIG_LOGLEVEL=7
 CONFIG_DISPLAY_CPUINFO=y
+CONFIG_BOARD_TYPES=y
 CONFIG_BOARD_EARLY_INIT_R=y
 CONFIG_SYS_PROMPT="serval # "
 # CONFIG_CMD_BDI is not set
configs/mscc_servalt_defconfig +1 -0
index 49d8468226fc..91347682eef3 100644
@@ -15,6 +15,7 @@ CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS0,115200"
 CONFIG_LOGLEVEL=7
 CONFIG_DISPLAY_CPUINFO=y
+CONFIG_BOARD_TYPES=y
 CONFIG_BOARD_EARLY_INIT_R=y
 CONFIG_SYS_PROMPT="servalt # "
 # CONFIG_CMD_BDI is not set
include/configs/brsmarc1.h +0 -1
index 5aa68d1d4695..acf13b830a2e 100644
@@ -16,7 +16,6 @@
 #include <configs/bur_am335x_common.h>
 #include <linux/stringify.h>
 /* ------------------------------------------------------------------------- */
-#define CONFIG_BOARD_TYPES
 
 /* memory */
 #define CONFIG_SYS_MALLOC_LEN		(5 * 1024 * 1024)
include/configs/vcoreiii.h +0 -2
index 020f02caae9c..460433cb00bf 100644
@@ -23,8 +23,6 @@
 #endif
 #define CONFIG_SYS_NS16550_CLK		CONFIG_SYS_MIPS_TIMER_FREQ
 
-#define CONFIG_BOARD_TYPES
-
 #define CONFIG_SYS_SDRAM_BASE		0x80000000
 #if defined(CONFIG_DDRTYPE_H5TQ1G63BFA) || defined(CONFIG_DDRTYPE_MT47H128M8HQ)
 #define CONFIG_SYS_SDRAM_SIZE		(128 * SZ_1M)
Signature · 1 line
2.17.1
author
#27 lore raw

PATCH v2 14/31 Convert CONFIG_BOARD_TYPES to Kconfig

Quoted 4 lines · Tom Rini

This converts the following to Kconfig:
CONFIG_BOARD_TYPES

Applied to u-boot/next, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200630/fe4ec5b5/attachment-0001.sig>
author
#28 lore raw

PATCH v2 15/31 arm: capricorn: Convert CONFIG_BOOTCOUNT_ENV et al to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_BOOTCOUNT_ENV
CONFIG_BOOTCOUNT_LIMIT

Cc Anatolij Gustschin <[email protected]>
---
 configs/deneb_defconfig            | 2 ++
 configs/giedi_defconfig            | 2 ++
 include/configs/capricorn-common.h | 3 ---
 3 files changed, 4 insertions(+), 3 deletions(-)
configs/deneb_defconfig +2 -0
index 31a68f824025..5377b4fed513 100644
@@ -62,6 +62,8 @@ CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM=y
+CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_BOOTCOUNT_ENV=y
 CONFIG_SPL_CLK=y
 CONFIG_CLK_IMX8=y
 CONFIG_CPU=y
configs/giedi_defconfig +2 -0
index 5dd34227af01..dfac924bbb08 100644
@@ -62,6 +62,8 @@ CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM=y
+CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_BOOTCOUNT_ENV=y
 CONFIG_SPL_CLK=y
 CONFIG_CLK_IMX8=y
 CONFIG_CPU=y
include/configs/capricorn-common.h +0 -3
index c2e9d0f11f9c..b107e0ce3f96 100644
@@ -138,9 +138,6 @@
 #define CONFIG_SYS_LOAD_ADDR		CONFIG_LOADADDR
 #define CONFIG_SYS_INIT_SP_ADDR		0x80200000
 
-#define CONFIG_BOOTCOUNT_LIMIT
-#define CONFIG_BOOTCOUNT_ENV
-
 /* Environment organisation */
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_SYS_MMC_ENV_DEV		0	/* USDHC1, eMMC */
Signature · 1 line
2.17.1
author
#29 lore raw

PATCH v2 15/31 arm: capricorn: Convert CONFIG_BOOTCOUNT_ENV et al to Kconfig

Quoted 6 lines · Tom Rini

This converts the following to Kconfig:
CONFIG_BOOTCOUNT_ENV
CONFIG_BOOTCOUNT_LIMIT

Cc Anatolij Gustschin <[email protected]>

Applied to u-boot/next, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200630/713defbd/attachment-0001.sig>
author
#30 lore raw

PATCH v2 16/31 arm: abb secu1: Convert CONFIG_BOOTDELAY to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_BOOTDELAY

Cc Holger Brunck <[email protected]>
---
 include/configs/socfpga_arria5_secu1.h | 1 -
 1 file changed, 1 deletion(-)
include/configs/socfpga_arria5_secu1.h +0 -1
index 77914438bfa0..eb17470ae6bc 100644
@@ -28,7 +28,6 @@
 #define CONFIG_SYS_I2C_RTC_ADDR         0x68
 
 /* Booting Linux */
-#define CONFIG_BOOTDELAY	2
 #define CONFIG_BOOTFILE		"zImage"
 
 #define CONFIG_BOOTCOMMAND	\
Signature · 1 line
2.17.1
author
#31 lore raw

PATCH v2 16/31 arm: abb secu1: Convert CONFIG_BOOTDELAY to Kconfig

Quoted 5 lines · Tom Rini

This converts the following to Kconfig:
CONFIG_BOOTDELAY

Cc Holger Brunck <[email protected]>

Applied to u-boot/next, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200630/c9b6ec35/attachment-0001.sig>
author
#32 lore raw

PATCH v2 17/31 Convert CONFIG_BOOTP_DNS2 to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_BOOTP_DNS2
CONFIG_BOOTP_PXE_CLIENTARCH

---
 configs/am335x_baltos_defconfig           | 1 +
 configs/am335x_boneblack_vboot_defconfig  | 1 +
 configs/am335x_evm_defconfig              | 1 +
 configs/am335x_guardian_defconfig         | 1 +
 configs/am335x_hs_evm_defconfig           | 1 +
 configs/am335x_hs_evm_uart_defconfig      | 1 +
 configs/am335x_igep003x_defconfig         | 1 +
 configs/am335x_shc_defconfig              | 1 +
 configs/am335x_shc_ict_defconfig          | 1 +
 configs/am335x_shc_netboot_defconfig      | 1 +
 configs/am335x_shc_sdboot_defconfig       | 1 +
 configs/am335x_sl50_defconfig             | 1 +
 configs/am3517_evm_defconfig              | 1 +
 configs/am43xx_evm_defconfig              | 1 +
 configs/am43xx_evm_qspiboot_defconfig     | 1 +
 configs/am43xx_evm_rtconly_defconfig      | 1 +
 configs/am43xx_evm_usbhost_boot_defconfig | 1 +
 configs/am43xx_hs_evm_defconfig           | 1 +
 configs/am57xx_evm_defconfig              | 1 +
 configs/am57xx_hs_evm_defconfig           | 1 +
 configs/am57xx_hs_evm_usb_defconfig       | 1 +
 configs/apf27_defconfig                   | 1 +
 configs/birdland_bav335a_defconfig        | 1 +
 configs/birdland_bav335b_defconfig        | 1 +
 configs/chiliboard_defconfig              | 1 +
 configs/cm_t335_defconfig                 | 1 +
 configs/da850evm_defconfig                | 1 +
 configs/da850evm_direct_nor_defconfig     | 1 +
 configs/da850evm_nand_defconfig           | 1 +
 configs/devkit8000_defconfig              | 1 +
 configs/draco_defconfig                   | 1 +
 configs/etamin_defconfig                  | 1 +
 configs/k2e_evm_defconfig                 | 1 +
 configs/k2e_hs_evm_defconfig              | 1 +
 configs/k2g_evm_defconfig                 | 1 +
 configs/k2g_hs_evm_defconfig              | 1 +
 configs/k2hk_evm_defconfig                | 1 +
 configs/k2hk_hs_evm_defconfig             | 1 +
 configs/k2l_evm_defconfig                 | 1 +
 configs/k2l_hs_evm_defconfig              | 1 +
 configs/omapl138_lcdk_defconfig           | 1 +
 configs/pengwyn_defconfig                 | 1 +
 configs/pepper_defconfig                  | 1 +
 configs/phycore-am335x-r2-wega_defconfig  | 1 +
 configs/pxm2_defconfig                    | 1 +
 configs/rastaban_defconfig                | 1 +
 configs/rut_defconfig                     | 1 +
 configs/sandbox64_defconfig               | 1 +
 configs/sandbox_defconfig                 | 1 +
 configs/sandbox_flattree_defconfig        | 1 +
 configs/sandbox_spl_defconfig             | 1 +
 configs/thuban_defconfig                  | 1 +
 configs/ti814x_evm_defconfig              | 1 +
 configs/ti816x_evm_defconfig              | 1 +
 configs/tools-only_defconfig              | 1 +
 include/configs/am335x_shc.h              | 1 -
 include/configs/am3517_evm.h              | 1 -
 include/configs/am43xx_evm.h              | 1 -
 include/configs/am57xx_evm.h              | 1 -
 include/configs/apf27.h                   | 1 -
 include/configs/da850evm.h                | 1 -
 include/configs/devkit8000.h              | 1 -
 include/configs/omapl138_lcdk.h           | 1 -
 include/configs/s32v234evb.h              | 5 -----
 include/configs/sandbox.h                 | 1 -
 include/configs/siemens-am33x-common.h    | 1 -
 include/configs/tam3517-common.h          | 1 -
 include/configs/ti814x_evm.h              | 1 -
 include/configs/ti816x_evm.h              | 1 -
 include/configs/ti_am335x_common.h        | 1 -
 include/configs/ti_armv7_keystone2.h      | 1 -
 71 files changed, 55 insertions(+), 20 deletions(-)
configs/am335x_baltos_defconfig +1 -0
index 2781d49daf5f..76f2a9421b34 100644
@@ -34,6 +34,7 @@ CONFIG_CMD_NAND=y
 CONFIG_CMD_SPI=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_BOOTP_DNS2=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_MTDPARTS=y
 CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
configs/am335x_boneblack_vboot_defconfig +1 -0
index 64c1c537f933..b161b3bbc3cf 100644
@@ -29,6 +29,7 @@ CONFIG_AUTOBOOT_STOP_STR=" "
 CONFIG_CMD_SPL=y
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_BOOTP_DNS2=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-boneblack"
 CONFIG_ENV_IS_IN_MMC=y
configs/am335x_evm_defconfig +1 -0
index 8d8276ba5612..b8333eb4b8bc 100644
@@ -27,6 +27,7 @@ CONFIG_CMD_SPL_NAND_OFS=0x00080000
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_BOOTP_DNS2=y
 CONFIG_CMD_MTDPARTS=y
 CONFIG_MTDIDS_DEFAULT="nand0=nand.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL),128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND.SPL.backup3),256k(NAND.u-boot-spl-os),1m(NAND.u-boot),128k(NAND.u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND.kernel),-(NAND.file-system)"
configs/am335x_guardian_defconfig +1 -0
index 01333e7d9346..b88e4d9970f7 100644
@@ -47,6 +47,7 @@ CONFIG_CMD_MTD=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_BOOTP_DNS2=y
 # CONFIG_CMD_LED is not set
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_MTDPARTS=y
configs/am335x_hs_evm_defconfig +1 -0
index 393665fcf377..4faab7fa5bce 100644
@@ -25,6 +25,7 @@ CONFIG_SPL_MTD_SUPPORT=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_BOOTP_DNS2=y
 CONFIG_CMD_MTDPARTS=y
 CONFIG_MTDIDS_DEFAULT="nand0=nand.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL),128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND.SPL.backup3),256k(NAND.u-boot-spl-os),1m(NAND.u-boot),128k(NAND.u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND.kernel),-(NAND.file-system)"
configs/am335x_hs_evm_uart_defconfig +1 -0
index a8afad9e0be8..fb4e11d1c7c8 100644
@@ -27,6 +27,7 @@ CONFIG_SPL_MTD_SUPPORT=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_BOOTP_DNS2=y
 CONFIG_CMD_MTDPARTS=y
 CONFIG_MTDIDS_DEFAULT="nand0=nand.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL),128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND.SPL.backup3),256k(NAND.u-boot-spl-os),1m(NAND.u-boot),128k(NAND.u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND.kernel),-(NAND.file-system)"
configs/am335x_igep003x_defconfig +1 -0
index 633c35f77bc3..5295b6ac81cb 100644
@@ -47,6 +47,7 @@ CONFIG_CMD_MMC=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_SPI=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_BOOTP_DNS2=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_MTDPARTS=y
 CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
configs/am335x_shc_defconfig +1 -0
index 94c513457c2a..6401375250b7 100644
@@ -40,6 +40,7 @@ CONFIG_CMD_GPT=y
 CONFIG_CMD_MMC=y
 # CONFIG_CMD_PINMUX is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_BOOTP_DNS2=y
 CONFIG_CMD_CACHE=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-shc"
configs/am335x_shc_ict_defconfig +1 -0
index 6650b3eb6d79..fea34a34242f 100644
@@ -41,6 +41,7 @@ CONFIG_CMD_GPT=y
 CONFIG_CMD_MMC=y
 # CONFIG_CMD_PINMUX is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_BOOTP_DNS2=y
 CONFIG_CMD_CACHE=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-shc"
configs/am335x_shc_netboot_defconfig +1 -0
index f03f1fa0ae71..84e43603f20f 100644
@@ -42,6 +42,7 @@ CONFIG_CMD_GPT=y
 CONFIG_CMD_MMC=y
 # CONFIG_CMD_PINMUX is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_BOOTP_DNS2=y
 CONFIG_CMD_CACHE=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-shc"
configs/am335x_shc_sdboot_defconfig +1 -0
index 13b36864177b..14589a32e629 100644
@@ -41,6 +41,7 @@ CONFIG_CMD_GPT=y
 CONFIG_CMD_MMC=y
 # CONFIG_CMD_PINMUX is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_BOOTP_DNS2=y
 CONFIG_CMD_CACHE=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-shc"
configs/am335x_sl50_defconfig +1 -0
index 0aeaad577e3c..5ba7b917e96c 100644
@@ -38,6 +38,7 @@ CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SPI=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_BOOTP_DNS2=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-sl50"
configs/am3517_evm_defconfig +1 -0
index 6dd04a4c1725..1e0baebc17ab 100644
@@ -33,6 +33,7 @@ CONFIG_CMD_SPL_WRITE_SIZE=0x20000
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_SPI is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_BOOTP_DNS2=y
 CONFIG_CMD_CACHE=y
 # CONFIG_CMD_TIME is not set
 CONFIG_CMD_MTDPARTS=y
configs/am43xx_evm_defconfig +1 -0
index 075c09b62629..df02489b3b6e 100644
@@ -29,6 +29,7 @@ CONFIG_CMD_SPL_WRITE_SIZE=0x40000
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_BOOTP_DNS2=y
 CONFIG_CMD_MTDPARTS=y
 CONFIG_MTDIDS_DEFAULT="nand0=nand.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:256k(NAND.SPL),256k(NAND.SPL.backup1),256k(NAND.SPL.backup2),256k(NAND.SPL.backup3),512k(NAND.u-boot-spl-os),1m(NAND.u-boot),256k(NAND.u-boot-env),256k(NAND.u-boot-env.backup1),7m(NAND.kernel),-(NAND.file-system)"
configs/am43xx_evm_qspiboot_defconfig +1 -0
index 39facf132e5f..459096db4f55 100644
@@ -26,6 +26,7 @@ CONFIG_CMD_MMC=y
 CONFIG_CMD_SPI=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_BOOTP_DNS2=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="am437x-sk-evm"
configs/am43xx_evm_rtconly_defconfig +1 -0
index a0a6661e40d1..66fe74407f12 100644
@@ -23,6 +23,7 @@ CONFIG_CMD_SPL_WRITE_SIZE=0x40000
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_BOOTP_DNS2=y
 CONFIG_CMD_MTDPARTS=y
 CONFIG_MTDIDS_DEFAULT="nand0=nand.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:256k(NAND.SPL),256k(NAND.SPL.backup1),256k(NAND.SPL.backup2),256k(NAND.SPL.backup3),512k(NAND.u-boot-spl-os),1m(NAND.u-boot),256k(NAND.u-boot-env),256k(NAND.u-boot-env.backup1),7m(NAND.kernel),-(NAND.file-system)"
configs/am43xx_evm_usbhost_boot_defconfig +1 -0
index db48785f9117..d1a6fbe75387 100644
@@ -34,6 +34,7 @@ CONFIG_CMD_NAND=y
 CONFIG_CMD_SPI=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_BOOTP_DNS2=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_MTDPARTS=y
 CONFIG_MTDIDS_DEFAULT="nand0=nand.0"
configs/am43xx_hs_evm_defconfig +1 -0
index 523ce00585f8..deaa19007fae 100644
@@ -34,6 +34,7 @@ CONFIG_SPL_USB_ETHER=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_BOOTP_DNS2=y
 CONFIG_CMD_MTDPARTS=y
 CONFIG_MTDIDS_DEFAULT="nand0=nand.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:256k(NAND.SPL),256k(NAND.SPL.backup1),256k(NAND.SPL.backup2),256k(NAND.SPL.backup3),512k(NAND.u-boot-spl-os),1m(NAND.u-boot),256k(NAND.u-boot-env),256k(NAND.u-boot-env.backup1),7m(NAND.kernel),-(NAND.file-system)"
configs/am57xx_evm_defconfig +1 -0
index 42942e9ed4bb..f0418bd0ffa5 100644
@@ -40,6 +40,7 @@ CONFIG_CMD_BCB=y
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_AB_SELECT=y
+CONFIG_BOOTP_DNS2=y
 # CONFIG_CMD_PMIC is not set
 CONFIG_CMD_AVB=y
 CONFIG_OF_CONTROL=y
configs/am57xx_hs_evm_defconfig +1 -0
index f80ec38004bc..c5a62fbbca6b 100644
@@ -42,6 +42,7 @@ CONFIG_CMD_BCB=y
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_AB_SELECT=y
+CONFIG_BOOTP_DNS2=y
 # CONFIG_CMD_PMIC is not set
 CONFIG_CMD_AVB=y
 CONFIG_OF_CONTROL=y
configs/am57xx_hs_evm_usb_defconfig +1 -0
index 3b155cc2026d..c21a8755c128 100644
@@ -47,6 +47,7 @@ CONFIG_CMD_BCB=y
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_AB_SELECT=y
+CONFIG_BOOTP_DNS2=y
 # CONFIG_CMD_PMIC is not set
 CONFIG_CMD_AVB=y
 CONFIG_OF_CONTROL=y
configs/apf27_defconfig +1 -0
index 73a53047244d..88f1b5443503 100644
@@ -29,6 +29,7 @@ CONFIG_CMD_MMC=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_NAND_LOCK_UNLOCK=y
 CONFIG_CMD_DHCP=y
+CONFIG_BOOTP_DNS2=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_DNS=y
configs/birdland_bav335a_defconfig +1 -0
index 87dae5950b9b..2eb03ff67cc3 100644
@@ -39,6 +39,7 @@ CONFIG_CMD_SPI=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_USB_MASS_STORAGE=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_BOOTP_DNS2=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
configs/birdland_bav335b_defconfig +1 -0
index 5ee9878a5508..851d6fddafa5 100644
@@ -39,6 +39,7 @@ CONFIG_CMD_SPI=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_USB_MASS_STORAGE=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_BOOTP_DNS2=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
configs/chiliboard_defconfig +1 -0
index afc73dc89c52..01c114352131 100644
@@ -31,6 +31,7 @@ CONFIG_CMD_MMC=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_BOOTP_DNS2=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_MTDPARTS=y
 CONFIG_MTDIDS_DEFAULT="nand0=8000000.nand"
configs/cm_t335_defconfig +1 -0
index 51351669fee5..983aaf388d6e 100644
@@ -34,6 +34,7 @@ CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_BOOTP_DNS2=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_MTDPARTS=y
 CONFIG_MTDIDS_DEFAULT="nand0=nand"
configs/da850evm_defconfig +1 -0
index ee49ed29e64a..1a6a97ed161a 100644
@@ -40,6 +40,7 @@ CONFIG_CMD_DM=y
 CONFIG_CMD_MTD=y
 # CONFIG_CMD_SF is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_BOOTP_DNS2=y
 # CONFIG_CMD_TIME is not set
 # CONFIG_CMD_EXT4 is not set
 CONFIG_CMD_FS_UUID=y
configs/da850evm_direct_nor_defconfig +1 -0
index ab86108d664b..36ef122ba3ae 100644
@@ -33,6 +33,7 @@ CONFIG_CMD_MTD=y
 # CONFIG_CMD_SF is not set
 # CONFIG_CMD_SPI is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_BOOTP_DNS2=y
 # CONFIG_CMD_TIME is not set
 CONFIG_CMD_MTDPARTS=y
 CONFIG_MTDIDS_DEFAULT="nor0=physmap-flash.2"
configs/da850evm_nand_defconfig +1 -0
index bc2c0a2c2542..e805f2c10eda 100644
@@ -37,6 +37,7 @@ CONFIG_CMD_DM=y
 # CONFIG_CMD_GPT is not set
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_BOOTP_DNS2=y
 # CONFIG_CMD_TIME is not set
 # CONFIG_CMD_EXT4 is not set
 CONFIG_CMD_MTDPARTS=y
configs/devkit8000_defconfig +1 -0
index 1d642c095f48..53a43ed0ae5b 100644
@@ -20,6 +20,7 @@ CONFIG_CMD_MMC=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_LOCK_UNLOCK=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_BOOTP_DNS2=y
 CONFIG_BOOTP_NTPSERVER=y
 CONFIG_CMD_JFFS2=y
 CONFIG_CMD_MTDPARTS=y
configs/draco_defconfig +1 -0
index 4c326211d768..7050482a9803 100644
@@ -47,6 +47,7 @@ CONFIG_CMD_SF=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
+CONFIG_BOOTP_DNS2=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
configs/etamin_defconfig +1 -0
index 16202c848c59..ee31e26c8016 100644
@@ -48,6 +48,7 @@ CONFIG_CMD_SF=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
+CONFIG_BOOTP_DNS2=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
configs/k2e_evm_defconfig +1 -0
index 9f91fb95982c..aab8128393a2 100644
@@ -32,6 +32,7 @@ CONFIG_CMD_MX_CYCLIC=y
 # CONFIG_CMD_MMC is not set
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_BOOTP_DNS2=y
 CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(bootloader)ro,512k(params)ro,-(ubifs)"
 CONFIG_CMD_UBI=y
configs/k2e_hs_evm_defconfig +1 -0
index d4b5a5fddd6f..34b5baa0edf9 100644
@@ -24,6 +24,7 @@ CONFIG_CMD_MX_CYCLIC=y
 # CONFIG_CMD_MMC is not set
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_BOOTP_DNS2=y
 CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(bootloader)ro,512k(params)ro,-(ubifs)"
 CONFIG_CMD_UBI=y
configs/k2g_evm_defconfig +1 -0
index fb8fb250da07..8c81a2d83567 100644
@@ -30,6 +30,7 @@ CONFIG_CMD_MX_CYCLIC=y
 # CONFIG_CMD_GPT is not set
 CONFIG_CMD_REMOTEPROC=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_BOOTP_DNS2=y
 CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(bootloader)ro,512k(params)ro,-(ubifs)"
 CONFIG_CMD_UBI=y
configs/k2g_hs_evm_defconfig +1 -0
index a530ba035775..f089be4f563a 100644
@@ -22,6 +22,7 @@ CONFIG_CMD_MX_CYCLIC=y
 # CONFIG_CMD_GPT is not set
 CONFIG_CMD_REMOTEPROC=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_BOOTP_DNS2=y
 CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(bootloader)ro,512k(params)ro,-(ubifs)"
 CONFIG_CMD_UBI=y
configs/k2hk_evm_defconfig +1 -0
index 1cd7331653f3..981bf1ed0bbb 100644
@@ -32,6 +32,7 @@ CONFIG_CMD_MX_CYCLIC=y
 # CONFIG_CMD_MMC is not set
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_BOOTP_DNS2=y
 CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(bootloader)ro,512k(params)ro,-(ubifs)"
 CONFIG_CMD_UBI=y
configs/k2hk_hs_evm_defconfig +1 -0
index 96cab5168725..ef1e4cc1da41 100644
@@ -24,6 +24,7 @@ CONFIG_CMD_MX_CYCLIC=y
 # CONFIG_CMD_MMC is not set
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_BOOTP_DNS2=y
 CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(bootloader)ro,512k(params)ro,-(ubifs)"
 CONFIG_CMD_UBI=y
configs/k2l_evm_defconfig +1 -0
index ae4b26b7a989..a7fa3d74effe 100644
@@ -32,6 +32,7 @@ CONFIG_CMD_MX_CYCLIC=y
 # CONFIG_CMD_MMC is not set
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_BOOTP_DNS2=y
 CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(bootloader)ro,512k(params)ro,-(ubifs)"
 CONFIG_CMD_UBI=y
configs/k2l_hs_evm_defconfig +1 -0
index 3fad15f121fd..26d071636ebf 100644
@@ -23,6 +23,7 @@ CONFIG_CMD_MX_CYCLIC=y
 # CONFIG_CMD_MMC is not set
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_BOOTP_DNS2=y
 CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(bootloader)ro,512k(params)ro,-(ubifs)"
 CONFIG_CMD_UBI=y
configs/omapl138_lcdk_defconfig +1 -0
index 50cf09c7f182..378465bf631b 100644
@@ -36,6 +36,7 @@ CONFIG_CMD_DM=y
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_PINMUX is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_BOOTP_DNS2=y
 CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_DIAG=y
 CONFIG_CMD_UBI=y
configs/pengwyn_defconfig +1 -0
index 3d0fcf3ea095..63fa72c13386 100644
@@ -40,6 +40,7 @@ CONFIG_CMD_NAND=y
 CONFIG_CMD_SPI=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_BOOTP_DNS2=y
 CONFIG_CMD_WOL=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_MTDPARTS=y
configs/pepper_defconfig +1 -0
index 6585ac05fd09..5d79d4774c3c 100644
@@ -27,6 +27,7 @@ CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SPI=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_BOOTP_DNS2=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
configs/phycore-am335x-r2-wega_defconfig +1 -0
index 864e2ff59ba2..d19271652691 100644
@@ -37,6 +37,7 @@ CONFIG_CMD_PART=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
+CONFIG_BOOTP_DNS2=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_CMD_MTDPARTS=y
configs/pxm2_defconfig +1 -0
index 67de086c0b26..3603f0b18cbf 100644
@@ -47,6 +47,7 @@ CONFIG_CMD_SF=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
+CONFIG_BOOTP_DNS2=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_BMP=y
configs/rastaban_defconfig +1 -0
index c4a4e137379d..b237d5237664 100644
@@ -47,6 +47,7 @@ CONFIG_CMD_SF=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
+CONFIG_BOOTP_DNS2=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
configs/rut_defconfig +1 -0
index 40c9de25c698..20b5f981ba09 100644
@@ -48,6 +48,7 @@ CONFIG_CMD_SF=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
+CONFIG_BOOTP_DNS2=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_BMP=y
configs/sandbox64_defconfig +1 -0
index a3f049e124e1..6cb3aa41fb60 100644
@@ -49,6 +49,7 @@ CONFIG_CMD_READ=y
 CONFIG_CMD_REMOTEPROC=y
 CONFIG_CMD_SPI=y
 CONFIG_CMD_USB=y
+CONFIG_BOOTP_DNS2=y
 CONFIG_CMD_TFTPPUT=y
 CONFIG_CMD_TFTPSRV=y
 CONFIG_CMD_RARP=y
configs/sandbox_defconfig +1 -0
index 5b7569319b73..20a81a0350d2 100644
@@ -56,6 +56,7 @@ CONFIG_CMD_SPI=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_AXI=y
 CONFIG_CMD_AB_SELECT=y
+CONFIG_BOOTP_DNS2=y
 CONFIG_CMD_PCAP=y
 CONFIG_CMD_TFTPPUT=y
 CONFIG_CMD_TFTPSRV=y
configs/sandbox_flattree_defconfig +1 -0
index 21f9047046a3..22f4b159fac7 100644
@@ -40,6 +40,7 @@ CONFIG_CMD_PCI=y
 CONFIG_CMD_REMOTEPROC=y
 CONFIG_CMD_SPI=y
 CONFIG_CMD_USB=y
+CONFIG_BOOTP_DNS2=y
 CONFIG_CMD_TFTPPUT=y
 CONFIG_CMD_TFTPSRV=y
 CONFIG_CMD_RARP=y
configs/sandbox_spl_defconfig +1 -0
index fc8b26e88cfe..d499ac1727eb 100644
@@ -51,6 +51,7 @@ CONFIG_CMD_PCI=y
 CONFIG_CMD_REMOTEPROC=y
 CONFIG_CMD_SPI=y
 CONFIG_CMD_USB=y
+CONFIG_BOOTP_DNS2=y
 CONFIG_CMD_TFTPPUT=y
 CONFIG_CMD_TFTPSRV=y
 CONFIG_CMD_RARP=y
configs/thuban_defconfig +1 -0
index d81981a827e7..59b99cdace24 100644
@@ -47,6 +47,7 @@ CONFIG_CMD_SF=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
+CONFIG_BOOTP_DNS2=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
configs/ti814x_evm_defconfig +1 -0
index 71c9119c7d06..60d9ccded8f1 100644
@@ -31,6 +31,7 @@ CONFIG_CMD_ASKENV=y
 CONFIG_CMD_MMC=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
+CONFIG_BOOTP_DNS2=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
configs/ti816x_evm_defconfig +1 -0
index 21d152aea9d1..98322b80084d 100644
@@ -34,6 +34,7 @@ CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_BOOTP_DNS2=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_MTDPARTS=y
 CONFIG_MTDIDS_DEFAULT="nand0=nand.0"
configs/tools-only_defconfig +1 -0
index 70e62bf9d9da..1ae10236d2c9 100644
@@ -6,6 +6,7 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_BOOTD is not set
 # CONFIG_CMD_BOOTM is not set
 # CONFIG_CMD_ELF is not set
+CONFIG_BOOTP_DNS2=y
 # CONFIG_CMD_DATE is not set
 CONFIG_OF_CONTROL=y
 CONFIG_OF_HOSTFILE=y
include/configs/am335x_shc.h +0 -1
index cf964373f0c6..c881ac621114 100644
@@ -240,7 +240,6 @@
 #endif
 
 #define CONFIG_BOOTP_DEFAULT
-#define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_NET_RETRY_COUNT         10
 
include/configs/am3517_evm.h +0 -1
index cc5e8314c71b..7cd9ec96593a 100644
@@ -37,7 +37,6 @@
 /* Ethernet */
 #define CONFIG_DRIVER_TI_EMAC_USE_RMII
 #define CONFIG_BOOTP_DEFAULT
-#define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_NET_RETRY_COUNT		10
 
include/configs/am43xx_evm.h +0 -1
index 4a2c39c44d46..b7cc1a137ba7 100644
@@ -193,7 +193,6 @@
 #ifndef CONFIG_SPL_BUILD
 /* CPSW Ethernet */
 #define CONFIG_BOOTP_DEFAULT
-#define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_NET_RETRY_COUNT		10
 #endif
include/configs/am57xx_evm.h +0 -1
index e94b7c8d216a..adcd9a12e2e5 100644
@@ -54,7 +54,6 @@
 #define CONFIG_HSMMC2_8BIT
 
 /* CPSW Ethernet */
-#define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_NET_RETRY_COUNT		10
 #define PHY_ANEG_TIMEOUT	8000	/* PHY needs longer aneg time at 1G */
include/configs/apf27.h +0 -1
index cecd485e2055..aaf22acdb51e 100644
@@ -40,7 +40,6 @@
  * BOOTP options
  */
 #define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_DNS2
 
 #define CONFIG_HOSTNAME	"apf27"
 #define CONFIG_ROOTPATH	"/tftpboot/" __stringify(CONFIG_BOARD_NAME) "-root"
include/configs/da850evm.h +0 -1
index 4d651264dd2e..2bb4e47496b4 100644
@@ -166,7 +166,6 @@
  * Network & Ethernet Configuration
  */
 #ifdef CONFIG_DRIVER_TI_EMAC
-#define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_NET_RETRY_COUNT	10
 #endif
include/configs/devkit8000.h +0 -1
index 21af126c4bde..f90c1c5a18a6 100644
@@ -65,7 +65,6 @@
 /* BOOTP/DHCP options */
 #define CONFIG_BOOTP_NISDOMAIN
 #define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_BOOTP_TIMEOFFSET
 #undef CONFIG_BOOTP_VENDOREX
include/configs/omapl138_lcdk.h +0 -1
index 58fa5ccfa3ef..58fc10d31f46 100644
@@ -157,7 +157,6 @@
 #ifdef CONFIG_DRIVER_TI_EMAC
 #undef	CONFIG_DRIVER_TI_EMAC_USE_RMII
 #define CONFIG_BOOTP_DEFAULT
-#define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_NET_RETRY_COUNT	10
 #endif
include/configs/s32v234evb.h +0 -5
index 5c6692c1999c..e207ca45fdb6 100644
@@ -151,11 +151,6 @@
 #define CONFIG_SYS_MALLOC_BASE		(DDR_BASE_ADDR)
 #endif
 
-#if 0
-/* Configure PXE */
-#define CONFIG_BOOTP_PXE_CLIENTARCH	0x100
-#endif
-
 /* Physical memory map */
 /* EVB board has 2x256 MB DDR chips, DDR0 and DDR1, u-boot is using just one */
 #define PHYS_SDRAM			(DDR_BASE_ADDR)
include/configs/sandbox.h +0 -1
index 2a81f3a9bc02..273a15a41a62 100644
@@ -67,7 +67,6 @@
 #define CONFIG_KEEP_SERVERADDR
 #define CONFIG_UDP_CHECKSUM
 #define CONFIG_TIMESTAMP
-#define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_BOOTP_SERVERIP
 
include/configs/siemens-am33x-common.h +0 -1
index ed931176504a..d146ba51dedb 100644
@@ -171,7 +171,6 @@
  */
 
 #define CONFIG_BOOTP_DEFAULT
-#define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_NET_RETRY_COUNT         10
 
include/configs/tam3517-common.h +0 -1
index c13e9979219a..060030b83859 100644
@@ -120,7 +120,6 @@
  *
  */
 #define CONFIG_DRIVER_TI_EMAC_USE_RMII
-#define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_NET_RETRY_COUNT 10
 
include/configs/ti814x_evm.h +0 -1
index 99ddc3e923c7..264b1f1a4cda 100644
@@ -145,7 +145,6 @@
 #endif
 
 /* Ethernet */
-#define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_NET_RETRY_COUNT         10
 #define CONFIG_PHY_ET1011C_TX_CLK_FIX
include/configs/ti816x_evm.h +0 -1
index d16d61e5cdb2..01a174b29f24 100644
@@ -88,7 +88,6 @@
 #define CONFIG_SPL_MAX_SIZE		(SRAM_SCRATCH_SPACE_ADDR - \
 					 CONFIG_SPL_TEXT_BASE)
 
-#define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_NET_RETRY_COUNT	10
 
include/configs/ti_am335x_common.h +0 -1
index 19e1e2249ed4..4b3981b9b0d6 100644
@@ -27,7 +27,6 @@
 
 #ifndef CONFIG_SPL_BUILD
 /* Network defines. */
-#define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_NET_RETRY_COUNT         10
 #endif
include/configs/ti_armv7_keystone2.h +0 -1
index b632ae010d81..fb1dc2dbeb53 100644
@@ -67,7 +67,6 @@
 
 /* Network Configuration */
 #define CONFIG_BOOTP_DEFAULT
-#define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_NET_RETRY_COUNT		32
 #define CONFIG_SYS_SGMII_REFCLK_MHZ	312
Signature · 1 line
2.17.1
author
#33 lore raw

PATCH v2 17/31 Convert CONFIG_BOOTP_DNS2 to Kconfig

Quoted 5 lines · Tom Rini

This converts the following to Kconfig:
CONFIG_BOOTP_DNS2
CONFIG_BOOTP_PXE_CLIENTARCH

Applied to u-boot/next, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200630/4737c7bd/attachment-0001.sig>
author
#34 lore raw

PATCH v2 18/31 Convert CONFIG_BOUNCE_BUFFER to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_BOUNCE_BUFFER

---
 include/configs/px30_common.h | 3 ---
 1 file changed, 3 deletions(-)
include/configs/px30_common.h +0 -3
index d6c70601dd01..76d6ab1c8b4e 100644
@@ -32,9 +32,6 @@
 
 #define CONFIG_SYS_BOOTM_LEN	(64 << 20)	/* 64M */
 
-/* MMC/SD IP block */
-//#define CONFIG_BOUNCE_BUFFER
-
 #define CONFIG_SYS_SDRAM_BASE		0
 #define SDRAM_MAX_SIZE			0xff000000
 #define SDRAM_BANK_SIZE			(2UL << 30)
Signature · 1 line
2.17.1
author
#35 lore raw

PATCH v2 18/31 Convert CONFIG_BOUNCE_BUFFER to Kconfig

Quoted 4 lines · Tom Rini

This converts the following to Kconfig:
CONFIG_BOUNCE_BUFFER

Applied to u-boot/next, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200630/798e8094/attachment-0001.sig>
author
#36 lore raw

PATCH v2 19/31 Convert CONFIG_BUILD_TARGET to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_BUILD_TARGET

---
 include/configs/db-88f6281-bp.h | 1 -
 1 file changed, 1 deletion(-)
include/configs/db-88f6281-bp.h +0 -1
index cc51e6646ee3..e234b0bf9826 100644
@@ -11,7 +11,6 @@
 #define CONFIG_SKIP_LOWLEVEL_INIT	/* disable board lowlevel_init */
 #define CONFIG_SYS_TCLK		166666667
 #define CONFIG_SYS_KWD_CONFIG	$(CONFIG_BOARDDIR)/kwbimage.cfg
-#define CONFIG_BUILD_TARGET	"u-boot.kwb"
 
 /* additions for new ARM relocation support */
 #define CONFIG_SYS_SDRAM_BASE	0x00000000
Signature · 1 line
2.17.1
author
#37 lore raw

PATCH v2 19/31 Convert CONFIG_BUILD_TARGET to Kconfig

Quoted 4 lines · Tom Rini

This converts the following to Kconfig:
CONFIG_BUILD_TARGET

Applied to u-boot/next, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200630/bc34dabe/attachment.sig>
author
#38 lore raw

PATCH v2 20/31 Convert CONFIG_CMDLINE_EDITING to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_CMDLINE_EDITING

---
 include/configs/ls1028a_common.h | 4 ----
 1 file changed, 4 deletions(-)
include/configs/ls1028a_common.h +0 -4
index 44f2dc8f9b41..c191f74a3a61 100644
@@ -87,10 +87,6 @@
 					sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE /* Boot args buffer */
 
-#ifndef CONFIG_CMDLINE_EDITING
-#define CONFIG_CMDLINE_EDITING		1
-#endif
-
 #define CONFIG_SYS_MAXARGS		64	/* max command args */
 
 #define CONFIG_SYS_BOOTM_LEN   (64 << 20)      /* Increase max gunzip size */
Signature · 1 line
2.17.1
author
#39 lore raw

PATCH v2 20/31 Convert CONFIG_CMDLINE_EDITING to Kconfig

Quoted 4 lines · Tom Rini

This converts the following to Kconfig:
CONFIG_CMDLINE_EDITING

Applied to u-boot/next, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200630/587bff7d/attachment.sig>
author
#40 lore raw

PATCH v2 21/31 Convert CONFIG_CONS_INDEX to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_CONS_INDEX

---
 configs/am43xx_evm_defconfig                   | 1 -
 configs/am43xx_evm_qspiboot_defconfig          | 2 +-
 configs/am43xx_evm_rtconly_defconfig           | 1 -
 configs/am43xx_evm_usbhost_boot_defconfig      | 1 -
 configs/am43xx_hs_evm_defconfig                | 1 -
 configs/birdland_bav335a_defconfig             | 1 -
 configs/birdland_bav335b_defconfig             | 1 -
 configs/gardena-smart-gateway-mt7688_defconfig | 1 +
 configs/linkit-smart-7688_defconfig            | 2 ++
 configs/ls1028aqds_tfa_lpuart_defconfig        | 1 +
 configs/mscc_jr2_defconfig                     | 1 +
 configs/mscc_luton_defconfig                   | 1 +
 configs/mscc_ocelot_defconfig                  | 1 +
 configs/mscc_serval_defconfig                  | 1 +
 configs/mscc_servalt_defconfig                 | 1 +
 configs/mt7628_rfb_defconfig                   | 1 -
 configs/x530_defconfig                         | 1 +
 include/configs/SBx81LIFKW.h                   | 2 --
 include/configs/SBx81LIFXCAT.h                 | 2 --
 include/configs/brsmarc1.h                     | 2 --
 include/configs/db-88f6281-bp.h                | 7 -------
 include/configs/gardena-smart-gateway-mt7688.h | 1 -
 include/configs/linkit-smart-7688.h            | 1 -
 include/configs/ls1021atsn.h                   | 1 -
 include/configs/ls1028a_common.h               | 1 -
 include/configs/mt7628.h                       | 1 -
 include/configs/vcoreiii.h                     | 2 --
 include/configs/vocore2.h                      | 1 -
 include/configs/x530.h                         | 2 --
 29 files changed, 11 insertions(+), 31 deletions(-)
configs/am43xx_evm_defconfig +0 -1
index df02489b3b6e..be88f28e9e3d 100644
@@ -10,7 +10,6 @@ CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
 CONFIG_SPL=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_SPL_LOAD_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1"
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 # CONFIG_MISC_INIT_R is not set
configs/am43xx_evm_qspiboot_defconfig +1 -1
index 459096db4f55..fea5aa01745a 100644
@@ -10,7 +10,7 @@ CONFIG_DM_GPIO=y
 CONFIG_AM43XX=y
 CONFIG_ENV_OFFSET_REDUND=0x120000
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1,QSPI,QSPI_BOOT"
+CONFIG_SYS_EXTRA_OPTIONS="QSPI,QSPI_BOOT"
 CONFIG_QSPI_BOOT=y
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
configs/am43xx_evm_rtconly_defconfig +0 -1
index 66fe74407f12..8f1e60fd3e5d 100644
@@ -10,7 +10,6 @@ CONFIG_SPL_RTC_DDR_SUPPORT=y
 CONFIG_SPL=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_SPL_LOAD_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1"
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 # CONFIG_MISC_INIT_R is not set
configs/am43xx_evm_usbhost_boot_defconfig +0 -1
index d1a6fbe75387..7afd328a4983 100644
@@ -9,7 +9,6 @@ CONFIG_AM43XX=y
 CONFIG_SPL=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_SPL_LOAD_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1"
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 # CONFIG_MISC_INIT_R is not set
configs/am43xx_hs_evm_defconfig +0 -1
index deaa19007fae..79a0466b5ac2 100644
@@ -19,7 +19,6 @@ CONFIG_FIT_IMAGE_POST_PROCESS=y
 CONFIG_SPL_LOAD_FIT=y
 CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y
 CONFIG_OF_BOARD_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1"
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 # CONFIG_MISC_INIT_R is not set
configs/birdland_bav335a_defconfig +0 -1
index 2eb03ff67cc3..a20798be5443 100644
@@ -13,7 +13,6 @@ CONFIG_SPL_FS_FAT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_BAV_VERSION=1
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1"
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
configs/birdland_bav335b_defconfig +0 -1
index 851d6fddafa5..f5d7e3f50a11 100644
@@ -13,7 +13,6 @@ CONFIG_SPL_FS_FAT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_BAV_VERSION=2
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1"
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
configs/gardena-smart-gateway-mt7688_defconfig +1 -0
index 41496f739bda..610609091910 100644
@@ -74,6 +74,7 @@ CONFIG_SPI_FLASH_MTD=y
 CONFIG_MTD_UBI_BEB_LIMIT=22
 CONFIG_MT7628_ETH=y
 CONFIG_PHY=y
+CONFIG_SPECIFY_CONSOLE_INDEX=y
 CONFIG_SPI=y
 CONFIG_MT7621_SPI=y
 CONFIG_WDT=y
configs/linkit-smart-7688_defconfig +2 -0
index 8ec66938cdce..9115bb9d885f 100644
@@ -60,6 +60,8 @@ CONFIG_SPI_FLASH_MTD=y
 CONFIG_MT7628_ETH=y
 CONFIG_PHY=y
 CONFIG_MT76X8_USB_PHY=y
+CONFIG_SPECIFY_CONSOLE_INDEX=y
+CONFIG_CONS_INDEX=3
 CONFIG_SPI=y
 CONFIG_MT7621_SPI=y
 CONFIG_USB=y
configs/ls1028aqds_tfa_lpuart_defconfig +1 -0
index e0348279d9f9..f3475b558a50 100644
@@ -75,6 +75,7 @@ CONFIG_DM_RTC=y
 CONFIG_RTC_PCF2127=y
 CONFIG_SCSI=y
 CONFIG_DM_SCSI=y
+CONFIG_SPECIFY_CONSOLE_INDEX=y
 CONFIG_DM_SERIAL=y
 CONFIG_FSL_LPUART=y
 CONFIG_SPI=y
configs/mscc_jr2_defconfig +1 -0
index d9173f408666..aaede4a70b93 100644
@@ -68,6 +68,7 @@ CONFIG_DM_ETH=y
 CONFIG_MSCC_JR2_SWITCH=y
 CONFIG_PINCTRL=y
 CONFIG_PINCONF=y
+CONFIG_SPECIFY_CONSOLE_INDEX=y
 CONFIG_DM_SERIAL=y
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_ANNOUNCE=y
configs/mscc_luton_defconfig +1 -0
index d5639016958d..0846ee84741b 100644
@@ -72,6 +72,7 @@ CONFIG_DM_ETH=y
 CONFIG_MSCC_LUTON_SWITCH=y
 CONFIG_PINCTRL=y
 CONFIG_PINCONF=y
+CONFIG_SPECIFY_CONSOLE_INDEX=y
 CONFIG_DM_SERIAL=y
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYS_NS16550=y
configs/mscc_ocelot_defconfig +1 -0
index a0e04bd4c749..36ca158715ba 100644
@@ -72,6 +72,7 @@ CONFIG_DM_ETH=y
 CONFIG_MSCC_OCELOT_SWITCH=y
 CONFIG_PINCTRL=y
 CONFIG_PINCONF=y
+CONFIG_SPECIFY_CONSOLE_INDEX=y
 CONFIG_DM_SERIAL=y
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_ANNOUNCE=y
configs/mscc_serval_defconfig +1 -0
index 1c86c0dca39b..66d9e1d315aa 100644
@@ -66,6 +66,7 @@ CONFIG_DM_ETH=y
 CONFIG_MSCC_SERVAL_SWITCH=y
 CONFIG_PINCTRL=y
 CONFIG_PINCONF=y
+CONFIG_SPECIFY_CONSOLE_INDEX=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
configs/mscc_servalt_defconfig +1 -0
index 91347682eef3..1f56875b5feb 100644
@@ -63,6 +63,7 @@ CONFIG_DM_ETH=y
 CONFIG_MSCC_SERVALT_SWITCH=y
 CONFIG_PINCTRL=y
 CONFIG_PINCONF=y
+CONFIG_SPECIFY_CONSOLE_INDEX=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
configs/mt7628_rfb_defconfig +0 -1
index f444cf98c6ce..ba3b06263f22 100644
@@ -40,7 +40,6 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SPI_FLASH_XMC=y
 CONFIG_MT7628_ETH=y
-# CONFIG_SPECIFY_CONSOLE_INDEX is not set
 CONFIG_SPI=y
 CONFIG_MT7621_SPI=y
 CONFIG_LZMA=y
configs/x530_defconfig +1 -0
index de077cb71fde..2f1fd755fb36 100644
@@ -70,6 +70,7 @@ CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCI_MVEBU=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_DS1307=y
+CONFIG_SPECIFY_CONSOLE_INDEX=y
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYS_NS16550=y
 CONFIG_KIRKWOOD_SPI=y
include/configs/SBx81LIFKW.h +0 -2
index 8f31fc4c7456..ec0c531c4623 100644
@@ -38,8 +38,6 @@
  * for your console driver.
  */
 
-#define CONFIG_CONS_INDEX	1	/*Console on UART0 */
-
 /*
  * For booting Linux, the board info and command line data
  * have to be in the first 8 MB of memory, since this is
include/configs/SBx81LIFXCAT.h +0 -2
index f4440e576466..90480520ab3f 100644
@@ -38,8 +38,6 @@
  * for your console driver.
  */
 
-#define CONFIG_CONS_INDEX	1	/*Console on UART0 */
-
 /*
  * For booting Linux, the board info and command line data
  * have to be in the first 8 MB of memory, since this is
include/configs/brsmarc1.h +0 -2
index acf13b830a2e..d0cc08baa635 100644
@@ -69,6 +69,4 @@ BUR_COMMON_ENV \
 /* SPI Flash */
 
 /* Environment */
-
-#define CONFIG_CONS_INDEX			1
 #endif	/* __CONFIG_BRSMARC1_H__ */
include/configs/db-88f6281-bp.h +0 -7
index e234b0bf9826..06a7091be208 100644
@@ -29,13 +29,6 @@
 #define CONFIG_SYS_NS16550_COM1		KW_UART0_BASE
 
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
-/*
- * Serial Port configuration
- * The following definitions let you select what serial you want to use
- * for your console driver.
- */
-
-#define CONFIG_CONS_INDEX	1	/* Console on UART0 */
 
 /*
  *  Environment variables configurations
include/configs/gardena-smart-gateway-mt7688.h +0 -1
index 261749db8d34..1b26466eda30 100644
@@ -36,7 +36,6 @@
 #define CONFIG_SYS_NS16550_CLK		40000000
 #define CONFIG_SYS_NS16550_REG_SIZE	-4
 #define CONFIG_SYS_NS16550_COM1		0xb0000c00
-#define CONFIG_CONS_INDEX		1
 #endif
 
 /* UART */
include/configs/linkit-smart-7688.h +0 -1
index d7ebfeda4c56..e7a7ae319897 100644
@@ -36,7 +36,6 @@
 #define CONFIG_SYS_NS16550_CLK		40000000
 #define CONFIG_SYS_NS16550_REG_SIZE	-4
 #define CONFIG_SYS_NS16550_COM3		0xb0000e00
-#define CONFIG_CONS_INDEX		3
 
 #endif
 
include/configs/ls1021atsn.h +0 -1
index ec2ed7c60969..e76e54e97fc9 100644
@@ -97,7 +97,6 @@
 #define CONFIG_CHIP_SELECTS_PER_CTRL	4
 
 /* Serial Port */
-#define CONFIG_CONS_INDEX		1
 #define CONFIG_SYS_NS16550_SERIAL
 #ifndef CONFIG_DM_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE	1
include/configs/ls1028a_common.h +0 -1
index c191f74a3a61..d184673a71b5 100644
@@ -43,7 +43,6 @@
 #endif
 
 /* Serial Port */
-#define CONFIG_CONS_INDEX       1
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE     1
 #define CONFIG_SYS_NS16550_CLK          (get_bus_freq(0) / 2)
include/configs/mt7628.h +0 -1
index 9b9218d29676..c6752f4acb72 100644
@@ -32,7 +32,6 @@
 #define CONFIG_SYS_NS16550_CLK		40000000
 #define CONFIG_SYS_NS16550_REG_SIZE	-4
 #define CONFIG_SYS_NS16550_COM1		0xb0000c00
-#define CONFIG_CONS_INDEX		1
 #endif
 
 /* Serial common */
include/configs/vcoreiii.h +0 -2
index 460433cb00bf..82a8fa7354ee 100644
@@ -34,8 +34,6 @@
 #error Unknown DDR size - please add!
 #endif
 
-#define CONFIG_CONS_INDEX		1
-
 #define CONFIG_SYS_MONITOR_BASE         CONFIG_SYS_TEXT_BASE
 
 #if defined(CONFIG_MTDIDS_DEFAULT) && defined(CONFIG_MTDPARTS_DEFAULT)
include/configs/vocore2.h +0 -1
index 5aa3ad8ddf21..40467b737ceb 100644
@@ -34,7 +34,6 @@
 #define CONFIG_SYS_NS16550_CLK		40000000
 #define CONFIG_SYS_NS16550_REG_SIZE	-4
 #define CONFIG_SYS_NS16550_COM3		0xb0000e00
-#define CONFIG_CONS_INDEX		3
 
 /* RAM */
 
include/configs/x530.h +0 -2
index 7e0f2c24d943..4446510df4e0 100644
@@ -30,8 +30,6 @@
  * for your console driver.
  */
 
-#define CONFIG_CONS_INDEX	1	/*Console on UART0 */
-
 /* NAND */
 #define CONFIG_SYS_NAND_ONFI_DETECTION
 #define CONFIG_SYS_MAX_NAND_DEVICE 1
Signature · 1 line
2.17.1
author
#41 lore raw

PATCH v2 21/31 Convert CONFIG_CONS_INDEX to Kconfig

Quoted 4 lines · Tom Rini

This converts the following to Kconfig:
CONFIG_CONS_INDEX

Applied to u-boot/next, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200630/1f7e311d/attachment.sig>
author
#42 lore raw

PATCH v2 22/31 arm: toradex: Convert CONFIG_CONSOLE_MUX to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_CONSOLE_MUX

Cc Igor Opaniuk <[email protected]>
---
 configs/apalis_imx6_defconfig  | 2 --
 configs/colibri_imx6_defconfig | 2 --
 include/configs/apalis_imx6.h  | 1 -
 include/configs/colibri_imx6.h | 1 -
 4 files changed, 6 deletions(-)
configs/apalis_imx6_defconfig +0 -2
index 6b0f0e463896..e9d9b3f30239 100644
@@ -19,8 +19,6 @@ CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q"
 CONFIG_BOOTDELAY=1
-# CONFIG_CONSOLE_MUX is not set
-CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_MISC_INIT_R=y
 CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_BOARDINFO is not set
configs/colibri_imx6_defconfig +0 -2
index 44a3ff859c2d..8bdae00129c3 100644
@@ -18,8 +18,6 @@ CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6DL"
 CONFIG_BOOTDELAY=1
-# CONFIG_CONSOLE_MUX is not set
-CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_MISC_INIT_R=y
 CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_BOARDINFO is not set
include/configs/apalis_imx6.h +0 -1
index d5a0625e0282..b2d87019c8e7 100644
@@ -74,7 +74,6 @@
 #define CONFIG_BMP_16BPP
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
-#define CONFIG_CONSOLE_MUX
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP
 
include/configs/colibri_imx6.h +0 -1
index 6beef250942b..a0ee4d48ad06 100644
@@ -62,7 +62,6 @@
 #define CONFIG_BMP_16BPP
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
-#define CONFIG_CONSOLE_MUX
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP
 
Signature · 1 line
2.17.1
#43 lore raw

PATCH v2 22/31 arm: toradex: Convert CONFIG_CONSOLE_MUX to Kconfig

Hi Tom,

Quoted 65 lines · On Wed, Jun 17, 2020, 02:12 Tom Rini <[email protected]> wrote:

This converts the following to Kconfig:
CONFIG_CONSOLE_MUX

Cc Igor Opaniuk <[email protected]>
---
 configs/apalis_imx6_defconfig  | 2 --
 configs/colibri_imx6_defconfig | 2 --
 include/configs/apalis_imx6.h  | 1 -
 include/configs/colibri_imx6.h | 1 -
 4 files changed, 6 deletions(-)
configs/apalis_imx6_defconfig +0 -2
index 6b0f0e463896..e9d9b3f30239 100644
@@ -19,8 +19,6 @@ CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q"
 CONFIG_BOOTDELAY=1
-# CONFIG_CONSOLE_MUX is not set
-CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_MISC_INIT_R=y
 CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_BOARDINFO is not set
configs/colibri_imx6_defconfig +0 -2
index 44a3ff859c2d..8bdae00129c3 100644
@@ -18,8 +18,6 @@ CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6DL"
 CONFIG_BOOTDELAY=1
-# CONFIG_CONSOLE_MUX is not set
-CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_MISC_INIT_R=y
 CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_BOARDINFO is not set
include/configs/apalis_imx6.h +0 -1
index d5a0625e0282..b2d87019c8e7 100644
@@ -74,7 +74,6 @@
 #define CONFIG_BMP_16BPP
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
-#define CONFIG_CONSOLE_MUX
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP
 
include/configs/colibri_imx6.h +0 -2
index 6beef250942b..a0ee4d48ad06 100644
@@ -62,7 +62,6 @@
 #define CONFIG_BMP_16BPP
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
-#define CONFIG_CONSOLE_MUX
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP
 
--
Quoted 2 lines

2.17.1

Quoted 1 line
author
#44 lore raw

PATCH v2 22/31 arm: toradex: Convert CONFIG_CONSOLE_MUX to Kconfig

In reply to Tom Rini
Quoted 6 lines · Tom Rini

This converts the following to Kconfig:
CONFIG_CONSOLE_MUX

Applied to u-boot/next, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200630/6c5e4980/attachment.sig>
author
#45 lore raw

PATCH v2 23/31 Convert CONFIG_CONSOLE_SCROLL_LINES to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_CONSOLE_SCROLL_LINES

---
 include/configs/evb_px5.h        | 1 -
 include/configs/evb_rk3308.h     | 2 --
 include/configs/evb_rk3328.h     | 2 --
 include/configs/firefly_rk3308.h | 2 --
 include/configs/geekbox.h        | 2 --
 include/configs/sheep_rk3368.h   | 2 --
 6 files changed, 11 deletions(-)
include/configs/evb_px5.h +0 -1
index e9304206bb12..ed801dd84556 100644
@@ -8,7 +8,6 @@
 
 #include <configs/rk3368_common.h>
 
-#define CONFIG_CONSOLE_SCROLL_LINES	10
 #define CONFIG_SYS_MMC_ENV_DEV 0
 
 #endif
include/configs/evb_rk3308.h +0 -2
index 4d40606e4bd3..0d2cb21ac679 100644
@@ -14,7 +14,5 @@
 #define ROCKCHIP_DEVICE_SETTINGS \
 			"stdout=serial,vidconsole\0" \
 			"stderr=serial,vidconsole\0"
-#undef CONFIG_CONSOLE_SCROLL_LINES
-#define CONFIG_CONSOLE_SCROLL_LINES            10
 
 #endif
include/configs/evb_rk3328.h +0 -2
index ed5888bfd3e9..26687e638616 100644
@@ -12,6 +12,4 @@
 
 #define SDRAM_BANK_SIZE			(2UL << 30)
 
-#define CONFIG_CONSOLE_SCROLL_LINES		10
-
 #endif
include/configs/firefly_rk3308.h +0 -2
index 2cc7b4a153f8..7b8b62fbcb15 100644
@@ -14,7 +14,5 @@
 #define ROCKCHIP_DEVICE_SETTINGS \
 			"stdout=serial,vidconsole\0" \
 			"stderr=serial,vidconsole\0"
-#undef CONFIG_CONSOLE_SCROLL_LINES
-#define CONFIG_CONSOLE_SCROLL_LINES            10
 
 #endif
include/configs/geekbox.h +0 -2
index 91f4feb73708..4b12eb7af9a8 100644
@@ -8,6 +8,4 @@
 
 #include <configs/rk3368_common.h>
 
-#define CONFIG_CONSOLE_SCROLL_LINES		10
-
 #endif
include/configs/sheep_rk3368.h +0 -2
index 238838fd7d05..550597c957d0 100644
@@ -13,6 +13,4 @@
 #define DTB_LOAD_ADDR			0x5600000
 #define INITRD_LOAD_ADDR		0x5bf0000
 
-#define CONFIG_CONSOLE_SCROLL_LINES	10
-
 #endif
Signature · 1 line
2.17.1
author
#46 lore raw

PATCH v2 23/31 Convert CONFIG_CONSOLE_SCROLL_LINES to Kconfig

Quoted 4 lines · Tom Rini

This converts the following to Kconfig:
CONFIG_CONSOLE_SCROLL_LINES

Applied to u-boot/next, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200630/51f9378d/attachment.sig>
author
#47 lore raw

PATCH v2 24/31 arm: imx: Finish migration from CONFIG_SECURE_BOOT to CONFIG_IMX_HAB

In reply to Tom Rini

There are a few remaining places where we say CONFIG_SECURE_BOOT rather than CONFIG_IMX HAB. Update these instances.

Cc Stefano Babic <[email protected]>
Cc Fabio Estevam <[email protected]>
Cc NXP i.MX U-Boot Team <[email protected]>
Cc Eddy Petri?or <[email protected]>
Cc Shawn Guo <[email protected]>
Cc Priyanka Jain <[email protected]>
Fixes d714a75fd4dc ("imx: replace CONFIG_SECURE_BOOT with CONFIG_IMX_HAB")

---
Changes in v2:
- Drop layerscape portion to its own patch

---
 arch/arm/mach-imx/spl_qspi.cfg            | 2 +-
 board/ea/mx7ulp_com/imximage.cfg          | 2 +-
 board/freescale/s32v234evb/s32v234evb.cfg | 2 +-
 board/novtech/meerkat96/imximage.cfg      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/mach-imx/spl_qspi.cfg +1 -1
index 88956e626ffd..1e39ae2f01f7 100644
@@ -12,6 +12,6 @@ BOOT_FROM	qspi
 /*
  * Secure boot support
  */
-#ifdef CONFIG_SECURE_BOOT
+#ifdef CONFIG_IMX_HAB
 CSF CONFIG_CSF_SIZE
 #endif
board/ea/mx7ulp_com/imximage.cfg +1 -1
index d298d17c1e92..1b218996aea9 100644
@@ -28,7 +28,7 @@ BOOT_FROM	sd
 PLUGIN	board/freescale/mx7ulp_evk/plugin.bin 0x2F020000
 #else
 
-#ifdef CONFIG_SECURE_BOOT
+#ifdef CONFIG_IMX_HAB
 CSF CONFIG_CSF_SIZE
 #endif
 /*
board/freescale/s32v234evb/s32v234evb.cfg +1 -1
index 7881512139d0..d7f722006312 100644
@@ -23,6 +23,6 @@ BOOT_FROM sd
  */
 
 
-#ifdef CONFIG_SECURE_BOOT
+#ifdef CONFIG_IMX_HAB
 SECURE_BOOT
 #endif
board/novtech/meerkat96/imximage.cfg +1 -1
index 3bd8cc55e53c..86275b84d9c8 100644
@@ -25,7 +25,7 @@ BOOT_FROM	sd
 /*
  * Secure boot support
  */
-#ifdef CONFIG_SECURE_BOOT
+#ifdef CONFIG_IMX_HAB
 CSF CONFIG_CSF_SIZE
 #endif
 
Signature · 1 line
2.17.1
#48 lore raw

PATCH v2 24/31 arm: imx: Finish migration from CONFIG_SECURE_BOOT to CONFIG_IMX_HAB

Quoted 64 lines · Tom Rini

There are a few remaining places where we say CONFIG_SECURE_BOOT rather than CONFIG_IMX HAB. Update these instances.

Cc Stefano Babic <[email protected]>
Cc Fabio Estevam <[email protected]>
Cc NXP i.MX U-Boot Team <[email protected]>
Cc Eddy Petri?or <[email protected]>
Cc Shawn Guo <[email protected]>
Cc Priyanka Jain <[email protected]>
Fixes d714a75fd4dc ("imx: replace CONFIG_SECURE_BOOT with CONFIG_IMX_HAB")

---
Changes in v2:
- Drop layerscape portion to its own patch

---
 arch/arm/mach-imx/spl_qspi.cfg            | 2 +-
 board/ea/mx7ulp_com/imximage.cfg          | 2 +-
 board/freescale/s32v234evb/s32v234evb.cfg | 2 +-
 board/novtech/meerkat96/imximage.cfg      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/mach-imx/spl_qspi.cfg +1 -1
index 88956e626ffd..1e39ae2f01f7 100644
@@ -12,6 +12,6 @@ BOOT_FROM	qspi
 /*
  * Secure boot support
  */
-#ifdef CONFIG_SECURE_BOOT
+#ifdef CONFIG_IMX_HAB
 CSF CONFIG_CSF_SIZE
 #endif
board/ea/mx7ulp_com/imximage.cfg +1 -1
index d298d17c1e92..1b218996aea9 100644
@@ -28,7 +28,7 @@ BOOT_FROM	sd
 PLUGIN	board/freescale/mx7ulp_evk/plugin.bin 0x2F020000
 #else
 
-#ifdef CONFIG_SECURE_BOOT
+#ifdef CONFIG_IMX_HAB
 CSF CONFIG_CSF_SIZE
 #endif
 /*
board/freescale/s32v234evb/s32v234evb.cfg +1 -1
index 7881512139d0..d7f722006312 100644
@@ -23,6 +23,6 @@ BOOT_FROM sd
  */
 
 
-#ifdef CONFIG_SECURE_BOOT
+#ifdef CONFIG_IMX_HAB
 SECURE_BOOT
 #endif
board/novtech/meerkat96/imximage.cfg +0 -0
index 3bd8cc55e53c..86275b84d9c8 100644

board/novtech/meerkat96/imximage.cfg BOOT_FROM sd · line 31

Quoted 8 lines
board/novtech/meerkat96/imximage.cfg +1 -1
@@ -25,7 +25,7 @@ BOOT_FROM	sd
 /*
  * Secure boot support
  */
-#ifdef CONFIG_SECURE_BOOT
+#ifdef CONFIG_IMX_HAB
 CSF CONFIG_CSF_SIZE
 #endif
 

BR,
Stefano

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
author
#49 lore raw

PATCH v2 24/31 arm: imx: Finish migration from CONFIG_SECURE_BOOT to CONFIG_IMX_HAB

In reply to Tom Rini
Quoted 12 lines · Tom Rini

There are a few remaining places where we say CONFIG_SECURE_BOOT rather than CONFIG_IMX HAB. Update these instances.

Cc Stefano Babic <[email protected]>
Cc Fabio Estevam <[email protected]>
Cc NXP i.MX U-Boot Team <[email protected]>
Cc Eddy Petri?or <[email protected]>
Cc Shawn Guo <[email protected]>
Cc Priyanka Jain <[email protected]>
Fixes d714a75fd4dc ("imx: replace CONFIG_SECURE_BOOT with CONFIG_IMX_HAB")

Applied to u-boot/next, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200630/b82c806d/attachment.sig>
author
#50 lore raw

PATCH v2 25/31 nxp: Finish switch to CONFIG_NXP_ESBC

In reply to Tom Rini

There are two remaining users of the CONFIG_SECURE_BOOT symbol that have not been migrated to another symbol. In this case, they should be using CONFIG_NXP_ESBC as their guard.

Cc Vladimir Oltean <[email protected]>
Fixes 5536c3c9d0d1 ("freescale/layerscape: Rename the config CONFIG_SECURE_BOOT name")

---
Changes in v2:
- New patch

---
 Makefile                     | 2 +-
 include/configs/ls1021atsn.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
Makefile +1 -1
index 149f83994814..035b2cc6685a 100644
@@ -887,7 +887,7 @@ ALL-$(CONFIG_ONENAND_U_BOOT) += u-boot-onenand.bin
 ifeq ($(CONFIG_SPL_FSL_PBL),y)
 ALL-$(CONFIG_RAMBOOT_PBL) += u-boot-with-spl-pbl.bin
 else
-ifneq ($(CONFIG_SECURE_BOOT), y)
+ifneq ($(CONFIG_NXP_ESBC), y)
 # For Secure Boot The Image needs to be signed and Header must also
 # be included. So The image has to be built explicitly
 ALL-$(CONFIG_RAMBOOT_PBL) += u-boot.pbl
include/configs/ls1021atsn.h +2 -2
index e76e54e97fc9..72aed8fed61c 100644
@@ -60,9 +60,9 @@
 #define CONFIG_SYS_FSL_PBL_RCW	\
 		"board/freescale/ls1021atsn/ls102xa_rcw_sd.cfg"
 
-#ifdef CONFIG_SECURE_BOOT
+#ifdef CONFIG_NXP_ESBC
 #define CONFIG_U_BOOT_HDR_SIZE		(16 << 10)
-#endif /* ifdef CONFIG_SECURE_BOOT */
+#endif /* ifdef CONFIG_NXP_ESBC */
 
 #define CONFIG_SPL_MAX_SIZE		0x1a000
 #define CONFIG_SPL_STACK		0x1001d000
Signature · 1 line
2.17.1
author
#51 lore raw

PATCH v2 25/31 nxp: Finish switch to CONFIG_NXP_ESBC

Quoted 7 lines · Tom Rini

There are two remaining users of the CONFIG_SECURE_BOOT symbol that have not been migrated to another symbol. In this case, they should be using CONFIG_NXP_ESBC as their guard.

Cc Vladimir Oltean <[email protected]>
Fixes 5536c3c9d0d1 ("freescale/layerscape: Rename the config CONFIG_SECURE_BOOT name")

Applied to u-boot/next, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200630/8d7c352f/attachment.sig>
author
#52 lore raw

PATCH v2 26/31 arm: imx: Finish migration of CONFIG_CSF_SIZE to Kconfig

In reply to Tom Rini

While in most cases CSF_SIZE is handled via Kconfig we have some i.MX8M platforms that set the size based on the now-renamed CONFIG_SECURE_BOOT symbol. Update things so that CSF_SIZE itself depends on IMX_HAB being enabled and provide the default value for i.MX8M family of parts.

Cc Stefano Babic <[email protected]>
Cc Fabio Estevam <[email protected]>
Cc NXP i.MX U-Boot Team <[email protected]>
Fixes d714a75fd4dc ("imx: replace CONFIG_SECURE_BOOT with CONFIG_IMX_HAB")

---
Changes in v2:
- Make CSF_SIZE depend on IMX_HAB and update to be default 0x2000 if ARCH_IMX8M after comments from Ye Li
- Reword the commit slightly

---
 arch/arm/mach-imx/Kconfig       | 2 ++
 include/configs/imx8mm_beacon.h | 4 ----
 include/configs/imx8mm_evk.h    | 4 ----
 include/configs/imx8mn_evk.h    | 4 ----
 include/configs/imx8mp_evk.h    | 4 ----
 include/configs/verdin-imx8mm.h | 4 ----
 6 files changed, 2 insertions(+), 20 deletions(-)
arch/arm/mach-imx/Kconfig +2 -0
index 6c3fedf665d6..1531d09f3bea 100644
@@ -52,6 +52,8 @@ config IMX_HAB
 
 config CSF_SIZE
 	hex "Maximum size for Command Sequence File (CSF) binary"
+	depends on IMX_HAB
+	default 0x2000 if ARCH_IMX8M
 	default 0x2060
 	help
 	  Define the maximum size for Command Sequence File (CSF) binary
include/configs/imx8mm_beacon.h +0 -4
index 21102d3c14d2..ce3ba7492435 100644
@@ -9,10 +9,6 @@
 #include <linux/sizes.h>
 #include <asm/arch/imx-regs.h>
 
-#ifdef CONFIG_SECURE_BOOT
-#define CONFIG_CSF_SIZE		SZ_8K
-#endif
-
 #define CONFIG_SPL_MAX_SIZE		(148 * 1024)
 #define CONFIG_SYS_MONITOR_LEN	SZ_512K
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
include/configs/imx8mm_evk.h +0 -4
index 901a1bed6dd1..382ba620ccf4 100644
@@ -10,10 +10,6 @@
 #include <linux/stringify.h>
 #include <asm/arch/imx-regs.h>
 
-#ifdef CONFIG_SECURE_BOOT
-#define CONFIG_CSF_SIZE			SZ_8K
-#endif
-
 #define CONFIG_SPL_MAX_SIZE		(148 * 1024)
 #define CONFIG_SYS_MONITOR_LEN		SZ_512K
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
include/configs/imx8mn_evk.h +0 -4
index a07440c73ba8..4350b5a62aff 100644
@@ -10,10 +10,6 @@
 #include <linux/stringify.h>
 #include <asm/arch/imx-regs.h>
 
-#ifdef CONFIG_SECURE_BOOT
-#define CONFIG_CSF_SIZE			SZ_8K
-#endif
-
 #define CONFIG_SPL_MAX_SIZE		(148 * 1024)
 #define CONFIG_SYS_MONITOR_LEN		SZ_512K
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
include/configs/imx8mp_evk.h +0 -4
index 7f38f21c09c5..9c13235982c6 100644
@@ -10,10 +10,6 @@
 #include <linux/stringify.h>
 #include <asm/arch/imx-regs.h>
 
-#ifdef CONFIG_SECURE_BOOT
-#define CONFIG_CSF_SIZE			0x2000 /* 8K region */
-#endif
-
 #define CONFIG_SPL_MAX_SIZE		(152 * 1024)
 #define CONFIG_SYS_MONITOR_LEN		(512 * 1024)
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
include/configs/verdin-imx8mm.h +0 -4
index ca528598f2f1..878c4996df42 100644
@@ -9,10 +9,6 @@
 #include <asm/arch/imx-regs.h>
 #include <linux/sizes.h>
 
-#ifdef CONFIG_SECURE_BOOT
-#define CONFIG_CSF_SIZE			SZ_8K
-#endif
-
 #define CONFIG_SPL_MAX_SIZE		(148 * 1024)
 #define CONFIG_SYS_MONITOR_LEN		SZ_512K
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
Signature · 1 line
2.17.1
#53 lore raw

PATCH v2 26/31 arm: imx: Finish migration of CONFIG_CSF_SIZE to Kconfig

Quoted 104 lines · Tom Rini

While in most cases CSF_SIZE is handled via Kconfig we have some i.MX8M platforms that set the size based on the now-renamed CONFIG_SECURE_BOOT symbol. Update things so that CSF_SIZE itself depends on IMX_HAB being enabled and provide the default value for i.MX8M family of parts.

Cc Stefano Babic <[email protected]>
Cc Fabio Estevam <[email protected]>
Cc NXP i.MX U-Boot Team <[email protected]>
Fixes d714a75fd4dc ("imx: replace CONFIG_SECURE_BOOT with CONFIG_IMX_HAB")

---
Changes in v2:
- Make CSF_SIZE depend on IMX_HAB and update to be default 0x2000 if ARCH_IMX8M after comments from Ye Li
- Reword the commit slightly

---
 arch/arm/mach-imx/Kconfig       | 2 ++
 include/configs/imx8mm_beacon.h | 4 ----
 include/configs/imx8mm_evk.h    | 4 ----
 include/configs/imx8mn_evk.h    | 4 ----
 include/configs/imx8mp_evk.h    | 4 ----
 include/configs/verdin-imx8mm.h | 4 ----
 6 files changed, 2 insertions(+), 20 deletions(-)
arch/arm/mach-imx/Kconfig +2 -0
index 6c3fedf665d6..1531d09f3bea 100644
@@ -52,6 +52,8 @@ config IMX_HAB
 
 config CSF_SIZE
 	hex "Maximum size for Command Sequence File (CSF) binary"
+	depends on IMX_HAB
+	default 0x2000 if ARCH_IMX8M
 	default 0x2060
 	help
 	  Define the maximum size for Command Sequence File (CSF) binary
include/configs/imx8mm_beacon.h +0 -4
index 21102d3c14d2..ce3ba7492435 100644
@@ -9,10 +9,6 @@
 #include <linux/sizes.h>
 #include <asm/arch/imx-regs.h>
 
-#ifdef CONFIG_SECURE_BOOT
-#define CONFIG_CSF_SIZE		SZ_8K
-#endif
-
 #define CONFIG_SPL_MAX_SIZE		(148 * 1024)
 #define CONFIG_SYS_MONITOR_LEN	SZ_512K
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
include/configs/imx8mm_evk.h +0 -4
index 901a1bed6dd1..382ba620ccf4 100644
@@ -10,10 +10,6 @@
 #include <linux/stringify.h>
 #include <asm/arch/imx-regs.h>
 
-#ifdef CONFIG_SECURE_BOOT
-#define CONFIG_CSF_SIZE			SZ_8K
-#endif
-
 #define CONFIG_SPL_MAX_SIZE		(148 * 1024)
 #define CONFIG_SYS_MONITOR_LEN		SZ_512K
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
include/configs/imx8mn_evk.h +0 -4
index a07440c73ba8..4350b5a62aff 100644
@@ -10,10 +10,6 @@
 #include <linux/stringify.h>
 #include <asm/arch/imx-regs.h>
 
-#ifdef CONFIG_SECURE_BOOT
-#define CONFIG_CSF_SIZE			SZ_8K
-#endif
-
 #define CONFIG_SPL_MAX_SIZE		(148 * 1024)
 #define CONFIG_SYS_MONITOR_LEN		SZ_512K
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
include/configs/imx8mp_evk.h +0 -4
index 7f38f21c09c5..9c13235982c6 100644
@@ -10,10 +10,6 @@
 #include <linux/stringify.h>
 #include <asm/arch/imx-regs.h>
 
-#ifdef CONFIG_SECURE_BOOT
-#define CONFIG_CSF_SIZE			0x2000 /* 8K region */
-#endif
-
 #define CONFIG_SPL_MAX_SIZE		(152 * 1024)
 #define CONFIG_SYS_MONITOR_LEN		(512 * 1024)
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
include/configs/verdin-imx8mm.h +0 -0
index ca528598f2f1..878c4996df42 100644

include/configs/verdin-imx8mm.h line 14

Quoted 10 lines
include/configs/verdin-imx8mm.h +0 -4
@@ -9,10 +9,6 @@
 #include <asm/arch/imx-regs.h>
 #include <linux/sizes.h>
 
-#ifdef CONFIG_SECURE_BOOT
-#define CONFIG_CSF_SIZE			SZ_8K
-#endif
-
 #define CONFIG_SPL_MAX_SIZE		(148 * 1024)
 #define CONFIG_SYS_MONITOR_LEN		SZ_512K
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR

BR,
Stefano

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
Reviewed-by on v2 26/31
#54 lore raw

[EXT] Re: [PATCHv2 26/31] arm: imx: Finish migration of CONFIG_CSF_SIZE to Kconfig

Quoted 132 lines · Stefano Babic
Quoted 123 lines · Tom Rini

While in most cases CSF_SIZE is handled via Kconfig we have some i.MX8M
platforms that set the size based on the now-renamed CONFIG_SECURE_BOOT
symbol.??Update things so that CSF_SIZE itself depends on IMX_HAB being
enabled and provide the default value for i.MX8M family of parts.

Cc Stefano Babic <[email protected]>
Cc Fabio Estevam <[email protected]>
Cc NXP i.MX U-Boot Team <[email protected]>
Fixes d714a75fd4dc ("imx: replace CONFIG_SECURE_BOOT with

CONFIG_IMX_HAB")

---
Changes in v2:
- Make CSF_SIZE depend on IMX_HAB and update to be default 0x2000 if
? ARCH_IMX8M after comments from Ye Li
- Reword the commit slightly
---

?arch/arm/mach-imx/Kconfig???????| 2 ++
?include/configs/imx8mm_beacon.h | 4 ----
?include/configs/imx8mm_evk.h????| 4 ----
?include/configs/imx8mn_evk.h????| 4 ----
?include/configs/imx8mp_evk.h????| 4 ----
?include/configs/verdin-imx8mm.h | 4 ----

?6 files changed, 2 insertions(+), 20 deletions(-)

arch/arm/mach-imx/Kconfig +0 -0
index 6c3fedf665d6..1531d09f3bea 100644
@@ -52,6 +52,8 @@ config IMX_HAB
 

?config CSF_SIZE
??????hex "Maximum size for Command Sequence File (CSF) binary" +?????depends on IMX_HAB
+?????default 0x2000 if ARCH_IMX8M
??????default 0x2060
??????help
????????Define the maximum size for Command Sequence File (CSF) binary

include/configs/imx8mm_beacon.h +0 -0
index 21102d3c14d2..ce3ba7492435 100644
@@ -9,10 +9,6 @@

?#include <linux/sizes.h>
?#include <asm/arch/imx-regs.h>

include/configs/imx8mm_beacon.h +0 -4
-#ifdef CONFIG_SECURE_BOOT
-#define CONFIG_CSF_SIZE??????????????SZ_8K
-#endif
-

?#define CONFIG_SPL_MAX_SIZE??????????(148 * 1024) ?#define CONFIG_SYS_MONITOR_LEN???????SZ_512K ?#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR

include/configs/imx8mm_evk.h +0 -0
index 901a1bed6dd1..382ba620ccf4 100644
@@ -10,10 +10,6 @@

?#include <linux/stringify.h>
?#include <asm/arch/imx-regs.h>

include/configs/imx8mm_evk.h +0 -4
-#ifdef CONFIG_SECURE_BOOT
-#define CONFIG_CSF_SIZE??????????????????????SZ_8K
-#endif
-

?#define CONFIG_SPL_MAX_SIZE??????????(148 * 1024) ?#define CONFIG_SYS_MONITOR_LEN???????????????SZ_512K ?#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR

include/configs/imx8mn_evk.h +0 -0
index a07440c73ba8..4350b5a62aff 100644
@@ -10,10 +10,6 @@

?#include <linux/stringify.h>
?#include <asm/arch/imx-regs.h>

include/configs/imx8mn_evk.h +0 -4
-#ifdef CONFIG_SECURE_BOOT
-#define CONFIG_CSF_SIZE??????????????????????SZ_8K
-#endif
-

?#define CONFIG_SPL_MAX_SIZE??????????(148 * 1024) ?#define CONFIG_SYS_MONITOR_LEN???????????????SZ_512K ?#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR

include/configs/imx8mp_evk.h +0 -0
index 7f38f21c09c5..9c13235982c6 100644
@@ -10,10 +10,6 @@

?#include <linux/stringify.h>
?#include <asm/arch/imx-regs.h>

include/configs/imx8mp_evk.h +0 -2
-#ifdef CONFIG_SECURE_BOOT
-#define CONFIG_CSF_SIZE??????????????????????0x2000 /* 8K region

*/

include/configs/imx8mp_evk.h +0 -2
-#endif
-

?#define CONFIG_SPL_MAX_SIZE??????????(152 * 1024) ?#define CONFIG_SYS_MONITOR_LEN???????????????(512 * 1024) ?#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR

include/configs/verdin-imx8mm.h +0 -0
index ca528598f2f1..878c4996df42 100644
@@ -9,10 +9,6 @@

?#include <asm/arch/imx-regs.h>
?#include <linux/sizes.h>

include/configs/verdin-imx8mm.h +0 -4
-#ifdef CONFIG_SECURE_BOOT
-#define CONFIG_CSF_SIZE??????????????????????SZ_8K
-#endif
-
Quoted 4 lines

?#define CONFIG_SPL_MAX_SIZE??????????(148 * 1024) ?#define CONFIG_SYS_MONITOR_LEN???????????????SZ_512K ?#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR

Quoted 3 lines

BR,
Stefano

Best regards,
Ye Li

Quoted 6 lines

--
=====================================================================
DENX Software Engineering GmbH,??????Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

author
#55 lore raw

PATCH v2 26/31 arm: imx: Finish migration of CONFIG_CSF_SIZE to Kconfig

In reply to Tom Rini
Quoted 5 lines · Tom Rini

While in most cases CSF_SIZE is handled via Kconfig we have some i.MX8M platforms that set the size based on the now-renamed CONFIG_SECURE_BOOT symbol. Update things so that CSF_SIZE itself depends on IMX_HAB being enabled and provide the default value for i.MX8M family of parts.

Quoted 8 lines
Cc Stefano Babic <[email protected]>
Cc Fabio Estevam <[email protected]>
Cc NXP i.MX U-Boot Team <[email protected]>
Fixes d714a75fd4dc ("imx: replace CONFIG_SECURE_BOOT with CONFIG_IMX_HAB")

Applied to u-boot/next, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200630/4b332cd8/attachment.sig>
author
#56 lore raw

PATCH v2 27/31 Convert CONFIG_BOOTM_NETBSD to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_BOOTM_NETBSD

---
 configs/deneb_defconfig                | 1 +
 configs/giedi_defconfig                | 1 +
 configs/imx8qm_rom7720_a1_4G_defconfig | 1 +
 include/configs/capricorn-common.h     | 4 ----
 include/configs/imx8qm_rom7720.h       | 2 --
 5 files changed, 3 insertions(+), 6 deletions(-)
configs/deneb_defconfig +1 -0
index 5377b4fed513..c0e7725f64e5 100644
@@ -37,6 +37,7 @@ CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\
 CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b"
 CONFIG_AUTOBOOT_KEYED_CTRLC=y
 CONFIG_CMD_CPU=y
+# CONFIG_BOOTM_NETBSD is not set
 # CONFIG_CMD_EXPORTENV is not set
 # CONFIG_CMD_IMPORTENV is not set
 # CONFIG_CMD_CRC32 is not set
configs/giedi_defconfig +1 -0
index dfac924bbb08..d2b0f13f61f1 100644
@@ -37,6 +37,7 @@ CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\
 CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b"
 CONFIG_AUTOBOOT_KEYED_CTRLC=y
 CONFIG_CMD_CPU=y
+# CONFIG_BOOTM_NETBSD is not set
 # CONFIG_CMD_EXPORTENV is not set
 # CONFIG_CMD_IMPORTENV is not set
 # CONFIG_CMD_CRC32 is not set
configs/imx8qm_rom7720_a1_4G_defconfig +1 -0
index 305c4e827c66..8af2b239d6e8 100644
@@ -27,6 +27,7 @@ CONFIG_SPL_POWER_DOMAIN=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_CPU=y
+# CONFIG_BOOTM_NETBSD is not set
 # CONFIG_CMD_IMPORTENV is not set
 CONFIG_CMD_CLK=y
 CONFIG_CMD_DM=y
include/configs/capricorn-common.h +0 -4
index b107e0ce3f96..38a56e897e82 100644
@@ -42,10 +42,6 @@
 
 #define CONFIG_REMAKE_ELF
 
-/* Commands */
-
-#undef CONFIG_BOOTM_NETBSD
-
 /* ENET Config */
 #define CONFIG_FEC_XCV_TYPE		RMII
 #define FEC_QUIRK_ENET_MAC
include/configs/imx8qm_rom7720.h +0 -2
index 9808e72474f0..5621ba8232da 100644
@@ -15,8 +15,6 @@
 #define CONFIG_SPL_BSS_START_ADDR	0x00128000
 #define CONFIG_SPL_BSS_MAX_SIZE	0x1000  /* 4 KB */
 
-#undef CONFIG_BOOTM_NETBSD
-
 #define CONFIG_FSL_USDHC
 #define CONFIG_SYS_BOOTMAPSZ		(256 << 20)
 #define CONFIG_SYS_FSL_ESDHC_ADDR	0
Signature · 1 line
2.17.1
author
#57 lore raw

PATCH v2 27/31 Convert CONFIG_BOOTM_NETBSD to Kconfig

Quoted 4 lines · Tom Rini

This converts the following to Kconfig:
CONFIG_BOOTM_NETBSD

Applied to u-boot/next, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200630/a2b9c55c/attachment.sig>
author
#58 lore raw

PATCH v2 28/31 Kconfig: Remove CONFIG_CLOCKS_IN_MHZ

In reply to Tom Rini

This variable is unset anywhere and only unset on a number of platforms. Remove all relevant code.

---
 README                         | 13 -------------
 include/configs/MPC8536DS.h    |  2 --
 include/configs/MPC8540ADS.h   |  2 --
 include/configs/MPC8541CDS.h   |  2 --
 include/configs/MPC8544DS.h    |  2 --
 include/configs/MPC8548CDS.h   |  1 -
 include/configs/MPC8555CDS.h   |  2 --
 include/configs/MPC8560ADS.h   |  2 --
 include/configs/MPC8568MDS.h   |  2 --
 include/configs/MPC8569MDS.h   |  2 --
 include/configs/MPC8572DS.h    |  2 --
 include/configs/MPC8610HPCD.h  |  2 --
 include/configs/MPC8641HPCN.h  |  2 --
 include/configs/UCP1020.h      |  2 --
 include/configs/p1_p2_rdb_pc.h |  2 --
 include/configs/sbc8548.h      |  2 --
 include/configs/sbc8641d.h     |  2 --
 include/env_default.h          |  3 ---
 18 files changed, 47 deletions(-)
README +0 -13
index a0f54645fc26..11273726d323 100644
@@ -559,19 +559,6 @@ The following options need to be configured:
 		such as ARM architectural timer initialization.
 
 - Linux Kernel Interface:
-		CONFIG_CLOCKS_IN_MHZ
-
-		U-Boot stores all clock information in Hz
-		internally. For binary compatibility with older Linux
-		kernels (which expect the clocks passed in the
-		bd_info data to be in MHz) the environment variable
-		"clocks_in_mhz" can be defined so that U-Boot
-		converts clock data to MHZ before passing it to the
-		Linux kernel.
-		When CONFIG_CLOCKS_IN_MHZ is defined, a definition of
-		"clocks_in_mhz=1" is automatically included in the
-		default environment.
-
 		CONFIG_MEMSIZE_IN_BYTES		[relevant for MIPS only]
 
 		When transferring memsize parameter to Linux, some versions
include/configs/MPC8536DS.h +0 -2
index 340574a98526..3956bdd2512c 100644
@@ -124,8 +124,6 @@
 #error ("CONFIG_SPD_EEPROM is required")
 #endif
 
-#undef CONFIG_CLOCKS_IN_MHZ
-
 /*
  * Memory map -- xxx -this is wrong, needs updating
  *
include/configs/MPC8540ADS.h +0 -2
index f78782a1c140..f15af931483c 100644
@@ -112,8 +112,6 @@
 
 #define CONFIG_SYS_FLASH_EMPTY_INFO
 
-#undef CONFIG_CLOCKS_IN_MHZ
-
 /*
  * Local Bus Definitions
  */
include/configs/MPC8541CDS.h +0 -2
index b2a320107203..9c77dcecd99a 100644
@@ -57,8 +57,6 @@ extern unsigned long get_clock_freq(void);
 #error ("CONFIG_SPD_EEPROM is required by MPC85555CDS")
 #endif
 
-#undef CONFIG_CLOCKS_IN_MHZ
-
 /*
  * Local Bus Definitions
  */
include/configs/MPC8544DS.h +0 -2
index c9f193fc4672..49c2a4acca27 100644
@@ -63,8 +63,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #error ("CONFIG_SPD_EEPROM is required")
 #endif
 
-#undef CONFIG_CLOCKS_IN_MHZ
-
 /*
  * Memory map
  *
include/configs/MPC8548CDS.h +0 -1
index de2bfd8f2f4a..933417483483 100644
@@ -73,7 +73,6 @@ extern unsigned long get_clock_freq(void);
 #error ("CONFIG_SPD_EEPROM is required")
 #endif
 
-#undef CONFIG_CLOCKS_IN_MHZ
 /*
  * Physical Address Map
  *
include/configs/MPC8555CDS.h +0 -2
index d964b4e12173..9a14323b52ef 100644
@@ -55,8 +55,6 @@ extern unsigned long get_clock_freq(void);
 #error ("CONFIG_SPD_EEPROM is required by MPC85555CDS")
 #endif
 
-#undef CONFIG_CLOCKS_IN_MHZ
-
 /*
  * Local Bus Definitions
  */
include/configs/MPC8560ADS.h +0 -2
index 97d8cc48edf7..250f2de86060 100644
@@ -113,8 +113,6 @@
 
 #define CONFIG_SYS_FLASH_EMPTY_INFO
 
-#undef CONFIG_CLOCKS_IN_MHZ
-
 /*
  * Local Bus Definitions
  */
include/configs/MPC8568MDS.h +0 -2
index a0bd5f4d40f6..46d6b16d34d2 100644
@@ -59,8 +59,6 @@ extern unsigned long get_clock_freq(void);
 #error ("CONFIG_SPD_EEPROM is required")
 #endif
 
-#undef CONFIG_CLOCKS_IN_MHZ
-
 /*
  * Local Bus Definitions
  */
include/configs/MPC8569MDS.h +0 -2
index beba848214e7..bbc75e35a7f8 100644
@@ -109,8 +109,6 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_SYS_DDR_ERR_DIS          0x00000000
 #define CONFIG_SYS_DDR_SBE              0x00010000
 
-#undef CONFIG_CLOCKS_IN_MHZ
-
 /*
  * Local Bus Definitions
  */
include/configs/MPC8572DS.h +0 -2
index 3243f39df4b5..d924b2ba6117 100644
@@ -118,8 +118,6 @@
 #error ("CONFIG_SPD_EEPROM is required")
 #endif
 
-#undef CONFIG_CLOCKS_IN_MHZ
-
 /*
  * Memory map
  *
include/configs/MPC8610HPCD.h +0 -2
index b2acc7297361..c0407bbc16b2 100644
@@ -176,8 +176,6 @@
 #define CONFIG_SYS_SDRAM_SIZE	256
 #endif
 
-#undef CONFIG_CLOCKS_IN_MHZ
-
 #define CONFIG_SYS_INIT_RAM_LOCK	1
 #ifndef CONFIG_SYS_INIT_RAM_LOCK
 #define CONFIG_SYS_INIT_RAM_ADDR	0xe4010000	/* Initial RAM address */
include/configs/MPC8641HPCN.h +0 -2
index edbeeefdd4a9..ad8d261b3b4b 100644
@@ -221,8 +221,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_SYS_SDRAM_SIZE	256
 #endif
 
-#undef CONFIG_CLOCKS_IN_MHZ
-
 #define CONFIG_SYS_INIT_RAM_LOCK	1
 #ifndef CONFIG_SYS_INIT_RAM_LOCK
 #define CONFIG_SYS_INIT_RAM_ADDR	0x0fd00000	/* Initial RAM address */
include/configs/UCP1020.h +0 -2
index cfc9567332e9..2590a28867d3 100644
@@ -227,8 +227,6 @@
 #define CONFIG_SYS_DDR_MODE_2		0x8000c000
 #define CONFIG_SYS_DDR_INTERVAL		0x0C300000
 
-#undef CONFIG_CLOCKS_IN_MHZ
-
 /*
  * Memory map
  *
include/configs/p1_p2_rdb_pc.h +0 -2
index 219e5d216bbc..6b57be912ac5 100644
@@ -300,8 +300,6 @@
 #define CONFIG_SYS_DDR_INTERVAL		0x0C300000
 #endif
 
-#undef CONFIG_CLOCKS_IN_MHZ
-
 /*
  * Memory map
  *
include/configs/sbc8548.h +0 -2
index 55c4bff28ae4..4cdfd1b099e7 100644
@@ -118,8 +118,6 @@
 	#define CONFIG_SYS_DDR_CONTROL	0xc300c000
 #endif
 
-#undef CONFIG_CLOCKS_IN_MHZ
-
 /*
  * FLASH on the Local Bus
  * Two banks, one 8MB the other 64MB, using the CFI driver.
include/configs/sbc8641d.h +0 -2
index 4ab364ae9a2f..662160701440 100644
@@ -206,8 +206,6 @@
 #define CONFIG_SYS_WRITE_SWAPPED_DATA
 #define CONFIG_SYS_FLASH_EMPTY_INFO
 
-#undef CONFIG_CLOCKS_IN_MHZ
-
 #define CONFIG_SYS_INIT_RAM_LOCK	1
 #ifndef CONFIG_SYS_INIT_RAM_LOCK
 #define CONFIG_SYS_INIT_RAM_ADDR	0x0fd00000	/* Initial RAM address */
include/env_default.h +0 -3
index a657927e06f5..8a0c3057f0aa 100644
@@ -83,9 +83,6 @@ const uchar default_environment[] = {
 #ifdef	CONFIG_LOADADDR
 	"loadaddr="	__stringify(CONFIG_LOADADDR)	"\0"
 #endif
-#ifdef	CONFIG_CLOCKS_IN_MHZ
-	"clocks_in_mhz=1\0"
-#endif
 #if defined(CONFIG_PCI_BOOTDELAY) && (CONFIG_PCI_BOOTDELAY > 0)
 	"pcidelay="	__stringify(CONFIG_PCI_BOOTDELAY)"\0"
 #endif
Signature · 1 line
2.17.1
author
#59 lore raw

PATCH v2 28/31 Kconfig: Remove CONFIG_CLOCKS_IN_MHZ

Quoted 4 lines · Tom Rini

This variable is unset anywhere and only unset on a number of platforms. Remove all relevant code.

Applied to u-boot/next, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200630/fea174a1/attachment.sig>
author
#60 lore raw

PATCH v2 29/31 spi: Enable missing CONFIG_SPL_DM_SPI support

In reply to Tom Rini

Due to how the Makefile logic is we currently get DM_SPI support in SPL enabled by having DM_SPI enabled for full U-Boot but not having CONFIG_SPL_DM_SPI set. Add this missing option to boards that were inadvertently making use of it.

Cc Adam Ford <[email protected]>
Cc Akash Gajjar <[email protected]>
Cc Anatolij Gustschin <[email protected]>
Cc Andy Yan <[email protected]>
Cc Anup Patel <[email protected]>
Cc Atish Patra <[email protected]>
Cc Bin Meng <[email protected]>
Cc Chee Hong Ang <[email protected]>
Cc Chin-Liang See <[email protected]>
Cc Dalon Westergreen <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Eugen Hristev <[email protected]>
Cc Hannes Schmelzer <[email protected]>
Cc Heiko Schocher <[email protected]>
Cc Jagan Teki <[email protected]>
Cc Klaus Goger <[email protected]>
Cc Levin Du <[email protected]>
Cc Ley Foon Tan <[email protected]>
Cc Lokesh Vutla <[email protected]>
Cc Luca Ceresoli <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Michal Simek <[email protected]>
Cc Mike Looijmans <[email protected]>
Cc Nicolas Ferre <[email protected]>
Cc Nikita Kiryanov <[email protected]>
Cc Palmer Dabbelt <[email protected]>
Cc Patrick Delaunay <[email protected]>
Cc Paul Walmsley <[email protected]>
Cc Pavel Machek <[email protected]>
Cc Peter Robinson <[email protected]>
Cc Philipp Tomsich <[email protected]>
Cc Simon Glass <[email protected]>
Cc Stefan Roese <[email protected]>
Cc Suniel Mahesh <[email protected]>
Cc Vitaly Andrianov <[email protected]>
Cc Wolfgang Grandegger <[email protected]>

---
Changes in v2:
- Add k2 family

---
 configs/am57xx_evm_defconfig                                   | 1 +
 configs/am57xx_hs_evm_defconfig                                | 1 +
 configs/am57xx_hs_evm_usb_defconfig                            | 1 +
 configs/am65x_evm_a53_defconfig                                | 1 +
 configs/am65x_evm_r5_defconfig                                 | 1 +
 configs/am65x_hs_evm_a53_defconfig                             | 1 +
 configs/am65x_hs_evm_r5_defconfig                              | 1 +
 configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig | 1 +
 configs/axm_defconfig                                          | 1 +
 configs/brppt1_spi_defconfig                                   | 1 +
 configs/brsmarc1_defconfig                                     | 1 +
 configs/chromebit_mickey_defconfig                             | 1 +
 configs/chromebook_bob_defconfig                               | 1 +
 configs/chromebook_coral_defconfig                             | 1 +
 configs/chromebook_jerry_defconfig                             | 1 +
 configs/chromebook_link64_defconfig                            | 1 +
 configs/chromebook_minnie_defconfig                            | 1 +
 configs/chromebook_samus_tpl_defconfig                         | 1 +
 configs/chromebook_speedy_defconfig                            | 1 +
 configs/cm_t43_defconfig                                       | 1 +
 configs/da850evm_defconfig                                     | 1 +
 configs/da850evm_nand_defconfig                                | 1 +
 configs/dra7xx_evm_defconfig                                   | 1 +
 configs/dra7xx_hs_evm_defconfig                                | 1 +
 configs/dra7xx_hs_evm_usb_defconfig                            | 1 +
 configs/evb-px5_defconfig                                      | 1 +
 configs/j721e_evm_a72_defconfig                                | 1 +
 configs/j721e_evm_r5_defconfig                                 | 1 +
 configs/j721e_hs_evm_a72_defconfig                             | 1 +
 configs/j721e_hs_evm_r5_defconfig                              | 1 +
 configs/k2e_evm_defconfig                                      | 1 +
 configs/k2g_evm_defconfig                                      | 1 +
 configs/k2hk_evm_defconfig                                     | 1 +
 configs/k2l_evm_defconfig                                      | 1 +
 configs/lion-rk3368_defconfig                                  | 1 +
 configs/pinebook-pro-rk3399_defconfig                          | 1 +
 configs/puma-rk3399_defconfig                                  | 1 +
 configs/qemu-x86_64_defconfig                                  | 1 +
 configs/roc-pc-mezzanine-rk3399_defconfig                      | 1 +
 configs/roc-pc-rk3399_defconfig                                | 1 +
 configs/rockpro64-rk3399_defconfig                             | 1 +
 configs/sama5d27_wlsom1_ek_qspiflash_defconfig                 | 1 +
 configs/sama5d2_xplained_spiflash_defconfig                    | 1 +
 configs/sama5d3xek_spiflash_defconfig                          | 1 +
 configs/sama5d4_xplained_spiflash_defconfig                    | 1 +
 configs/sama5d4ek_spiflash_defconfig                           | 1 +
 configs/sifive_fu540_defconfig                                 | 1 +
 configs/socfpga_agilex_defconfig                               | 1 +
 configs/socfpga_arria10_defconfig                              | 1 +
 configs/socfpga_arria5_defconfig                               | 1 +
 configs/socfpga_cyclone5_defconfig                             | 1 +
 configs/socfpga_dbm_soc1_defconfig                             | 1 +
 configs/socfpga_de0_nano_soc_defconfig                         | 1 +
 configs/socfpga_de10_nano_defconfig                            | 1 +
 configs/socfpga_de1_soc_defconfig                              | 1 +
 configs/socfpga_is1_defconfig                                  | 1 +
 configs/socfpga_mcvevk_defconfig                               | 1 +
 configs/socfpga_sockit_defconfig                               | 1 +
 configs/socfpga_socrates_defconfig                             | 1 +
 configs/socfpga_sr1500_defconfig                               | 1 +
 configs/socfpga_stratix10_defconfig                            | 1 +
 configs/socfpga_vining_fpga_defconfig                          | 1 +
 configs/stm32mp15_basic_defconfig                              | 1 +
 configs/stm32mp15_dhcom_basic_defconfig                        | 1 +
 configs/stm32mp15_dhcor_basic_defconfig                        | 1 +
 configs/taurus_defconfig                                       | 1 +
 configs/topic_miami_defconfig                                  | 1 +
 configs/topic_miamilite_defconfig                              | 1 +
 configs/topic_miamiplus_defconfig                              | 1 +
 configs/xilinx_zynq_virt_defconfig                             | 1 +
 configs/xilinx_zynqmp_virt_defconfig                           | 1 +
 configs/zynq_cse_qspi_defconfig                                | 1 +
 72 files changed, 72 insertions(+)
configs/am57xx_evm_defconfig +1 -0
index f0418bd0ffa5..7c907fd3f496 100644
@@ -4,6 +4,7 @@ CONFIG_TI_COMMON_CMD_OPTIONS=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
 CONFIG_OMAP54XX=y
 CONFIG_TARGET_AM57XX_EVM=y
 CONFIG_NR_DRAM_BANKS=2
configs/am57xx_hs_evm_defconfig +1 -0
index c5a62fbbca6b..81bac5592eb6 100644
@@ -5,6 +5,7 @@ CONFIG_TI_COMMON_CMD_OPTIONS=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
 CONFIG_OMAP54XX=y
 CONFIG_TI_SECURE_EMIF_REGION_START=0xbdb00000
 CONFIG_TI_SECURE_EMIF_TOTAL_REGION_SIZE=0x02000000
configs/am57xx_hs_evm_usb_defconfig +1 -0
index c21a8755c128..ea5215e8cf3a 100644
@@ -6,6 +6,7 @@ CONFIG_TI_COMMON_CMD_OPTIONS=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
 CONFIG_OMAP54XX=y
 CONFIG_TI_SECURE_EMIF_REGION_START=0xbdb00000
 CONFIG_TI_SECURE_EMIF_TOTAL_REGION_SIZE=0x02000000
configs/am65x_evm_a53_defconfig +1 -0
index d74a2d09309b..cc4da7dd15d4 100644
@@ -9,6 +9,7 @@ CONFIG_ENV_SIZE=0x20000
 CONFIG_ENV_OFFSET=0x680000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x280000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
configs/am65x_evm_r5_defconfig +1 -0
index 4fc199e80911..1e7a7d1e6eec 100644
@@ -10,6 +10,7 @@ CONFIG_TARGET_AM654_R5_EVM=y
 CONFIG_ENV_SIZE=0x20000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
configs/am65x_hs_evm_a53_defconfig +1 -0
index 117953817d82..5b504ad6deb6 100644
@@ -10,6 +10,7 @@ CONFIG_ENV_SIZE=0x20000
 CONFIG_ENV_OFFSET=0x680000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x280000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
configs/am65x_hs_evm_r5_defconfig +1 -0
index b2d638672e33..9977e97f2b05 100644
@@ -11,6 +11,7 @@ CONFIG_TARGET_AM654_R5_EVM=y
 CONFIG_ENV_SIZE=0x20000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig +1 -0
index 227a5416c63f..7592033dbb18 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_ZYNQMP=y
 CONFIG_SYS_TEXT_BASE=0x8000000
 CONFIG_SYS_MALLOC_F_LEN=0x8000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
 CONFIG_SPL=y
 CONFIG_DEBUG_UART_BASE=0xff000000
 CONFIG_DEBUG_UART_CLOCK=100000000
configs/axm_defconfig +1 -0
index 1615d8af0eba..6a3336c256b6 100644
@@ -13,6 +13,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_ENV_OFFSET=0x100000
+CONFIG_SPL_DM_SPI=y
 CONFIG_SPL_SYS_MALLOC_F_LEN=0x1000
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_SPL=y
configs/brppt1_spi_defconfig +1 -0
index 964b22b10093..aea67c25dc20 100644
@@ -9,6 +9,7 @@ CONFIG_ENV_OFFSET=0x20000
 CONFIG_ENV_SECT_SIZE=0x10000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
 CONFIG_AM33XX=y
 CONFIG_TARGET_BRPPT1=y
 CONFIG_SPL_SERIAL_SUPPORT=y
configs/brsmarc1_defconfig +1 -0
index 8333038c61b7..aac8d17876bd 100644
@@ -9,6 +9,7 @@ CONFIG_ENV_OFFSET=0x20000
 CONFIG_ENV_SECT_SIZE=0x10000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
 CONFIG_AM33XX=y
 CONFIG_SYS_MPUCLK=600
 CONFIG_TARGET_BRSMARC1=y
configs/chromebit_mickey_defconfig +1 -0
index 23efafb0d2d5..22719fc5355c 100644
@@ -3,6 +3,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x00100000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000
+CONFIG_SPL_DM_SPI=y
 CONFIG_ROCKCHIP_RK3288=y
 # CONFIG_SPL_MMC_SUPPORT is not set
 CONFIG_TARGET_CHROMEBIT_MICKEY=y
configs/chromebook_bob_defconfig +1 -0
index 4f606e7ec9fc..b8093ca8fcce 100644
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x00200000
 CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_ENV_OFFSET=0x3F8000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000
+CONFIG_SPL_DM_SPI=y
 CONFIG_ROCKCHIP_RK3399=y
 CONFIG_ROCKCHIP_BOOT_MODE_REG=0
 CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x4000
configs/chromebook_coral_defconfig +1 -0
index d7cab2334baa..6cc3a8469feb 100644
@@ -1,6 +1,7 @@
 CONFIG_X86=y
 CONFIG_SYS_TEXT_BASE=0x1110000
 CONFIG_SYS_MALLOC_F_LEN=0x3d00
+CONFIG_SPL_DM_SPI=y
 CONFIG_SPL_SYS_MALLOC_F_LEN=0xf000
 CONFIG_NR_DRAM_BANKS=8
 CONFIG_BOOTSTAGE_STASH_ADDR=0xfef00000
configs/chromebook_jerry_defconfig +1 -0
index 443e3cdace8d..6523921aee13 100644
@@ -3,6 +3,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x00100000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000
+CONFIG_SPL_DM_SPI=y
 CONFIG_ROCKCHIP_RK3288=y
 # CONFIG_SPL_MMC_SUPPORT is not set
 CONFIG_SPL_STACK_R_ADDR=0x80000
configs/chromebook_link64_defconfig +1 -0
index 75f3d2c4116d..a80225a11f3a 100644
@@ -3,6 +3,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_ENV_SIZE=0x1000
 CONFIG_ENV_OFFSET=0x3F8000
 CONFIG_ENV_SECT_SIZE=0x1000
+CONFIG_SPL_DM_SPI=y
 CONFIG_NR_DRAM_BANKS=8
 CONFIG_DEBUG_UART_BOARD_INIT=y
 CONFIG_DEBUG_UART_BASE=0x3f8
configs/chromebook_minnie_defconfig +1 -0
index 99ac0e067438..f33ab19998ff 100644
@@ -3,6 +3,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x00100000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000
+CONFIG_SPL_DM_SPI=y
 CONFIG_ROCKCHIP_RK3288=y
 # CONFIG_SPL_MMC_SUPPORT is not set
 CONFIG_TARGET_CHROMEBOOK_MINNIE=y
configs/chromebook_samus_tpl_defconfig +1 -0
index 82172ba810ca..95c9b6e6af53 100644
@@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x1a00
 CONFIG_ENV_SIZE=0x1000
 CONFIG_ENV_OFFSET=0x3F8000
 CONFIG_ENV_SECT_SIZE=0x1000
+CONFIG_SPL_DM_SPI=y
 CONFIG_NR_DRAM_BANKS=8
 CONFIG_DEBUG_UART_BOARD_INIT=y
 CONFIG_DEBUG_UART_BASE=0x3f8
configs/chromebook_speedy_defconfig +1 -0
index 5a5152541bf3..f930ba6179f3 100644
@@ -3,6 +3,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x00100000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000
+CONFIG_SPL_DM_SPI=y
 CONFIG_ROCKCHIP_RK3288=y
 # CONFIG_SPL_MMC_SUPPORT is not set
 CONFIG_TARGET_CHROMEBOOK_SPEEDY=y
configs/cm_t43_defconfig +1 -0
index 94b051ad4f95..4232aaca002e 100644
@@ -8,6 +8,7 @@ CONFIG_ENV_OFFSET=0xC0000
 CONFIG_ENV_SECT_SIZE=0x10000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
 CONFIG_AM43XX=y
 CONFIG_TARGET_CM_T43=y
 CONFIG_SPL_MMC_SUPPORT=y
configs/da850evm_defconfig +1 -0
index 1a6a97ed161a..12768065f3ab 100644
@@ -12,6 +12,7 @@ CONFIG_ENV_OFFSET=0x80000
 CONFIG_ENV_SECT_SIZE=0x10000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x8000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_SPL=y
configs/da850evm_nand_defconfig +1 -0
index e805f2c10eda..13026fd1ea2c 100644
@@ -11,6 +11,7 @@ CONFIG_ENV_SIZE=0x20000
 CONFIG_ENV_OFFSET=0x0
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x8000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
configs/dra7xx_evm_defconfig +1 -0
index e4547d9dcc8c..afbc4383a6b0 100644
@@ -4,6 +4,7 @@ CONFIG_TI_COMMON_CMD_OPTIONS=y
 CONFIG_SYS_MALLOC_F_LEN=0x18000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
 CONFIG_OMAP54XX=y
 CONFIG_TARGET_DRA7XX_EVM=y
 CONFIG_NR_DRAM_BANKS=2
configs/dra7xx_hs_evm_defconfig +1 -0
index c08bcce90381..d813040f93cf 100644
@@ -5,6 +5,7 @@ CONFIG_TI_COMMON_CMD_OPTIONS=y
 CONFIG_SYS_MALLOC_F_LEN=0x18000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
 CONFIG_OMAP54XX=y
 CONFIG_TI_SECURE_EMIF_REGION_START=0xbdb00000
 CONFIG_TI_SECURE_EMIF_TOTAL_REGION_SIZE=0x02000000
configs/dra7xx_hs_evm_usb_defconfig +1 -0
index 879c2b650be3..9d837e54460e 100644
@@ -6,6 +6,7 @@ CONFIG_TI_COMMON_CMD_OPTIONS=y
 CONFIG_SYS_MALLOC_F_LEN=0x18000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
 CONFIG_OMAP54XX=y
 CONFIG_TI_SECURE_EMIF_REGION_START=0xbdb00000
 CONFIG_TI_SECURE_EMIF_TOTAL_REGION_SIZE=0x02000000
configs/evb-px5_defconfig +1 -0
index d1323738e02b..039af2ddf076 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x00200000
 CONFIG_ENV_OFFSET=0x3F8000
+CONFIG_SPL_DM_SPI=y
 CONFIG_ROCKCHIP_RK3368=y
 CONFIG_TPL_LDSCRIPT="arch/arm/mach-rockchip/u-boot-tpl-v8.lds"
 CONFIG_TPL_LIBCOMMON_SUPPORT=y
configs/j721e_evm_a72_defconfig +1 -0
index 4deb4e219fe7..2d0b40719ddc 100644
@@ -10,6 +10,7 @@ CONFIG_ENV_SIZE=0x20000
 CONFIG_ENV_OFFSET=0x680000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x280000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
configs/j721e_evm_r5_defconfig +1 -0
index ee9217aee238..c597f8309238 100644
@@ -10,6 +10,7 @@ CONFIG_TARGET_J721E_R5_EVM=y
 CONFIG_ENV_SIZE=0x20000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
configs/j721e_hs_evm_a72_defconfig +1 -0
index ae540a26a401..bd933eb8d795 100644
@@ -9,6 +9,7 @@ CONFIG_TARGET_J721E_A72_EVM=y
 CONFIG_ENV_SIZE=0x20000
 CONFIG_ENV_OFFSET=0x680000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x280000
+CONFIG_SPL_DM_SPI=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
configs/j721e_hs_evm_r5_defconfig +1 -0
index 51d5a3bb98fa..7bdf3401a1a5 100644
@@ -11,6 +11,7 @@ CONFIG_ENV_SIZE=0x20000
 CONFIG_ENV_OFFSET=0x680000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
configs/k2e_evm_defconfig +1 -0
index aab8128393a2..ae07f860e3a7 100644
@@ -11,6 +11,7 @@ CONFIG_TARGET_K2E_EVM=y
 CONFIG_ENV_SIZE=0x40000
 CONFIG_ENV_OFFSET=0x100000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x10000
+CONFIG_SPL_DM_SPI=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_SPL=y
configs/k2g_evm_defconfig +1 -0
index 8c81a2d83567..c763ead401b1 100644
@@ -10,6 +10,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_TARGET_K2G_EVM=y
 CONFIG_ENV_SIZE=0x40000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x10000
+CONFIG_SPL_DM_SPI=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_SPL=y
configs/k2hk_evm_defconfig +1 -0
index 981bf1ed0bbb..9f992055caef 100644
@@ -11,6 +11,7 @@ CONFIG_TARGET_K2HK_EVM=y
 CONFIG_ENV_SIZE=0x40000
 CONFIG_ENV_OFFSET=0x100000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x10000
+CONFIG_SPL_DM_SPI=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_SPL=y
configs/k2l_evm_defconfig +1 -0
index a7fa3d74effe..3311587c2c15 100644
@@ -11,6 +11,7 @@ CONFIG_TARGET_K2L_EVM=y
 CONFIG_ENV_SIZE=0x40000
 CONFIG_ENV_OFFSET=0x100000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x10000
+CONFIG_SPL_DM_SPI=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_SPL=y
configs/lion-rk3368_defconfig +1 -0
index b6504b71238c..45ff1714791b 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x00200000
 CONFIG_ENV_OFFSET=0x3F8000
+CONFIG_SPL_DM_SPI=y
 CONFIG_ROCKCHIP_RK3368=y
 CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x0
 CONFIG_TPL_LIBCOMMON_SUPPORT=y
configs/pinebook-pro-rk3399_defconfig +1 -0
index 0c129b9aebb4..754cf5e5b401 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x00200000
+CONFIG_SPL_DM_SPI=y
 CONFIG_ROCKCHIP_RK3399=y
 CONFIG_TARGET_PINEBOOK_PRO_RK3399=y
 CONFIG_NR_DRAM_BANKS=1
configs/puma-rk3399_defconfig +1 -0
index 6b7d2ee6b8af..8a0ae32c655a 100644
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x00200000
 CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_ENV_OFFSET=0x3F8000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000
+CONFIG_SPL_DM_SPI=y
 CONFIG_ROCKCHIP_RK3399=y
 CONFIG_ROCKCHIP_BOOT_MODE_REG=0x0
 CONFIG_TARGET_PUMA_RK3399=y
configs/qemu-x86_64_defconfig +1 -0
index 90d287b7b063..a5be09b2ba1c 100644
@@ -3,6 +3,7 @@ CONFIG_SYS_TEXT_BASE=0x1110000
 CONFIG_SYS_MALLOC_F_LEN=0x1000
 CONFIG_ENV_SIZE=0x40000
 CONFIG_MAX_CPUS=2
+CONFIG_SPL_DM_SPI=y
 CONFIG_NR_DRAM_BANKS=8
 CONFIG_DEBUG_UART_BASE=0x3f8
 CONFIG_DEBUG_UART_CLOCK=1843200
configs/roc-pc-mezzanine-rk3399_defconfig +1 -0
index fd1b85c1e4ba..b3c8f19e43d0 100644
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x00200000
 CONFIG_ENV_SIZE=0x6000
 CONFIG_ENV_OFFSET=0x460000
 CONFIG_ENV_SECT_SIZE=0x1000
+CONFIG_SPL_DM_SPI=y
 CONFIG_ROCKCHIP_RK3399=y
 CONFIG_TARGET_ROC_PC_RK3399=y
 CONFIG_NR_DRAM_BANKS=1
configs/roc-pc-rk3399_defconfig +1 -0
index 80e700148181..edb327b46b8f 100644
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x00200000
 CONFIG_ENV_SIZE=0x6000
 CONFIG_ENV_OFFSET=0x460000
 CONFIG_ENV_SECT_SIZE=0x1000
+CONFIG_SPL_DM_SPI=y
 CONFIG_ROCKCHIP_RK3399=y
 CONFIG_TARGET_ROC_PC_RK3399=y
 CONFIG_NR_DRAM_BANKS=1
configs/rockpro64-rk3399_defconfig +1 -0
index 807747485a36..2bbded008361 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x00200000
 CONFIG_ENV_SIZE=0x8000
 CONFIG_ENV_OFFSET=0x3F8000
+CONFIG_SPL_DM_SPI=y
 CONFIG_ROCKCHIP_RK3399=y
 CONFIG_TARGET_ROCKPRO64_RK3399=y
 CONFIG_NR_DRAM_BANKS=1
configs/sama5d27_wlsom1_ek_qspiflash_defconfig +1 -0
index eea86f935708..58b906ad5923 100644
@@ -9,6 +9,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_ENV_SECT_SIZE=0x1000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
 CONFIG_SPL=y
configs/sama5d2_xplained_spiflash_defconfig +1 -0
index 9f90aa1328c9..e5227b11f50b 100644
@@ -12,6 +12,7 @@ CONFIG_ENV_OFFSET=0x6000
 CONFIG_ENV_SECT_SIZE=0x1000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x10000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
 CONFIG_NR_DRAM_BANKS=1
configs/sama5d3xek_spiflash_defconfig +1 -0
index 4ff41161183b..b3bc4b4fe593 100644
@@ -12,6 +12,7 @@ CONFIG_ENV_OFFSET=0x6000
 CONFIG_ENV_SECT_SIZE=0x1000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x10000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
 CONFIG_NR_DRAM_BANKS=1
configs/sama5d4_xplained_spiflash_defconfig +1 -0
index 6eaebea82ddf..2799b69a5d2f 100644
@@ -12,6 +12,7 @@ CONFIG_ENV_OFFSET=0x6000
 CONFIG_ENV_SECT_SIZE=0x1000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x10000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
 CONFIG_NR_DRAM_BANKS=1
configs/sama5d4ek_spiflash_defconfig +1 -0
index f225e9ea390b..4b7e825ce022 100644
@@ -12,6 +12,7 @@ CONFIG_ENV_OFFSET=0x6000
 CONFIG_ENV_SECT_SIZE=0x1000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x10000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
 CONFIG_NR_DRAM_BANKS=1
configs/sifive_fu540_defconfig +1 -0
index 8d412f8d6ae2..904f6cd03911 100644
@@ -2,6 +2,7 @@ CONFIG_RISCV=y
 CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SYS_MALLOC_F_LEN=0x3000
 CONFIG_ENV_SIZE=0x20000
+CONFIG_SPL_DM_SPI=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_SPL=y
configs/socfpga_agilex_defconfig +1 -0
index 60397a8ccea6..755541dc2266 100644
@@ -6,6 +6,7 @@ CONFIG_ENV_SIZE=0x1000
 CONFIG_ENV_OFFSET=0x200
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x3c00000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_TARGET_SOCFPGA_AGILEX_SOCDK=y
 CONFIG_IDENT_STRING="socfpga_agilex"
configs/socfpga_arria10_defconfig +1 -0
index 35ae18fac003..5d1b7657723d 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_SOCFPGA=y
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0x4400
 CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
 CONFIG_TARGET_SOCFPGA_ARRIA10_SOCDK=y
 CONFIG_IDENT_STRING="socfpga_arria10"
configs/socfpga_arria5_defconfig +1 -0
index ce230110e453..2ff9e8bc81cc 100644
@@ -4,6 +4,7 @@ CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0x4400
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
 CONFIG_TARGET_SOCFPGA_ARRIA5_SOCDK=y
 CONFIG_SPL_TEXT_BASE=0xFFFF0000
 CONFIG_DISTRO_DEFAULTS=y
configs/socfpga_cyclone5_defconfig +1 -0
index 1633ca1deb57..0ef320ce6ee0 100644
@@ -4,6 +4,7 @@ CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0x4400
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
 CONFIG_TARGET_SOCFPGA_CYCLONE5_SOCDK=y
 CONFIG_SPL_TEXT_BASE=0xFFFF0000
 CONFIG_DISTRO_DEFAULTS=y
configs/socfpga_dbm_soc1_defconfig +1 -0
index 3e1a06d94248..960d80dbca91 100644
@@ -4,6 +4,7 @@ CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0x4400
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
 CONFIG_TARGET_SOCFPGA_DEVBOARDS_DBM_SOC1=y
 CONFIG_SPL_TEXT_BASE=0xFFFF0000
 CONFIG_FIT=y
configs/socfpga_de0_nano_soc_defconfig +1 -0
index dafb5e83d09a..3fc0b04269be 100644
@@ -4,6 +4,7 @@ CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0x4400
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
 CONFIG_TARGET_SOCFPGA_TERASIC_DE0_NANO=y
 CONFIG_SPL_TEXT_BASE=0xFFFF0000
 CONFIG_DISTRO_DEFAULTS=y
configs/socfpga_de10_nano_defconfig +1 -0
index 64ee602b742f..18d914e15b13 100644
@@ -4,6 +4,7 @@ CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0x4400
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
 CONFIG_TARGET_SOCFPGA_TERASIC_DE10_NANO=y
 CONFIG_SPL_TEXT_BASE=0xFFFF0000
 CONFIG_DISTRO_DEFAULTS=y
configs/socfpga_de1_soc_defconfig +1 -0
index 095fc84c4b1e..8301bc3987f3 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_SOCFPGA=y
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0x4400
 CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
 CONFIG_TARGET_SOCFPGA_TERASIC_DE1_SOC=y
 CONFIG_SPL_TEXT_BASE=0xFFFF0000
 CONFIG_DISTRO_DEFAULTS=y
configs/socfpga_is1_defconfig +1 -0
index a60df9b5d985..1128826dbc4d 100644
@@ -5,6 +5,7 @@ CONFIG_ENV_OFFSET=0x100000
 CONFIG_ENV_SECT_SIZE=0x10000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
 CONFIG_SYS_BOOTCOUNT_ADDR=0xfffffff8
 CONFIG_TARGET_SOCFPGA_IS1=y
 CONFIG_SPL_TEXT_BASE=0xFFFF0000
configs/socfpga_mcvevk_defconfig +1 -0
index 157efea52209..979d76fda87b 100644
@@ -4,6 +4,7 @@ CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0x4400
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
 CONFIG_TARGET_SOCFPGA_ARIES_MCVEVK=y
 CONFIG_SPL_TEXT_BASE=0xFFFF0000
 CONFIG_DISTRO_DEFAULTS=y
configs/socfpga_sockit_defconfig +1 -0
index 247f3abda1c8..d814fd7baa76 100644
@@ -4,6 +4,7 @@ CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0x4400
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
 CONFIG_TARGET_SOCFPGA_TERASIC_SOCKIT=y
 CONFIG_SPL_TEXT_BASE=0xFFFF0000
 CONFIG_DISTRO_DEFAULTS=y
configs/socfpga_socrates_defconfig +1 -0
index a9ec97f2f4bb..f8dfec613f25 100644
@@ -4,6 +4,7 @@ CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0x4400
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
 CONFIG_TARGET_SOCFPGA_EBV_SOCRATES=y
 CONFIG_SPL_TEXT_BASE=0xFFFF0000
 CONFIG_DISTRO_DEFAULTS=y
configs/socfpga_sr1500_defconfig +1 -0
index c95a7fc5e073..328100f70eba 100644
@@ -5,6 +5,7 @@ CONFIG_ENV_OFFSET=0xE0000
 CONFIG_ENV_SECT_SIZE=0x10000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
 CONFIG_SYS_BOOTCOUNT_ADDR=0xfffffff8
 CONFIG_TARGET_SOCFPGA_SR1500=y
 CONFIG_ENV_OFFSET_REDUND=0xF0000
configs/socfpga_stratix10_defconfig +1 -0
index 16ae0feb6807..96112062340a 100644
@@ -6,6 +6,7 @@ CONFIG_ENV_SIZE=0x1000
 CONFIG_ENV_OFFSET=0x200
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x3C00000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_TARGET_SOCFPGA_STRATIX10_SOCDK=y
 CONFIG_IDENT_STRING="socfpga_stratix10"
configs/socfpga_vining_fpga_defconfig +1 -0
index 61b569eb3cf6..37190ba04580 100644
@@ -5,6 +5,7 @@ CONFIG_ENV_OFFSET=0x100000
 CONFIG_ENV_SECT_SIZE=0x10000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
 CONFIG_TARGET_SOCFPGA_SOFTING_VINING_FPGA=y
 CONFIG_ENV_OFFSET_REDUND=0x110000
 CONFIG_SPL_TEXT_BASE=0xFFFF0000
configs/stm32mp15_basic_defconfig +1 -0
index c7dd2926c944..668cd434f1e1 100644
@@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x3000
 CONFIG_ENV_OFFSET=0x280000
 CONFIG_ENV_SECT_SIZE=0x40000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000
+CONFIG_SPL_DM_SPI=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL=y
 CONFIG_TARGET_ST_STM32MP15x=y
configs/stm32mp15_dhcom_basic_defconfig +1 -0
index 610657267351..1ac07c5865b8 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_STM32MP=y
 CONFIG_SYS_MALLOC_F_LEN=0x3000
 CONFIG_ENV_SIZE=0x4000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000
+CONFIG_SPL_DM_SPI=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL=y
 CONFIG_TARGET_DH_STM32MP1_PDK2=y
configs/stm32mp15_dhcor_basic_defconfig +1 -0
index 249646c4494b..225d04497948 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_STM32MP=y
 CONFIG_SYS_MALLOC_F_LEN=0x3000
 CONFIG_ENV_SIZE=0x4000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000
+CONFIG_SPL_DM_SPI=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL=y
 CONFIG_TARGET_DH_STM32MP1_PDK2=y
configs/taurus_defconfig +1 -0
index 16a804b879f0..953f7784be42 100644
@@ -15,6 +15,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_ENV_OFFSET=0x100000
+CONFIG_SPL_DM_SPI=y
 CONFIG_SPL_SYS_MALLOC_F_LEN=0x1000
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_SPL=y
configs/topic_miami_defconfig +1 -0
index 721ed3f8a6a0..f816788fe946 100644
@@ -7,6 +7,7 @@ CONFIG_SYS_TEXT_BASE=0x4000000
 CONFIG_ENV_SIZE=0x8000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
 CONFIG_SPL_STACK_R_ADDR=0x200000
 CONFIG_SPL=y
 CONFIG_DEBUG_UART_BASE=0xe0000000
configs/topic_miamilite_defconfig +1 -0
index 56981bb73654..8c61ae694419 100644
@@ -7,6 +7,7 @@ CONFIG_SYS_TEXT_BASE=0x4000000
 CONFIG_ENV_SIZE=0x8000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
 CONFIG_SPL_STACK_R_ADDR=0x200000
 CONFIG_SPL=y
 CONFIG_DEBUG_UART_BASE=0xe0000000
configs/topic_miamiplus_defconfig +1 -0
index 129c8f657dfd..c714374771e9 100644
@@ -7,6 +7,7 @@ CONFIG_SYS_TEXT_BASE=0x4000000
 CONFIG_ENV_SIZE=0x8000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
 CONFIG_SPL_STACK_R_ADDR=0x200000
 CONFIG_SPL=y
 CONFIG_DEBUG_UART_BASE=0xe0000000
configs/xilinx_zynq_virt_defconfig +1 -0
index 5da7440af287..4dbf10119dc9 100644
@@ -4,6 +4,7 @@ CONFIG_ARCH_ZYNQ=y
 CONFIG_SYS_TEXT_BASE=0x4000000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
 CONFIG_SPL_STACK_R_ADDR=0x200000
 CONFIG_SPL=y
 CONFIG_DISTRO_DEFAULTS=y
configs/xilinx_zynqmp_virt_defconfig +1 -0
index fe60d10c991d..e0c6e7ab24f9 100644
@@ -4,6 +4,7 @@ CONFIG_ARCH_ZYNQMP=y
 CONFIG_SYS_TEXT_BASE=0x8000000
 CONFIG_SYS_MALLOC_F_LEN=0x8000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
 CONFIG_SPL=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
configs/zynq_cse_qspi_defconfig +1 -0
index 462dff8942e5..8fbf5ec46619 100644
@@ -7,6 +7,7 @@ CONFIG_SYS_TEXT_BASE=0xFFFC0000
 CONFIG_ENV_SIZE=0x190
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000
 CONFIG_SYS_MALLOC_LEN=0x1000
+CONFIG_SPL_DM_SPI=y
 CONFIG_SPL_STACK_R_ADDR=0x200000
 CONFIG_SPL=y
 CONFIG_DEBUG_UART_BASE=0x0
Signature · 1 line
2.17.1
#61 lore raw

PATCH v2 29/31 spi: Enable missing CONFIG_SPL_DM_SPI support

Quoted 112 lines · Tom Rini

Due to how the Makefile logic is we currently get DM_SPI support in SPL enabled by having DM_SPI enabled for full U-Boot but not having CONFIG_SPL_DM_SPI set. Add this missing option to boards that were inadvertently making use of it.

Cc Adam Ford <[email protected]>
Cc Akash Gajjar <[email protected]>
Cc Anatolij Gustschin <[email protected]>
Cc Andy Yan <[email protected]>
Cc Anup Patel <[email protected]>
Cc Atish Patra <[email protected]>
Cc Bin Meng <[email protected]>
Cc Chee Hong Ang <[email protected]>
Cc Chin-Liang See <[email protected]>
Cc Dalon Westergreen <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Eugen Hristev <[email protected]>
Cc Hannes Schmelzer <[email protected]>
Cc Heiko Schocher <[email protected]>
Cc Jagan Teki <[email protected]>
Cc Klaus Goger <[email protected]>
Cc Levin Du <[email protected]>
Cc Ley Foon Tan <[email protected]>
Cc Lokesh Vutla <[email protected]>
Cc Luca Ceresoli <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Michal Simek <[email protected]>
Cc Mike Looijmans <[email protected]>
Cc Nicolas Ferre <[email protected]>
Cc Nikita Kiryanov <[email protected]>
Cc Palmer Dabbelt <[email protected]>
Cc Patrick Delaunay <[email protected]>
Cc Paul Walmsley <[email protected]>
Cc Pavel Machek <[email protected]>
Cc Peter Robinson <[email protected]>
Cc Philipp Tomsich <[email protected]>
Cc Simon Glass <[email protected]>
Cc Stefan Roese <[email protected]>
Cc Suniel Mahesh <[email protected]>
Cc Vitaly Andrianov <[email protected]>
Cc Wolfgang Grandegger <[email protected]>

---
Changes in v2:
- Add k2 family

---
 configs/am57xx_evm_defconfig                                   | 1 +
 configs/am57xx_hs_evm_defconfig                                | 1 +
 configs/am57xx_hs_evm_usb_defconfig                            | 1 +
 configs/am65x_evm_a53_defconfig                                | 1 +
 configs/am65x_evm_r5_defconfig                                 | 1 +
 configs/am65x_hs_evm_a53_defconfig                             | 1 +
 configs/am65x_hs_evm_r5_defconfig                              | 1 +
 configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig | 1 +
 configs/axm_defconfig                                          | 1 +
 configs/brppt1_spi_defconfig                                   | 1 +
 configs/brsmarc1_defconfig                                     | 1 +
 configs/chromebit_mickey_defconfig                             | 1 +
 configs/chromebook_bob_defconfig                               | 1 +
 configs/chromebook_coral_defconfig                             | 1 +
 configs/chromebook_jerry_defconfig                             | 1 +
 configs/chromebook_link64_defconfig                            | 1 +
 configs/chromebook_minnie_defconfig                            | 1 +
 configs/chromebook_samus_tpl_defconfig                         | 1 +
 configs/chromebook_speedy_defconfig                            | 1 +
 configs/cm_t43_defconfig                                       | 1 +
 configs/da850evm_defconfig                                     | 1 +
 configs/da850evm_nand_defconfig                                | 1 +
 configs/dra7xx_evm_defconfig                                   | 1 +
 configs/dra7xx_hs_evm_defconfig                                | 1 +
 configs/dra7xx_hs_evm_usb_defconfig                            | 1 +
 configs/evb-px5_defconfig                                      | 1 +
 configs/j721e_evm_a72_defconfig                                | 1 +
 configs/j721e_evm_r5_defconfig                                 | 1 +
 configs/j721e_hs_evm_a72_defconfig                             | 1 +
 configs/j721e_hs_evm_r5_defconfig                              | 1 +
 configs/k2e_evm_defconfig                                      | 1 +
 configs/k2g_evm_defconfig                                      | 1 +
 configs/k2hk_evm_defconfig                                     | 1 +
 configs/k2l_evm_defconfig                                      | 1 +
 configs/lion-rk3368_defconfig                                  | 1 +
 configs/pinebook-pro-rk3399_defconfig                          | 1 +
 configs/puma-rk3399_defconfig                                  | 1 +
 configs/qemu-x86_64_defconfig                                  | 1 +
 configs/roc-pc-mezzanine-rk3399_defconfig                      | 1 +
 configs/roc-pc-rk3399_defconfig                                | 1 +
 configs/rockpro64-rk3399_defconfig                             | 1 +
 configs/sama5d27_wlsom1_ek_qspiflash_defconfig                 | 1 +
 configs/sama5d2_xplained_spiflash_defconfig                    | 1 +
 configs/sama5d3xek_spiflash_defconfig                          | 1 +
 configs/sama5d4_xplained_spiflash_defconfig                    | 1 +
 configs/sama5d4ek_spiflash_defconfig                           | 1 +
 configs/sifive_fu540_defconfig                                 | 1 +
 configs/socfpga_agilex_defconfig                               | 1 +
 configs/socfpga_arria10_defconfig                              | 1 +
 configs/socfpga_arria5_defconfig                               | 1 +
 configs/socfpga_cyclone5_defconfig                             | 1 +
 configs/socfpga_dbm_soc1_defconfig                             | 1 +
 configs/socfpga_de0_nano_soc_defconfig                         | 1 +
 configs/socfpga_de10_nano_defconfig                            | 1 +
 configs/socfpga_de1_soc_defconfig                              | 1 +
 configs/socfpga_is1_defconfig                                  | 1 +
 configs/socfpga_mcvevk_defconfig                               | 1 +
 configs/socfpga_sockit_defconfig                               | 1 +
 configs/socfpga_socrates_defconfig                             | 1 +
 configs/socfpga_sr1500_defconfig                               | 1 +
 configs/socfpga_stratix10_defconfig                            | 1 +
 configs/socfpga_vining_fpga_defconfig                          | 1 +
 configs/stm32mp15_basic_defconfig                              | 1 +
 configs/stm32mp15_dhcom_basic_defconfig                        | 1 +
 configs/stm32mp15_dhcor_basic_defconfig                        | 1 +
Quoted 9 lines
 configs/taurus_defconfig                                       | 1 +
 configs/topic_miami_defconfig                                  | 1 +
 configs/topic_miamilite_defconfig                              | 1 +
 configs/topic_miamiplus_defconfig                              | 1 +
 configs/xilinx_zynq_virt_defconfig                             | 1 +
 configs/xilinx_zynqmp_virt_defconfig                           | 1 +
 configs/zynq_cse_qspi_defconfig                                | 1 +
 72 files changed, 72 insertions(+)
#62 lore raw

PATCH v2 29/31 spi: Enable missing CONFIG_SPL_DM_SPI support

In reply to Tom Rini

Hi,

Quoted 4 lines · Tom Rini

Due to how the Makefile logic is we currently get DM_SPI support in SPL enabled by having DM_SPI enabled for full U-Boot but not having CONFIG_SPL_DM_SPI set. Add this missing option to boards that were inadvertently making use of it.

[...]

For the Avnet Ultrazed:

Quoted 1 line
 configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig | 1 +
Signature · 1 line
Luca
author
#63 lore raw

PATCH v2 29/31 spi: Enable missing CONFIG_SPL_DM_SPI support

In reply to Tom Rini
Quoted 36 lines · Tom Rini

Due to how the Makefile logic is we currently get DM_SPI support in SPL enabled by having DM_SPI enabled for full U-Boot but not having CONFIG_SPL_DM_SPI set. Add this missing option to boards that were inadvertently making use of it.

Cc Adam Ford <[email protected]>
Cc Akash Gajjar <[email protected]>
Cc Anatolij Gustschin <[email protected]>
Cc Andy Yan <[email protected]>
Cc Anup Patel <[email protected]>
Cc Atish Patra <[email protected]>
Cc Bin Meng <[email protected]>
Cc Chee Hong Ang <[email protected]>
Cc Chin-Liang See <[email protected]>
Cc Dalon Westergreen <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Eugen Hristev <[email protected]>
Cc Hannes Schmelzer <[email protected]>
Cc Heiko Schocher <[email protected]>
Cc Jagan Teki <[email protected]>
Cc Klaus Goger <[email protected]>
Cc Levin Du <[email protected]>
Cc Ley Foon Tan <[email protected]>
Cc Lokesh Vutla <[email protected]>
Cc Luca Ceresoli <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Michal Simek <[email protected]>
Cc Mike Looijmans <[email protected]>
Cc Nicolas Ferre <[email protected]>
Cc Nikita Kiryanov <[email protected]>
Cc Palmer Dabbelt <[email protected]>
Cc Patrick Delaunay <[email protected]>
Cc Paul Walmsley <[email protected]>
Cc Pavel Machek <[email protected]>
Cc Peter Robinson <[email protected]>
Cc Philipp Tomsich <[email protected]>
Quoted 8 lines
Cc Simon Glass <[email protected]>
Cc Stefan Roese <[email protected]>
Cc Suniel Mahesh <[email protected]>
Cc Vitaly Andrianov <[email protected]>
Cc Wolfgang Grandegger <[email protected]>

Applied to u-boot/next, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200630/fbfe9b7f/attachment.sig>
author
#64 lore raw

PATCH v2 30/31 spi: Update build guard for DM objects to cover SPL/TPL

In reply to Tom Rini

We need to ensure that in the cases where SPL / TPL do not use DM we do not try and build the core nor drivers that require DM.

---
 drivers/spi/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/Makefile +1 -1
index 54881a74124d..9559e938d262 100644
@@ -4,7 +4,7 @@
 # Wolfgang Denk, DENX Software Engineering, wd at denx.de.
 
 # There are many options which enable SPI, so make this library available
-ifdef CONFIG_DM_SPI
+ifdef CONFIG_$(SPL_TPL_)DM_SPI
 obj-y += spi-uclass.o
 obj-$(CONFIG_SANDBOX) += spi-emul-uclass.o
 obj-$(CONFIG_SOFT_SPI) += soft_spi.o
Signature · 1 line
2.17.1
author
#65 lore raw

PATCH v2 31/31 Convert CONFIG_CADENCE_QSPI to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_CADENCE_QSPI

---
 configs/k2g_evm_defconfig    | 1 +
 configs/k2g_hs_evm_defconfig | 1 +
 drivers/spi/Makefile         | 2 +-
 include/configs/k2g_evm.h    | 1 -
 4 files changed, 3 insertions(+), 2 deletions(-)
configs/k2g_evm_defconfig +1 -0
index c763ead401b1..b7310900e4c5 100644
@@ -74,6 +74,7 @@ CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
+CONFIG_CADENCE_QSPI=y
 CONFIG_DAVINCI_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
configs/k2g_hs_evm_defconfig +1 -0
index f089be4f563a..adedfddf4f50 100644
@@ -62,6 +62,7 @@ CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
+CONFIG_CADENCE_QSPI=y
 CONFIG_DAVINCI_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
drivers/spi/Makefile +1 -1
index 9559e938d262..4e7461771f2b 100644
@@ -6,6 +6,7 @@
 # There are many options which enable SPI, so make this library available
 ifdef CONFIG_$(SPL_TPL_)DM_SPI
 obj-y += spi-uclass.o
+obj-$(CONFIG_CADENCE_QSPI) += cadence_qspi.o cadence_qspi_apb.o
 obj-$(CONFIG_SANDBOX) += spi-emul-uclass.o
 obj-$(CONFIG_SOFT_SPI) += soft_spi.o
 obj-$(CONFIG_SPI_MEM) += spi-mem.o
@@ -22,7 +23,6 @@ obj-$(CONFIG_ATMEL_SPI) += atmel_spi.o
 obj-$(CONFIG_BCM63XX_HSSPI) += bcm63xx_hsspi.o
 obj-$(CONFIG_BCM63XX_SPI) += bcm63xx_spi.o
 obj-$(CONFIG_BCMSTB_SPI) += bcmstb_spi.o
-obj-$(CONFIG_CADENCE_QSPI) += cadence_qspi.o cadence_qspi_apb.o
 obj-$(CONFIG_CF_SPI) += cf_spi.o
 obj-$(CONFIG_DAVINCI_SPI) += davinci_spi.o
 obj-$(CONFIG_DESIGNWARE_SPI) += designware_spi.o
include/configs/k2g_evm.h +0 -1
index 25f3959533c6..83466b9e0cfa 100644
@@ -82,7 +82,6 @@
 #define PHY_ANEG_TIMEOUT	10000 /* PHY needs longer aneg time */
 
 #ifndef CONFIG_SPL_BUILD
-#define CONFIG_CADENCE_QSPI
 #define CONFIG_CQSPI_REF_CLK 384000000
 #endif
 
Signature · 1 line
2.17.1
author
#66 lore raw

PATCH v2 31/31 Convert CONFIG_CADENCE_QSPI to Kconfig

Quoted 4 lines · Tom Rini

This converts the following to Kconfig:
CONFIG_CADENCE_QSPI

Applied to u-boot/next, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200630/7bea83bf/attachment.sig>