diff mbox series

[1/2] configs: migrate CONFIG_SET_DFU_ALT_INFO to defconfigs

Message ID 20200226092842.5413-1-patrick.delaunay@st.com
State New
Headers show
Series [1/2] configs: migrate CONFIG_SET_DFU_ALT_INFO to defconfigs | expand

Commit Message

Patrick Delaunay Feb. 26, 2020, 9:28 a.m. UTC 
Move CONFIG_SET_DFU_ALT_INFO into Kconfig done by moveconfig.py.

Signed-off-by: Patrick Delaunay <patrick.delaunay at st.com>
---

 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(-)

Comments

Lukasz Majewski Feb. 26, 2020, 9:34 a.m. UTC | #1 
Hi Patrick,

> Move CONFIG_SET_DFU_ALT_INFO into Kconfig done by moveconfig.py.

Thank you for the conversion.

Acked-by: Lukasz Majewski <lukma at denx.de>

> 
> Signed-off-by: Patrick Delaunay <patrick.delaunay at st.com>
> ---
> 
>  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(-)
> 
> diff --git a/configs/odroid-xu3_defconfig
> b/configs/odroid-xu3_defconfig index 2e982e1b53..1a2183ce19 100644
> --- a/configs/odroid-xu3_defconfig
> +++ b/configs/odroid-xu3_defconfig
> @@ -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
> diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig
> index e4392e477e..345cc3b940 100644
> --- a/configs/odroid_defconfig
> +++ b/configs/odroid_defconfig
> @@ -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
> diff --git a/configs/stm32mp15_basic_defconfig
> b/configs/stm32mp15_basic_defconfig index f691306800..4efb1bf9c2
> 100644 --- a/configs/stm32mp15_basic_defconfig
> +++ b/configs/stm32mp15_basic_defconfig
> @@ -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
> diff --git a/configs/stm32mp15_dhcom_basic_defconfig
> b/configs/stm32mp15_dhcom_basic_defconfig index
> 921dea242a..9b5e54748d 100644 ---
> a/configs/stm32mp15_dhcom_basic_defconfig +++
> b/configs/stm32mp15_dhcom_basic_defconfig @@ -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
> diff --git a/configs/stm32mp15_optee_defconfig
> b/configs/stm32mp15_optee_defconfig index 521b24e2cb..54135b28aa
> 100644 --- a/configs/stm32mp15_optee_defconfig
> +++ b/configs/stm32mp15_optee_defconfig
> @@ -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
> diff --git a/configs/stm32mp15_trusted_defconfig
> b/configs/stm32mp15_trusted_defconfig index c8b328d01a..d7d0b6c296
> 100644 --- a/configs/stm32mp15_trusted_defconfig
> +++ b/configs/stm32mp15_trusted_defconfig
> @@ -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
> diff --git a/drivers/dfu/Kconfig b/drivers/dfu/Kconfig
> index 174fb588a6..5d45d7d7c2 100644
> --- a/drivers/dfu/Kconfig
> +++ b/drivers/dfu/Kconfig
> @@ -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
> diff --git a/include/configs/odroid.h b/include/configs/odroid.h
> index a7e2a3d9a2..4044365328 100644
> --- a/include/configs/odroid.h
> +++ b/include/configs/odroid.h
> @@ -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 \
> diff --git a/include/configs/odroid_xu3.h
> b/include/configs/odroid_xu3.h index 47c30543f8..564319c231 100644
> --- a/include/configs/odroid_xu3.h
> +++ b/include/configs/odroid_xu3.h
> @@ -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 */
> diff --git a/include/configs/stm32mp1.h b/include/configs/stm32mp1.h
> index 42717c167e..592638072a 100644
> --- a/include/configs/stm32mp1.h
> +++ b/include/configs/stm32mp1.h
> @@ -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
> diff --git a/scripts/config_whitelist.txt
> b/scripts/config_whitelist.txt index 405c62e9be..85d55b182e 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -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>
Jaehoon Chung Feb. 26, 2020, 11:02 a.m. UTC | #2 
On 2/26/20 6:34 PM, Lukasz Majewski wrote:
> Hi Patrick,
> 
>> Move CONFIG_SET_DFU_ALT_INFO into Kconfig done by moveconfig.py.
> 
> Thank you for the conversion.
> 
> Acked-by: Lukasz Majewski <lukma at denx.de>

Reviewed-by: Jaehoon Chung <jh80.chung at samsung.com>

