board: stm32mp1: remove bootdelay configuration for usb or serial boot
authorPatrick Delaunay <patrick.delaunay@st.com>
Wed, 22 Apr 2020 12:29:15 +0000 (14:29 +0200)
committerPatrick Delaunay <patrick.delaunay@st.com>
Thu, 14 May 2020 07:02:12 +0000 (09:02 +0200)
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@st.com>
board/st/stm32mp1/stm32mp1.c

index c64f20ab08670fbb09503ff9bb9050b67575cc89..6873165a0f82ff0c65e97cb6214e7841f889a756 100644 (file)
@@ -687,7 +687,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;
@@ -735,11 +734,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;
 }