fix CONFIG_BOOTDELAY 0 to -2

takumin · May 6, 2022 · 98d1197 · 98d1197
1 parent 53a4d52
commit 98d1197
Show file tree

Hide file tree

Showing 17 changed files with 18 additions and 18 deletions.
diff --git a/configs/bcm2708_rpi_b_defconfig b/configs/bcm2708_rpi_b_defconfig
@@ -47,7 +47,7 @@ CONFIG_OF_LIBFDT_OVERLAY=y
 CONFIG_EFI_LOADER=y
 CONFIG_DEFAULT_FDT_FILE="bcm2708-rpi-b.dtb"
 CONFIG_BOOTCOMMAND="run bootcmd_dhcp"
-CONFIG_BOOTDELAY=0
+CONFIG_BOOTDELAY=-2
 CONFIG_CMD_BOOTEFI=y
 CONFIG_BLK=y
 CONFIG_PARTITIONS=y
diff --git a/configs/bcm2708_rpi_b_plus_defconfig b/configs/bcm2708_rpi_b_plus_defconfig
@@ -47,7 +47,7 @@ CONFIG_OF_LIBFDT_OVERLAY=y
 CONFIG_EFI_LOADER=y
 CONFIG_DEFAULT_FDT_FILE="bcm2708-rpi-b-plus.dtb"
 CONFIG_BOOTCOMMAND="run bootcmd_dhcp"
-CONFIG_BOOTDELAY=0
+CONFIG_BOOTDELAY=-2
 CONFIG_CMD_BOOTEFI=y
 CONFIG_BLK=y
 CONFIG_PARTITIONS=y
diff --git a/configs/bcm2708_rpi_b_rev1_defconfig b/configs/bcm2708_rpi_b_rev1_defconfig
@@ -47,7 +47,7 @@ CONFIG_OF_LIBFDT_OVERLAY=y
 CONFIG_EFI_LOADER=y
 CONFIG_DEFAULT_FDT_FILE="bcm2708-rpi-b-rev1.dtb"
 CONFIG_BOOTCOMMAND="run bootcmd_dhcp"
-CONFIG_BOOTDELAY=0
+CONFIG_BOOTDELAY=-2
 CONFIG_CMD_BOOTEFI=y
 CONFIG_BLK=y
 CONFIG_PARTITIONS=y
diff --git a/configs/bcm2708_rpi_cm_defconfig b/configs/bcm2708_rpi_cm_defconfig
@@ -47,7 +47,7 @@ CONFIG_OF_LIBFDT_OVERLAY=y
 CONFIG_EFI_LOADER=y
 CONFIG_DEFAULT_FDT_FILE="bcm2708-rpi-cm.dtb"
 CONFIG_BOOTCOMMAND="run bootcmd_dhcp"
-CONFIG_BOOTDELAY=0
+CONFIG_BOOTDELAY=-2
 CONFIG_CMD_BOOTEFI=y
 CONFIG_BLK=y
 CONFIG_PARTITIONS=y
diff --git a/configs/bcm2708_rpi_zero_defconfig b/configs/bcm2708_rpi_zero_defconfig
@@ -47,7 +47,7 @@ CONFIG_OF_LIBFDT_OVERLAY=y
 CONFIG_EFI_LOADER=y
 CONFIG_DEFAULT_FDT_FILE="bcm2708-rpi-zero.dtb"
 CONFIG_BOOTCOMMAND="run bootcmd_dhcp"
-CONFIG_BOOTDELAY=0
+CONFIG_BOOTDELAY=-2
 CONFIG_CMD_BOOTEFI=y
 CONFIG_BLK=y
 CONFIG_PARTITIONS=y
diff --git a/configs/bcm2708_rpi_zero_w_defconfig b/configs/bcm2708_rpi_zero_w_defconfig
@@ -47,7 +47,7 @@ CONFIG_OF_LIBFDT_OVERLAY=y
 CONFIG_EFI_LOADER=y
 CONFIG_DEFAULT_FDT_FILE="bcm2708-rpi-zero-w.dtb"
 CONFIG_BOOTCOMMAND="run bootcmd_dhcp"