> 
>>
>> Signed-off-by: Patrick Delaunay <patrick.delaunay at st.com>
>> ---
>>
>>  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(-)
>>
>> diff --git a/configs/odroid-xu3_defconfig
>> b/configs/odroid-xu3_defconfig index 2e982e1b53..1a2183ce19 100644
>> --- a/configs/odroid-xu3_defconfig
>> +++ b/configs/odroid-xu3_defconfig
>> @@ -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
>> diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig
>> index e4392e477e..345cc3b940 100644
>> --- a/configs/odroid_defconfig
>> +++ b/configs/odroid_defconfig
>> @@ -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
>> diff --git a/configs/stm32mp15_basic_defconfig
>> b/configs/stm32mp15_basic_defconfig index f691306800..4efb1bf9c2
>> 100644 --- a/configs/stm32mp15_basic_defconfig
>> +++ b/configs/stm32mp15_basic_defconfig
>> @@ -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
>> diff --git a/configs/stm32mp15_dhcom_basic_defconfig
>> b/configs/stm32mp15_dhcom_basic_defconfig index
>> 921dea242a..9b5e54748d 100644 ---
>> a/configs/stm32mp15_dhcom_basic_defconfig +++
>> b/configs/stm32mp15_dhcom_basic_defconfig @@ -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
>> diff --git a/configs/stm32mp15_optee_defconfig
>> b/configs/stm32mp15_optee_defconfig index 521b24e2cb..54135b28aa
>> 100644 --- a/configs/stm32mp15_optee_defconfig
>> +++ b/configs/stm32mp15_optee_defconfig
>> @@ -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
>> diff --git a/configs/stm32mp15_trusted_defconfig
>> b/configs/stm32mp15_trusted_defconfig index c8b328d01a..d7d0b6c296
>> 100644 --- a/configs/stm32mp15_trusted_defconfig
>> +++ b/configs/stm32mp15_trusted_defconfig
>> @@ -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
>> diff --git a/drivers/dfu/Kconfig b/drivers/dfu/Kconfig
>> index 174fb588a6..5d45d7d7c2 100644
>> --- a/drivers/dfu/Kconfig
>> +++ b/drivers/dfu/Kconfig
>> @@ -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
>> diff --git a/include/configs/odroid.h b/include/configs/odroid.h
>> index a7e2a3d9a2..4044365328 100644
>> --- a/include/configs/odroid.h
>> +++ b/include/configs/odroid.h
>> @@ -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 \
>> diff --git a/include/configs/odroid_xu3.h
>> b/include/configs/odroid_xu3.h index 47c30543f8..564319c231 100644
>> --- a/include/configs/odroid_xu3.h
>> +++ b/include/configs/odroid_xu3.h
>> @@ -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 */
>> diff --git a/include/configs/stm32mp1.h b/include/configs/stm32mp1.h
>> index 42717c167e..592638072a 100644
>> --- a/include/configs/stm32mp1.h
>> +++ b/include/configs/stm32mp1.h
>> @@ -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
>> diff --git a/scripts/config_whitelist.txt
>> b/scripts/config_whitelist.txt index 405c62e9be..85d55b182e 100644
>> --- a/scripts/config_whitelist.txt
>> +++ b/scripts/config_whitelist.txt
>> @@ -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
>
Patrice CHOTARD April 27, 2020, 8:46 a.m. UTC | #3 
Hi

Just a kind reminder to no forget this series which is on ML since a while.

Thanks

Patrice

