diff mbox series

[v2,07/12] board: stm32mp1: remove bootdelay configuration for usb or serial boot

Message ID 20200422142834.v2.7.Ic051e25812481db408f2431c7962da1db1f198fb@changeid
State Accepted
Commit 3cab9aae456d918b2e3e9b672f27590de829dea6
Headers show
Series stm32mp1: several board and arch updates | expand

Commit Message

Patrick Delaunay April 22, 2020, 12:29 p.m. UTC
It is not allowed to change the user setting of bootdelay, so
remove the check of the boot-source to disable it dynamically
in board_late_init()


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

Changes in v2:
- remove bootdelay configuration after Wolfgang's comment on dropped patch
  [11/16] board: stm32mp1: check env_get result in board_late_init

 board/st/stm32mp1/stm32mp1.c | 6 ------
 1 file changed, 6 deletions(-)

Comments

Patrice CHOTARD May 11, 2020, 1:58 p.m. UTC | #1
On 4/22/20 2:29 PM, Patrick Delaunay wrote:
> It is not allowed to change the user setting of bootdelay, so
> remove the check of the boot-source to disable it dynamically
> in board_late_init()
>
>
> Signed-off-by: Patrick Delaunay <patrick.delaunay at st.com>
> ---
>
> Changes in v2:
> - remove bootdelay configuration after Wolfgang's comment on dropped patch
>   [11/16] board: stm32mp1: check env_get result in board_late_init
>
>  board/st/stm32mp1/stm32mp1.c | 6 ------
>  1 file changed, 6 deletions(-)
>
> diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c
> index 280c5b7ae4..687d605e29 100644
> --- a/board/st/stm32mp1/stm32mp1.c
> +++ b/board/st/stm32mp1/stm32mp1.c
> @@ -692,7 +692,6 @@ int board_init(void)
>  
>  int board_late_init(void)
>  {
> -	char *boot_device;
>  #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
>  	const void *fdt_compat;
>  	int fdt_compat_len;
> @@ -740,11 +739,6 @@ int board_late_init(void)
>  	board_check_usb_power();
>  #endif /* CONFIG_ADC */
>  
> -	/* Check the boot-source to disable bootdelay */
> -	boot_device = env_get("boot_device");
> -	if (!strcmp(boot_device, "serial") || !strcmp(boot_device, "usb"))
> -		env_set("bootdelay", "0");
> -
>  	return 0;
>  }
>  
>
> Reviewed-by: Patrice Chotard <patrice.chotard at st.com>
>
> Thanks
>
> Patrice
>
diff mbox series

Patch

diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c
index 280c5b7ae4..687d605e29 100644
--- a/board/st/stm32mp1/stm32mp1.c
+++ b/board/st/stm32mp1/stm32mp1.c
@@ -692,7 +692,6 @@  int board_init(void)
 
 int board_late_init(void)
 {
-	char *boot_device;
 #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 	const void *fdt_compat;
 	int fdt_compat_len;
@@ -740,11 +739,6 @@  int board_late_init(void)
 	board_check_usb_power();
 #endif /* CONFIG_ADC */
 
-	/* Check the boot-source to disable bootdelay */
-	boot_device = env_get("boot_device");
-	if (!strcmp(boot_device, "serial") || !strcmp(boot_device, "usb"))
-		env_set("bootdelay", "0");
-
 	return 0;
 }