-CONFIG_BOOTDELAY=0
+CONFIG_BOOTDELAY=-2
 CONFIG_CMD_BOOTEFI=y
 CONFIG_BLK=y
 CONFIG_PARTITIONS=y
diff --git a/configs/bcm2709_rpi_2_b_defconfig b/configs/bcm2709_rpi_2_b_defconfig
@@ -47,7 +47,7 @@ CONFIG_PHYS_TO_BUS=y
 CONFIG_OF_LIBFDT_OVERLAY=y
 CONFIG_DEFAULT_FDT_FILE="bcm2709-rpi-2-b.dtb"
 CONFIG_BOOTCOMMAND="run bootcmd_dhcp"
-CONFIG_BOOTDELAY=0
+CONFIG_BOOTDELAY=-2
 CONFIG_CMD_BOOTEFI=y
 CONFIG_EFI_LOADER=y
 CONFIG_BLK=y

diff --git a/configs/bcm2710_rpi_2_b_defconfig b/configs/bcm2710_rpi_2_b_defconfig
@@ -47,7 +47,7 @@ CONFIG_PHYS_TO_BUS=y
 CONFIG_OF_LIBFDT_OVERLAY=y
 CONFIG_DEFAULT_FDT_FILE="bcm2710-rpi-2-b.dtb"
 CONFIG_BOOTCOMMAND="run bootcmd_dhcp"
-CONFIG_BOOTDELAY=0
+CONFIG_BOOTDELAY=-2
 CONFIG_CMD_BOOTEFI=y
 CONFIG_EFI_LOADER=y
 CONFIG_BLK=y

diff --git a/configs/bcm2710_rpi_3_b_defconfig b/configs/bcm2710_rpi_3_b_defconfig
@@ -49,7 +49,7 @@ CONFIG_PHYS_TO_BUS=y
 CONFIG_OF_LIBFDT_OVERLAY=y
 CONFIG_DEFAULT_FDT_FILE="bcm2710-rpi-3-b.dtb"
 CONFIG_BOOTCOMMAND="run bootcmd_dhcp"
-CONFIG_BOOTDELAY=0
+CONFIG_BOOTDELAY=-2
 CONFIG_CMD_BOOTEFI=y
 CONFIG_EFI_LOADER=y
 CONFIG_BLK=y

diff --git a/configs/bcm2710_rpi_3_b_plus_defconfig b/configs/bcm2710_rpi_3_b_plus_defconfig
@@ -49,7 +49,7 @@ CONFIG_PHYS_TO_BUS=y
 CONFIG_OF_LIBFDT_OVERLAY=y
 CONFIG_DEFAULT_FDT_FILE="bcm2710-rpi-3-b-plus.dtb"
 CONFIG_BOOTCOMMAND="run bootcmd_dhcp"
-CONFIG_BOOTDELAY=0
+CONFIG_BOOTDELAY=-2
 CONFIG_CMD_BOOTEFI=y
 CONFIG_EFI_LOADER=y
 CONFIG_BLK=y

diff --git a/configs/bcm2710_rpi_cm3_defconfig b/configs/bcm2710_rpi_cm3_defconfig
@@ -49,7 +49,7 @@ CONFIG_PHYS_TO_BUS=y
 CONFIG_OF_LIBFDT_OVERLAY=y
 CONFIG_DEFAULT_FDT_FILE="bcm2710-rpi-cm3.dtb"
 CONFIG_BOOTCOMMAND="run bootcmd_dhcp"
-CONFIG_BOOTDELAY=0
+CONFIG_BOOTDELAY=-2
 CONFIG_CMD_BOOTEFI=y
 CONFIG_EFI_LOADER=y
 CONFIG_BLK=y

diff --git a/configs/bcm2710_rpi_zero_2_defconfig b/configs/bcm2710_rpi_zero_2_defconfig
@@ -49,7 +49,7 @@ CONFIG_PHYS_TO_BUS=y
 CONFIG_OF_LIBFDT_OVERLAY=y
 CONFIG_DEFAULT_FDT_FILE="bcm2710-rpi-zero-2.dtb"
 CONFIG_BOOTCOMMAND="run bootcmd_dhcp"
