configs: migrate CONFIG_SET_DFU_ALT_INFO to defconfigs
PATCH 1/2 configs: migrate CONFIG_SET_DFU_ALT_INFO to defconfigs
Move CONFIG_SET_DFU_ALT_INFO into Kconfig done by moveconfig.py.
---
configs/odroid-xu3_defconfig | 1 + configs/odroid_defconfig | 1 + configs/stm32mp15_basic_defconfig | 1 + configs/stm32mp15_dhcom_basic_defconfig | 1 + configs/stm32mp15_optee_defconfig | 1 + configs/stm32mp15_trusted_defconfig | 1 + drivers/dfu/Kconfig | 5 +++++ include/configs/odroid.h | 1 - include/configs/odroid_xu3.h | 1 - include/configs/stm32mp1.h | 2 -- scripts/config_whitelist.txt | 1 - 11 files changed, 11 insertions(+), 5 deletions(-)
configs/odroid-xu3_defconfig +1 -0
@@ -39,6 +39,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_ADC=y CONFIG_ADC_EXYNOS=y CONFIG_DFU_MMC=y +CONFIG_SET_DFU_ALT_INFO=y CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_MMC_DW=y CONFIG_MTD=y
configs/odroid_defconfig +1 -0
@@ -40,6 +40,7 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos4412-odroid" CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DFU_MMC=y +CONFIG_SET_DFU_ALT_INFO=y CONFIG_SYS_I2C_S3C24X0=y CONFIG_MMC_DW=y CONFIG_MMC_SDHCI=y
configs/stm32mp15_basic_defconfig +1 -0
@@ -71,6 +71,7 @@ CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DFU_MTD=y CONFIG_DFU_VIRT=y +CONFIG_SET_DFU_ALT_INFO=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0xC0000000 CONFIG_FASTBOOT_BUF_SIZE=0x02000000
configs/stm32mp15_dhcom_basic_defconfig +1 -0
@@ -70,6 +70,7 @@ CONFIG_SPL_BLOCK_CACHE=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DFU_VIRT=y +CONFIG_SET_DFU_ALT_INFO=y CONFIG_DM_HWSPINLOCK=y CONFIG_HWSPINLOCK_STM32=y CONFIG_DM_I2C=y
configs/stm32mp15_optee_defconfig +1 -0
@@ -58,6 +58,7 @@ CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DFU_MTD=y CONFIG_DFU_VIRT=y +CONFIG_SET_DFU_ALT_INFO=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0xC0000000 CONFIG_FASTBOOT_BUF_SIZE=0x02000000
configs/stm32mp15_trusted_defconfig +1 -0
@@ -57,6 +57,7 @@ CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DFU_MTD=y CONFIG_DFU_VIRT=y +CONFIG_SET_DFU_ALT_INFO=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0xC0000000 CONFIG_FASTBOOT_BUF_SIZE=0x02000000
drivers/dfu/Kconfig +5 -0
@@ -81,5 +81,10 @@ config DFU_VIRT used at board level to manage specific behavior (OTP update for example). +config SET_DFU_ALT_INFO + bool "Dynamic set of DFU alternate information" + help + This option allows to call the function set_dfu_alt_info to + dynamically build dfu_alt_info in board. endif endmenu
include/configs/odroid.h +0 -1
@@ -64,7 +64,6 @@"" PARTS_BOOT " part 0 1;" \ ""PARTS_ROOT" part 0 2\0" \ -#define CONFIG_SET_DFU_ALT_INFO #define CONFIG_SET_DFU_ALT_BUF_LEN (SZ_1K)#define CONFIG_DFU_ALT_BOOT_EMMC \
include/configs/odroid_xu3.h +0 -1
@@ -76,7 +76,6 @@/* Enable: board/samsung/common/misc.c to use set_dfu_alt_info() */ #define CONFIG_MISC_COMMON -#define CONFIG_SET_DFU_ALT_INFO #define CONFIG_SET_DFU_ALT_BUF_LEN (SZ_1K)/* Set soc_rev, soc_id, board_rev, board_name, fdtfile */
include/configs/stm32mp1.h +0 -2
@@ -90,8 +90,6 @@#define CONFIG_SYS_MTDPARTS_RUNTIME #endif -#define CONFIG_SET_DFU_ALT_INFO -#ifdef CONFIG_DM_VIDEO #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_BMP_16BPP
scripts/config_whitelist.txt +0 -1
@@ -1529,7 +1529,6 @@ CONFIG_SETUP_MEMORY_TAGS CONFIG_SET_BIST CONFIG_SET_BOOTARGS CONFIG_SET_DFU_ALT_BUF_LEN -CONFIG_SET_DFU_ALT_INFO CONFIG_SFIO CONFIG_SF_DATAFLASH CONFIG_SGI_IP28
Signature · 1 line
2.17.1
PATCH 2/2 configs: migrate CONFIG_SYS_MTDPARTS_RUNTIME to defconfigs
Move CONFIG_SYS_MTDPARTS_RUNTIME into Kconfig done by moveconfig.py.
---
configs/igep00x0_defconfig | 1 + configs/stm32mp15_basic_defconfig | 1 + configs/stm32mp15_dhcom_basic_defconfig | 1 + configs/stm32mp15_optee_defconfig | 1 + configs/stm32mp15_trusted_defconfig | 1 + drivers/mtd/Kconfig | 7 +++++++ include/configs/omap3_igep00x0.h | 2 -- include/configs/stm32mp1.h | 5 ----- scripts/config_whitelist.txt | 1 - 9 files changed, 12 insertions(+), 8 deletions(-)
configs/igep00x0_defconfig +1 -0
@@ -52,6 +52,7 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y CONFIG_MTD=y +CONFIG_SYS_MTDPARTS_RUNTIME=y CONFIG_MTD_RAW_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPL_NAND_SIMPLE=y
configs/stm32mp15_basic_defconfig +1 -0
@@ -91,6 +91,7 @@ CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_STM32_SDMMC2=y CONFIG_MTD=y CONFIG_DM_MTD=y +CONFIG_SYS_MTDPARTS_RUNTIME=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_STM32_FMC2=y CONFIG_MTD_SPI_NAND=y
configs/stm32mp15_dhcom_basic_defconfig +1 -0
@@ -84,6 +84,7 @@ CONFIG_DM_MMC=y CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_STM32_SDMMC2=y CONFIG_MTD=y +CONFIG_SYS_MTDPARTS_RUNTIME=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_SPANSION=y
configs/stm32mp15_optee_defconfig +1 -0
@@ -78,6 +78,7 @@ CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_STM32_SDMMC2=y CONFIG_MTD=y CONFIG_DM_MTD=y +CONFIG_SYS_MTDPARTS_RUNTIME=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_STM32_FMC2=y CONFIG_MTD_SPI_NAND=y
configs/stm32mp15_trusted_defconfig +1 -0
@@ -77,6 +77,7 @@ CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_STM32_SDMMC2=y CONFIG_MTD=y CONFIG_DM_MTD=y +CONFIG_SYS_MTDPARTS_RUNTIME=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_STM32_FMC2=y CONFIG_MTD_SPI_NAND=y
drivers/mtd/Kconfig +7 -0
@@ -22,6 +22,13 @@ config MTD_NOR_FLASH help Enable support for parallel NOR flash. +config SYS_MTDPARTS_RUNTIME + bool "Allow MTDPARTS to be configured at runtime" + depends on MTD + help + This option allows to call the function board_mtdparts_default to + dynamically build the variables mtdids and mtdparts at runtime. + config FLASH_CFI_DRIVER bool "Enable CFI Flash driver" help
include/configs/omap3_igep00x0.h +0 -2
@@ -71,8 +71,6 @@#endif -#define CONFIG_SYS_MTDPARTS_RUNTIME -/* OneNAND config */ #define CONFIG_USE_ONENAND_BOARD_INIT #define CONFIG_SYS_ONENAND_BASE ONENAND_MAP
include/configs/stm32mp1.h +0 -5
@@ -85,11 +85,6 @@#define CONFIG_SYS_AUTOLOAD "no"#endif -/* Dynamic MTD partition support */ -#if defined(CONFIG_STM32_QSPI ) || defined(CONFIG_NAND_STM32_FMC2 ) -#define CONFIG_SYS_MTDPARTS_RUNTIME -#endif -#ifdef CONFIG_DM_VIDEO #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_BMP_16BPP
scripts/config_whitelist.txt +0 -1
@@ -3198,7 +3198,6 @@ CONFIG_SYS_MRAM_SIZE CONFIG_SYS_MSC0_VAL CONFIG_SYS_MSC1_VAL CONFIG_SYS_MSC2_VAL -CONFIG_SYS_MTDPARTS_RUNTIME CONFIG_SYS_MX5_CLK32 CONFIG_SYS_MX5_HCLK CONFIG_SYS_MX6_CLK32
Signature · 1 line
2.17.1
PATCH 2/2 configs: migrate CONFIG_SYS_MTDPARTS_RUNTIME to defconfigs
HI
Quoted 128 lines · Patrick Delaunay
Move
CONFIG_SYS_MTDPARTS_RUNTIMEintoKconfigdone bymoveconfig.py.Signed-off-by Patrick Delaunay <[email protected]>---
configs/igep00x0_defconfig | 1 + configs/stm32mp15_basic_defconfig | 1 + configs/stm32mp15_dhcom_basic_defconfig | 1 + configs/stm32mp15_optee_defconfig | 1 + configs/stm32mp15_trusted_defconfig | 1 + drivers/mtd/Kconfig | 7 +++++++ include/configs/omap3_igep00x0.h | 2 -- include/configs/stm32mp1.h | 5 ----- scripts/config_whitelist.txt | 1 - 9 files changed, 12 insertions(+), 8 deletions(-)configs/igep00x0_defconfig +1
-0@@ -52,6 +52,7 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y CONFIG_MTD=y +CONFIG_SYS_MTDPARTS_RUNTIME=y CONFIG_MTD_RAW_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPL_NAND_SIMPLE=yconfigs/stm32mp15_basic_defconfig +1
-0@@ -91,6 +91,7 @@ CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_STM32_SDMMC2=y CONFIG_MTD=y CONFIG_DM_MTD=y +CONFIG_SYS_MTDPARTS_RUNTIME=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_STM32_FMC2=y CONFIG_MTD_SPI_NAND=yconfigs/stm32mp15_dhcom_basic_defconfig +1
-0@@ -84,6 +84,7 @@ CONFIG_DM_MMC=y CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_STM32_SDMMC2=y CONFIG_MTD=y +CONFIG_SYS_MTDPARTS_RUNTIME=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_SPANSION=yconfigs/stm32mp15_optee_defconfig +1
-0@@ -78,6 +78,7 @@ CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_STM32_SDMMC2=y CONFIG_MTD=y CONFIG_DM_MTD=y +CONFIG_SYS_MTDPARTS_RUNTIME=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_STM32_FMC2=y CONFIG_MTD_SPI_NAND=yconfigs/stm32mp15_trusted_defconfig +1
-0@@ -77,6 +77,7 @@ CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_STM32_SDMMC2=y CONFIG_MTD=y CONFIG_DM_MTD=y +CONFIG_SYS_MTDPARTS_RUNTIME=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_STM32_FMC2=y CONFIG_MTD_SPI_NAND=ydrivers/mtd/Kconfig +7
-0@@ -22,6 +22,13 @@ config MTD_NOR_FLASH help Enable support for parallel NOR flash. +config SYS_MTDPARTS_RUNTIME + bool "Allow MTDPARTS to be configured at runtime" + depends on MTD + help + This option allows to call the function board_mtdparts_default to + dynamically build the variables mtdids and mtdparts at runtime. + config FLASH_CFI_DRIVER bool "Enable CFI Flash driver" helpinclude/configs/omap3_igep00x0.h +0
-2@@ -71,8 +71,6 @@#endif -#define CONFIG_SYS_MTDPARTS_RUNTIME -/* OneNAND config */ #define CONFIG_USE_ONENAND_BOARD_INIT #define CONFIG_SYS_ONENAND_BASE ONENAND_MAPinclude/configs/stm32mp1.h +0
-5@@ -85,11 +85,6 @@#define CONFIG_SYS_AUTOLOAD "no"#endif -/* Dynamic MTD partition support */ -#if defined(CONFIG_STM32_QSPI ) || defined(CONFIG_NAND_STM32_FMC2 ) -#define CONFIG_SYS_MTDPARTS_RUNTIME -#endif -#ifdef CONFIG_DM_VIDEO #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_BMP_16BPP scripts/config_whitelist.txt +0
-0
scripts/config_whitelist.txt CONFIG_SYS_MRAM_SIZE · line 3203
Quoted 7 lines
scripts/config_whitelist.txt +0
-1@@ -3198,7 +3198,6 @@ CONFIG_SYS_MRAM_SIZE CONFIG_SYS_MSC0_VAL CONFIG_SYS_MSC1_VAL CONFIG_SYS_MSC2_VAL -CONFIG_SYS_MTDPARTS_RUNTIME CONFIG_SYS_MX5_CLK32 CONFIG_SYS_MX5_HCLK CONFIG_SYS_MX6_CLK32
Thanks
PATCH 2/2 configs: migrate CONFIG_SYS_MTDPARTS_RUNTIME to defconfigs
In reply to Patrick DelaunayQuoted 4 lines · Patrick Delaunay
Move
CONFIG_SYS_MTDPARTS_RUNTIMEintoKconfigdone bymoveconfig.py.Signed-off-by Patrick Delaunay <[email protected]>Reviewed-by Patrice Chotard <[email protected]>
Applied to u-boot/master, 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/20200508/5a94ebc4/attachment.sig>
PATCH 1/2 configs: migrate CONFIG_SET_DFU_ALT_INFO to defconfigs
In reply to Patrick DelaunayHi Patrick,
Quoted 1 line
Move
CONFIG_SET_DFU_ALT_INFOintoKconfigdone bymoveconfig.py.
Thank you for the conversion.
Quoted 146 lines
Signed-off-by Patrick Delaunay <[email protected]>---
configs/odroid-xu3_defconfig | 1 + configs/odroid_defconfig | 1 + configs/stm32mp15_basic_defconfig | 1 + configs/stm32mp15_dhcom_basic_defconfig | 1 + configs/stm32mp15_optee_defconfig | 1 + configs/stm32mp15_trusted_defconfig | 1 + drivers/dfu/Kconfig | 5 +++++ include/configs/odroid.h | 1 - include/configs/odroid_xu3.h | 1 - include/configs/stm32mp1.h | 2 -- scripts/config_whitelist.txt | 1 - 11 files changed, 11 insertions(+), 5 deletions(-)(quoted diff) +0
-0b/configs/odroid-xu3_defconfig index
2e982e1b53..1a2183ce19100644configs/odroid-xu3_defconfig +1
-0@@ -39,6 +39,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_ADC=y CONFIG_ADC_EXYNOS=y CONFIG_DFU_MMC=y +CONFIG_SET_DFU_ALT_INFO=y CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_MMC_DW=y CONFIG_MTD=yconfigs/odroid_defconfig +1
-0@@ -40,6 +40,7 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos4412-odroid" CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DFU_MMC=y +CONFIG_SET_DFU_ALT_INFO=y CONFIG_SYS_I2C_S3C24X0=y CONFIG_MMC_DW=y CONFIG_MMC_SDHCI=y(quoted diff) +0
-0b/configs/stm32mp15_basic_defconfig index
f691306800..4efb1bf9c2100644 --- a/configs/stm32mp15_basic_defconfig
+++ b/configs/stm32mp15_basic_defconfigconfigs/stm32mp15_basic_defconfig +1
-0@@ -71,6 +71,7 @@ CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DFU_MTD=y CONFIG_DFU_VIRT=y +CONFIG_SET_DFU_ALT_INFO=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0xC0000000 CONFIG_FASTBOOT_BUF_SIZE=0x02000000(quoted diff) +0
-0b/configs/stm32mp15_dhcom_basic_defconfig index
921dea242a..9b5e54748d100644 --- a/configs/stm32mp15_dhcom_basic_defconfig +++ b/configs/stm32mp15_dhcom_basic_defconfig @@ -70,6 +70,7 @@CONFIG_SPL_BLOCK_CACHE=yCONFIG_DFU_MMC=y
CONFIG_DFU_RAM=y
CONFIG_DFU_VIRT=yconfigs/stm32mp15_dhcom_basic_defconfig +1
-0+CONFIG_SET_DFU_ALT_INFO=y CONFIG_DM_HWSPINLOCK=y CONFIG_HWSPINLOCK_STM32=y CONFIG_DM_I2C=y(quoted diff) +0
-0b/configs/stm32mp15_optee_defconfig index
521b24e2cb..54135b28aa100644 --- a/configs/stm32mp15_optee_defconfig
+++ b/configs/stm32mp15_optee_defconfigconfigs/stm32mp15_basic_defconfig +1
-0@@ -58,6 +58,7 @@ CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DFU_MTD=y CONFIG_DFU_VIRT=y +CONFIG_SET_DFU_ALT_INFO=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0xC0000000 CONFIG_FASTBOOT_BUF_SIZE=0x02000000(quoted diff) +0
-0b/configs/stm32mp15_trusted_defconfig index
c8b328d01a..d7d0b6c296100644 --- a/configs/stm32mp15_trusted_defconfig
+++ b/configs/stm32mp15_trusted_defconfigconfigs/stm32mp15_basic_defconfig +1
-0@@ -57,6 +57,7 @@ CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DFU_MTD=y CONFIG_DFU_VIRT=y +CONFIG_SET_DFU_ALT_INFO=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0xC0000000 CONFIG_FASTBOOT_BUF_SIZE=0x02000000drivers/dfu/Kconfig +5
-0@@ -81,5 +81,10 @@ config DFU_VIRT used at board level to manage specific behavior (OTP update for example). +config SET_DFU_ALT_INFO + bool "Dynamic set of DFU alternate information" + help + This option allows to call the function set_dfu_alt_info to + dynamically build dfu_alt_info in board. endif endmenuinclude/configs/odroid.h +0
-1@@ -64,7 +64,6 @@"" PARTS_BOOT " part 0 1;" \ ""PARTS_ROOT" part 0 2\0" \ -#define CONFIG_SET_DFU_ALT_INFO #define CONFIG_SET_DFU_ALT_BUF_LEN (SZ_1K)#define CONFIG_DFU_ALT_BOOT_EMMC \(quoted diff) +0
-0
b/include/configs/odroid_xu3.hindex47c30543f8..564319c231100644include/configs/odroid_xu3.h +0
-1@@ -76,7 +76,6 @@/* Enable: board/samsung/common/misc.c to use set_dfu_alt_info() */ #define CONFIG_MISC_COMMON -#define CONFIG_SET_DFU_ALT_INFO #define CONFIG_SET_DFU_ALT_BUF_LEN (SZ_1K)/* Set soc_rev, soc_id, board_rev, board_name, fdtfile */ include/configs/stm32mp1.h +0
-2@@ -90,8 +90,6 @@#define CONFIG_SYS_MTDPARTS_RUNTIME #endif -#define CONFIG_SET_DFU_ALT_INFO -#ifdef CONFIG_DM_VIDEO #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_BMP_16BPP (quoted diff) +0
-0
b/scripts/config_whitelist.txtindex405c62e9be..85d55b182e100644
scripts/config_whitelist.txt CONFIG_SETUP_MEMORY_TAGS · line 1534
Quoted 7 lines
scripts/config_whitelist.txt +0
-1@@ -1529,7 +1529,6 @@ CONFIG_SETUP_MEMORY_TAGS CONFIG_SET_BIST CONFIG_SET_BOOTARGS CONFIG_SET_DFU_ALT_BUF_LEN -CONFIG_SET_DFU_ALT_INFO CONFIG_SFIO CONFIG_SF_DATAFLASH CONFIG_SGI_IP28
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de -------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200226/6b8b128e/attachment.sig>
PATCH 1/2 configs: migrate CONFIG_SET_DFU_ALT_INFO to defconfigs
Quoted 7 lines · Lukasz Majewski
Hi Patrick,
Quoted 1 line
Move
CONFIG_SET_DFU_ALT_INFOintoKconfigdone bymoveconfig.py.Thank you for the conversion.
Acked-by Lukasz Majewski <[email protected]>
Quoted 168 lines
Quoted 147 lines
Signed-off-by Patrick Delaunay <[email protected]>---
configs/odroid-xu3_defconfig | 1 + configs/odroid_defconfig | 1 + configs/stm32mp15_basic_defconfig | 1 + configs/stm32mp15_dhcom_basic_defconfig | 1 + configs/stm32mp15_optee_defconfig | 1 + configs/stm32mp15_trusted_defconfig | 1 + drivers/dfu/Kconfig | 5 +++++ include/configs/odroid.h | 1 - include/configs/odroid_xu3.h | 1 - include/configs/stm32mp1.h | 2 -- scripts/config_whitelist.txt | 1 - 11 files changed, 11 insertions(+), 5 deletions(-)(quoted diff) +0
-0b/configs/odroid-xu3_defconfig index
2e982e1b53..1a2183ce19100644configs/odroid-xu3_defconfig +1
-0@@ -39,6 +39,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_ADC=y CONFIG_ADC_EXYNOS=y CONFIG_DFU_MMC=y +CONFIG_SET_DFU_ALT_INFO=y CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_MMC_DW=y CONFIG_MTD=yconfigs/odroid_defconfig +1
-0@@ -40,6 +40,7 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos4412-odroid" CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DFU_MMC=y +CONFIG_SET_DFU_ALT_INFO=y CONFIG_SYS_I2C_S3C24X0=y CONFIG_MMC_DW=y CONFIG_MMC_SDHCI=y(quoted diff) +0
-0b/configs/stm32mp15_basic_defconfig index
f691306800..4efb1bf9c2100644 --- a/configs/stm32mp15_basic_defconfig
+++ b/configs/stm32mp15_basic_defconfigconfigs/stm32mp15_basic_defconfig +1
-0@@ -71,6 +71,7 @@ CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DFU_MTD=y CONFIG_DFU_VIRT=y +CONFIG_SET_DFU_ALT_INFO=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0xC0000000 CONFIG_FASTBOOT_BUF_SIZE=0x02000000(quoted diff) +0
-0b/configs/stm32mp15_dhcom_basic_defconfig index
921dea242a..9b5e54748d100644 --- a/configs/stm32mp15_dhcom_basic_defconfig +++ b/configs/stm32mp15_dhcom_basic_defconfig @@ -70,6 +70,7 @@CONFIG_SPL_BLOCK_CACHE=yCONFIG_DFU_MMC=y
CONFIG_DFU_RAM=y
CONFIG_DFU_VIRT=yconfigs/stm32mp15_dhcom_basic_defconfig +1
-0+CONFIG_SET_DFU_ALT_INFO=y CONFIG_DM_HWSPINLOCK=y CONFIG_HWSPINLOCK_STM32=y CONFIG_DM_I2C=y(quoted diff) +0
-0b/configs/stm32mp15_optee_defconfig index
521b24e2cb..54135b28aa100644 --- a/configs/stm32mp15_optee_defconfig
+++ b/configs/stm32mp15_optee_defconfigconfigs/stm32mp15_basic_defconfig +1
-0@@ -58,6 +58,7 @@ CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DFU_MTD=y CONFIG_DFU_VIRT=y +CONFIG_SET_DFU_ALT_INFO=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0xC0000000 CONFIG_FASTBOOT_BUF_SIZE=0x02000000(quoted diff) +0
-0b/configs/stm32mp15_trusted_defconfig index
c8b328d01a..d7d0b6c296100644 --- a/configs/stm32mp15_trusted_defconfig
+++ b/configs/stm32mp15_trusted_defconfigconfigs/stm32mp15_basic_defconfig +1
-0@@ -57,6 +57,7 @@ CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DFU_MTD=y CONFIG_DFU_VIRT=y +CONFIG_SET_DFU_ALT_INFO=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0xC0000000 CONFIG_FASTBOOT_BUF_SIZE=0x02000000drivers/dfu/Kconfig +5
-0@@ -81,5 +81,10 @@ config DFU_VIRT used at board level to manage specific behavior (OTP update for example). +config SET_DFU_ALT_INFO + bool "Dynamic set of DFU alternate information" + help + This option allows to call the function set_dfu_alt_info to + dynamically build dfu_alt_info in board. endif endmenuinclude/configs/odroid.h +0
-1@@ -64,7 +64,6 @@"" PARTS_BOOT " part 0 1;" \ ""PARTS_ROOT" part 0 2\0" \ -#define CONFIG_SET_DFU_ALT_INFO #define CONFIG_SET_DFU_ALT_BUF_LEN (SZ_1K)#define CONFIG_DFU_ALT_BOOT_EMMC \(quoted diff) +0
-0
b/include/configs/odroid_xu3.hindex47c30543f8..564319c231100644include/configs/odroid_xu3.h +0
-1@@ -76,7 +76,6 @@/* Enable: board/samsung/common/misc.c to use set_dfu_alt_info() */ #define CONFIG_MISC_COMMON -#define CONFIG_SET_DFU_ALT_INFO #define CONFIG_SET_DFU_ALT_BUF_LEN (SZ_1K)/* Set soc_rev, soc_id, board_rev, board_name, fdtfile */ include/configs/stm32mp1.h +0
-2@@ -90,8 +90,6 @@#define CONFIG_SYS_MTDPARTS_RUNTIME #endif -#define CONFIG_SET_DFU_ALT_INFO -#ifdef CONFIG_DM_VIDEO #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_BMP_16BPP (quoted diff) +0
-0
b/scripts/config_whitelist.txtindex405c62e9be..85d55b182e100644scripts/config_whitelist.txt CONFIG_SETUP_MEMORY_TAGS · line 1534
Quoted 7 lines
scripts/config_whitelist.txt +0
-1@@ -1529,7 +1529,6 @@ CONFIG_SETUP_MEMORY_TAGS CONFIG_SET_BIST CONFIG_SET_BOOTARGS CONFIG_SET_DFU_ALT_BUF_LEN -CONFIG_SET_DFU_ALT_INFO CONFIG_SFIO CONFIG_SF_DATAFLASH CONFIG_SGI_IP28Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de
PATCH 1/2 configs: migrate CONFIG_SET_DFU_ALT_INFO to defconfigs
In reply to Patrick DelaunayHi
Just a kind reminder to no forget this series which is on ML since a while.
Thanks
Patrice
Quoted 154 lines · Patrick Delaunay
Move
CONFIG_SET_DFU_ALT_INFOintoKconfigdone bymoveconfig.py.Signed-off-by Patrick Delaunay <[email protected]>---
configs/odroid-xu3_defconfig | 1 + configs/odroid_defconfig | 1 + configs/stm32mp15_basic_defconfig | 1 + configs/stm32mp15_dhcom_basic_defconfig | 1 + configs/stm32mp15_optee_defconfig | 1 + configs/stm32mp15_trusted_defconfig | 1 + drivers/dfu/Kconfig | 5 +++++ include/configs/odroid.h | 1 - include/configs/odroid_xu3.h | 1 - include/configs/stm32mp1.h | 2 -- scripts/config_whitelist.txt | 1 - 11 files changed, 11 insertions(+), 5 deletions(-)configs/odroid-xu3_defconfig +1
-0@@ -39,6 +39,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_ADC=y CONFIG_ADC_EXYNOS=y CONFIG_DFU_MMC=y +CONFIG_SET_DFU_ALT_INFO=y CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_MMC_DW=y CONFIG_MTD=yconfigs/odroid_defconfig +1
-0@@ -40,6 +40,7 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos4412-odroid" CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DFU_MMC=y +CONFIG_SET_DFU_ALT_INFO=y CONFIG_SYS_I2C_S3C24X0=y CONFIG_MMC_DW=y CONFIG_MMC_SDHCI=yconfigs/stm32mp15_basic_defconfig +1
-0@@ -71,6 +71,7 @@ CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DFU_MTD=y CONFIG_DFU_VIRT=y +CONFIG_SET_DFU_ALT_INFO=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0xC0000000 CONFIG_FASTBOOT_BUF_SIZE=0x02000000configs/stm32mp15_dhcom_basic_defconfig +1
-0@@ -70,6 +70,7 @@ CONFIG_SPL_BLOCK_CACHE=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DFU_VIRT=y +CONFIG_SET_DFU_ALT_INFO=y CONFIG_DM_HWSPINLOCK=y CONFIG_HWSPINLOCK_STM32=y CONFIG_DM_I2C=yconfigs/stm32mp15_optee_defconfig +1
-0@@ -58,6 +58,7 @@ CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DFU_MTD=y CONFIG_DFU_VIRT=y +CONFIG_SET_DFU_ALT_INFO=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0xC0000000 CONFIG_FASTBOOT_BUF_SIZE=0x02000000configs/stm32mp15_trusted_defconfig +1
-0@@ -57,6 +57,7 @@ CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DFU_MTD=y CONFIG_DFU_VIRT=y +CONFIG_SET_DFU_ALT_INFO=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0xC0000000 CONFIG_FASTBOOT_BUF_SIZE=0x02000000drivers/dfu/Kconfig +5
-0@@ -81,5 +81,10 @@ config DFU_VIRT used at board level to manage specific behavior (OTP update for example). +config SET_DFU_ALT_INFO + bool "Dynamic set of DFU alternate information" + help + This option allows to call the function set_dfu_alt_info to + dynamically build dfu_alt_info in board. endif endmenuinclude/configs/odroid.h +0
-1@@ -64,7 +64,6 @@"" PARTS_BOOT " part 0 1;" \ ""PARTS_ROOT" part 0 2\0" \ -#define CONFIG_SET_DFU_ALT_INFO #define CONFIG_SET_DFU_ALT_BUF_LEN (SZ_1K)#define CONFIG_DFU_ALT_BOOT_EMMC \include/configs/odroid_xu3.h +0
-1@@ -76,7 +76,6 @@/* Enable: board/samsung/common/misc.c to use set_dfu_alt_info() */ #define CONFIG_MISC_COMMON -#define CONFIG_SET_DFU_ALT_INFO #define CONFIG_SET_DFU_ALT_BUF_LEN (SZ_1K)/* Set soc_rev, soc_id, board_rev, board_name, fdtfile */ include/configs/stm32mp1.h +0
-2@@ -90,8 +90,6 @@#define CONFIG_SYS_MTDPARTS_RUNTIME #endif -#define CONFIG_SET_DFU_ALT_INFO -#ifdef CONFIG_DM_VIDEO #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_BMP_16BPP scripts/config_whitelist.txt +0
-1@@ -1529,7 +1529,6 @@ CONFIG_SETUP_MEMORY_TAGS CONFIG_SET_BIST CONFIG_SET_BOOTARGS CONFIG_SET_DFU_ALT_BUF_LEN -CONFIG_SET_DFU_ALT_INFO CONFIG_SFIO CONFIG_SF_DATAFLASH CONFIG_SGI_IP28
PATCH 1/2 configs: migrate CONFIG_SET_DFU_ALT_INFO to defconfigs
In reply to Patrick DelaunayQuoted 5 lines · Patrick Delaunay
Move
CONFIG_SET_DFU_ALT_INFOintoKconfigdone bymoveconfig.py.Signed-off-by Patrick Delaunay <[email protected]>Acked-by Lukasz Majewski <[email protected]>Reviewed-by Jaehoon Chung <[email protected]>
Applied to u-boot/master, 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/20200508/6f68bd4a/attachment.sig>