On 2/26/20 10:28 AM, Patrick Delaunay wrote:
> Move CONFIG_SET_DFU_ALT_INFO into Kconfig done by moveconfig.py.
>
> Signed-off-by: Patrick Delaunay <patrick.delaunay at st.com>
> ---
>
>  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(-)
>
> diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig
> index 2e982e1b53..1a2183ce19 100644
> --- a/configs/odroid-xu3_defconfig
> +++ b/configs/odroid-xu3_defconfig
> @@ -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
> diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig
> index e4392e477e..345cc3b940 100644
> --- a/configs/odroid_defconfig
> +++ b/configs/odroid_defconfig
> @@ -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
> diff --git a/configs/stm32mp15_basic_defconfig b/configs/stm32mp15_basic_defconfig
> index f691306800..4efb1bf9c2 100644
> --- a/configs/stm32mp15_basic_defconfig
> +++ b/configs/stm32mp15_basic_defconfig
> @@ -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
> diff --git a/configs/stm32mp15_dhcom_basic_defconfig b/configs/stm32mp15_dhcom_basic_defconfig
> index 921dea242a..9b5e54748d 100644
> --- a/configs/stm32mp15_dhcom_basic_defconfig
> +++ b/configs/stm32mp15_dhcom_basic_defconfig
> @@ -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
> diff --git a/configs/stm32mp15_optee_defconfig b/configs/stm32mp15_optee_defconfig
> index 521b24e2cb..54135b28aa 100644
> --- a/configs/stm32mp15_optee_defconfig
> +++ b/configs/stm32mp15_optee_defconfig
> @@ -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
> diff --git a/configs/stm32mp15_trusted_defconfig b/configs/stm32mp15_trusted_defconfig
> index c8b328d01a..d7d0b6c296 100644
> --- a/configs/stm32mp15_trusted_defconfig
> +++ b/configs/stm32mp15_trusted_defconfig
> @@ -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
> diff --git a/drivers/dfu/Kconfig b/drivers/dfu/Kconfig
> index 174fb588a6..5d45d7d7c2 100644
> --- a/drivers/dfu/Kconfig
> +++ b/drivers/dfu/Kconfig
> @@ -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
> diff --git a/include/configs/odroid.h b/include/configs/odroid.h
> index a7e2a3d9a2..4044365328 100644
> --- a/include/configs/odroid.h
> +++ b/include/configs/odroid.h
> @@ -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 \
> diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
> index 47c30543f8..564319c231 100644
> --- a/include/configs/odroid_xu3.h
> +++ b/include/configs/odroid_xu3.h
> @@ -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 */
> diff --git a/include/configs/stm32mp1.h b/include/configs/stm32mp1.h
> index 42717c167e..592638072a 100644
> --- a/include/configs/stm32mp1.h
> +++ b/include/configs/stm32mp1.h
> @@ -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
> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
> index 405c62e9be..85d55b182e 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -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
Tom Rini May 8, 2020, 5:49 p.m. UTC | #4 
On Wed, Feb 26, 2020 at 10:28:41AM +0100, Patrick Delaunay wrote:

> Move CONFIG_SET_DFU_ALT_INFO into Kconfig done by moveconfig.py.
> 
> Signed-off-by: Patrick Delaunay <patrick.delaunay at st.com>
> Acked-by: Lukasz Majewski <lukma at denx.de>
> Reviewed-by: Jaehoon Chung <jh80.chung at samsung.com>

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig
index 2e982e1b53..1a2183ce19 100644
--- a/configs/odroid-xu3_defconfig
+++ b/configs/odroid-xu3_defconfig
@@ -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
diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig
index e4392e477e..345cc3b940 100644
--- a/configs/odroid_defconfig
+++ b/configs/odroid_defconfig
@@ -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
diff --git a/configs/stm32mp15_basic_defconfig b/configs/stm32mp15_basic_defconfig
index f691306800..4efb1bf9c2 100644
--- a/configs/stm32mp15_basic_defconfig
+++ b/configs/stm32mp15_basic_defconfig
@@ -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
diff --git a/configs/stm32mp15_dhcom_basic_defconfig b/configs/stm32mp15_dhcom_basic_defconfig
index 921dea242a..9b5e54748d 100644
--- a/configs/stm32mp15_dhcom_basic_defconfig
+++ b/configs/stm32mp15_dhcom_basic_defconfig
@@ -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
diff --git a/configs/stm32mp15_optee_defconfig b/configs/stm32mp15_optee_defconfig
index 521b24e2cb..54135b28aa 100644
--- a/configs/stm32mp15_optee_defconfig
+++ b/configs/stm32mp15_optee_defconfig
@@ -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
diff --git a/configs/stm32mp15_trusted_defconfig b/configs/stm32mp15_trusted_defconfig
index c8b328d01a..d7d0b6c296 100644
--- a/configs/stm32mp15_trusted_defconfig
+++ b/configs/stm32mp15_trusted_defconfig
@@ -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
diff --git a/drivers/dfu/Kconfig b/drivers/dfu/Kconfig
index 174fb588a6..5d45d7d7c2 100644
--- a/drivers/dfu/Kconfig
+++ b/drivers/dfu/Kconfig
@@ -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
diff --git a/include/configs/odroid.h b/include/configs/odroid.h
index a7e2a3d9a2..4044365328 100644
--- a/include/configs/odroid.h
+++ b/include/configs/odroid.h
@@ -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 \
diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
index 47c30543f8..564319c231 100644
--- a/include/configs/odroid_xu3.h
+++ b/include/configs/odroid_xu3.h
@@ -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 */
diff --git a/include/configs/stm32mp1.h b/include/configs/stm32mp1.h
index 42717c167e..592638072a 100644
--- a/include/configs/stm32mp1.h
+++ b/include/configs/stm32mp1.h
@@ -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
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 405c62e9be..85d55b182e 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -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