-CONFIG_BOOTDELAY=0
+CONFIG_BOOTDELAY=-2
 CONFIG_CMD_BOOTEFI=y
 CONFIG_EFI_LOADER=y
 CONFIG_BLK=y

diff --git a/configs/bcm2710_rpi_zero_2_w_defconfig b/configs/bcm2710_rpi_zero_2_w_defconfig
@@ -49,7 +49,7 @@ CONFIG_PHYS_TO_BUS=y
 CONFIG_OF_LIBFDT_OVERLAY=y
 CONFIG_DEFAULT_FDT_FILE="bcm2710-rpi-zero-2-w.dtb"
 CONFIG_BOOTCOMMAND="run bootcmd_dhcp"
-CONFIG_BOOTDELAY=0
+CONFIG_BOOTDELAY=-2
 CONFIG_CMD_BOOTEFI=y
 CONFIG_EFI_LOADER=y
 CONFIG_BLK=y

diff --git a/configs/bcm2711_rpi_400_defconfig b/configs/bcm2711_rpi_400_defconfig
@@ -64,7 +64,7 @@ CONFIG_PHYS_TO_BUS=y
 CONFIG_OF_LIBFDT_OVERLAY=y
 CONFIG_DEFAULT_FDT_FILE="bcm2711-rpi-400.dtb"
 CONFIG_BOOTCOMMAND="run bootcmd_dhcp"
-CONFIG_BOOTDELAY=0
+CONFIG_BOOTDELAY=-2
 CONFIG_CMD_BOOTEFI=y
 CONFIG_EFI_LOADER=y
 CONFIG_BLK=y

diff --git a/configs/bcm2711_rpi_4_b_defconfig b/configs/bcm2711_rpi_4_b_defconfig
@@ -64,7 +64,7 @@ CONFIG_PHYS_TO_BUS=y
 CONFIG_OF_LIBFDT_OVERLAY=y
 CONFIG_DEFAULT_FDT_FILE="bcm2711-rpi-4-b.dtb"
 CONFIG_BOOTCOMMAND="run bootcmd_dhcp"
-CONFIG_BOOTDELAY=0
+CONFIG_BOOTDELAY=-2
 CONFIG_CMD_BOOTEFI=y
 CONFIG_EFI_LOADER=y
 CONFIG_BLK=y

diff --git a/configs/bcm2711_rpi_cm4_defconfig b/configs/bcm2711_rpi_cm4_defconfig
@@ -64,7 +64,7 @@ CONFIG_PHYS_TO_BUS=y
 CONFIG_OF_LIBFDT_OVERLAY=y
 CONFIG_DEFAULT_FDT_FILE="bcm2711-rpi-cm4.dtb"
 CONFIG_BOOTCOMMAND="run bootcmd_dhcp"
-CONFIG_BOOTDELAY=0
+CONFIG_BOOTDELAY=-2
 CONFIG_CMD_BOOTEFI=y
 CONFIG_EFI_LOADER=y
 CONFIG_BLK=y

diff --git a/scripts/generate-defconfig.sh b/scripts/generate-defconfig.sh
@@ -49,9 +49,9 @@ for defconfig in "${CONFIG_DIR}"/*; do
   fi
 
   if grep -Eqs "CONFIG_BOOTDELAY=.*" "${defconfig}"; then
-    sed -i -E 's/CONFIG_BOOTDELAY=.*/CONFIG_BOOTDELAY=0/' "${defconfig}"
+    sed -i -E 's/CONFIG_BOOTDELAY=.*/CONFIG_BOOTDELAY=-2/' "${defconfig}"
   else
-    echo 'CONFIG_BOOTDELAY=0' >> "${defconfig}"
+    echo 'CONFIG_BOOTDELAY=-2' >> "${defconfig}"
   fi
 
   if grep -Eqs "CONFIG_CMD_BOOTEFI=.*" "${defconfig}"; then