u-boot: gru: Enable more bootstd features

U-Boot upstream is switching to a new code framework for discovering and
booting OSes ("Standard Boot", or "bootstd"). Enable more features for
it, including commands we can use for introspection and debugging.

Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>

2 files changed, 16 insertions, 12 deletions

diff --git a/config/u-boot/gru_bob/config/default b/config/u-boot/gru_bob/config/default
index ca9b3de8..6e9e997c 100644
--- a/config/u-boot/gru_bob/config/default
+++ b/config/u-boot/gru_bob/config/default
@@ -380,7 +380,7 @@ CONFIG_PXE_UTILS=y
 CONFIG_BOOT_DEFAULTS=y
 CONFIG_BOOTSTD=y
 # CONFIG_SPL_BOOTSTD is not set
-# CONFIG_BOOTSTD_FULL is not set
+CONFIG_BOOTSTD_FULL=y
 CONFIG_BOOTSTD_DEFAULTS=y
 CONFIG_BOOTSTD_BOOTCOMMAND=y
 CONFIG_BOOTMETH_GLOBAL=y
@@ -437,6 +437,7 @@ CONFIG_AUTOBOOT=y
 CONFIG_BOOTDELAY=2
 # CONFIG_AUTOBOOT_KEYED is not set
 # CONFIG_AUTOBOOT_USE_MENUKEY is not set
+# CONFIG_AUTOBOOT_MENU_SHOW is not set
 # CONFIG_BOOT_RETRY is not set
 
 #
@@ -446,7 +447,7 @@ CONFIG_BOOTDELAY=2
 # CONFIG_USE_BOOTARGS is not set
 # CONFIG_BOOTARGS_SUBST is not set
 CONFIG_USE_BOOTCOMMAND=y
-CONFIG_BOOTCOMMAND="bootflow scan"
+CONFIG_BOOTCOMMAND="bootflow scan -lb"
 # CONFIG_USE_PREBOOT is not set
 CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-gru-bob.dtb"
 # CONFIG_SAVE_PREV_BL_FDT_ADDR is not set
@@ -677,9 +678,10 @@ CONFIG_CMD_CONSOLE=y
 #
 CONFIG_CMD_BOOTD=y
 CONFIG_CMD_BOOTM=y
-# CONFIG_CMD_BOOTDEV is not set
+CONFIG_CMD_BOOTDEV=y
 CONFIG_CMD_BOOTFLOW=y
-# CONFIG_CMD_BOOTMETH is not set
+CONFIG_CMD_BOOTFLOW_FULL=y
+CONFIG_CMD_BOOTMETH=y
 CONFIG_BOOTM_EFI=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_BOOTI=y
@@ -689,14 +691,14 @@ CONFIG_BOOTM_NETBSD=y
 # CONFIG_BOOTM_OSE is not set
 CONFIG_BOOTM_PLAN9=y
 CONFIG_BOOTM_RTEMS=y
-# CONFIG_CMD_VBE is not set
+CONFIG_CMD_VBE=y
 CONFIG_BOOTM_VXWORKS=y
 CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_BOOTEFI=y
 CONFIG_CMD_BOOTEFI_HELLO_COMPILE=y
 # CONFIG_CMD_BOOTEFI_HELLO is not set
 # CONFIG_CMD_BOOTEFI_SELFTEST is not set
-# CONFIG_CMD_BOOTMENU is not set
+CONFIG_CMD_BOOTMENU=y
 # CONFIG_CMD_ADTIMG is not set
 CONFIG_CMD_ELF=y
 CONFIG_CMD_FDT=y
diff --git a/config/u-boot/gru_kevin/config/default b/config/u-boot/gru_kevin/config/default
index a99adf63..0aa084e8 100644
--- a/config/u-boot/gru_kevin/config/default
+++ b/config/u-boot/gru_kevin/config/default
@@ -380,7 +380,7 @@ CONFIG_PXE_UTILS=y
 CONFIG_BOOT_DEFAULTS=y
 CONFIG_BOOTSTD=y
 # CONFIG_SPL_BOOTSTD is not set
-# CONFIG_BOOTSTD_FULL is not set
+CONFIG_BOOTSTD_FULL=y
 CONFIG_BOOTSTD_DEFAULTS=y
 CONFIG_BOOTSTD_BOOTCOMMAND=y
 CONFIG_BOOTMETH_GLOBAL=y
@@ -437,6 +437,7 @@ CONFIG_AUTOBOOT=y
 CONFIG_BOOTDELAY=2
 # CONFIG_AUTOBOOT_KEYED is not set
 # CONFIG_AUTOBOOT_USE_MENUKEY is not set
+# CONFIG_AUTOBOOT_MENU_SHOW is not set
 # CONFIG_BOOT_RETRY is not set
 
 #
@@ -446,7 +447,7 @@ CONFIG_BOOTDELAY=2
 # CONFIG_USE_BOOTARGS is not set
 # CONFIG_BOOTARGS_SUBST is not set
 CONFIG_USE_BOOTCOMMAND=y
-CONFIG_BOOTCOMMAND="bootflow scan"
+CONFIG_BOOTCOMMAND="bootflow scan -lb"
 # CONFIG_USE_PREBOOT is not set
 CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-gru-kevin.dtb"
 # CONFIG_SAVE_PREV_BL_FDT_ADDR is not set
@@ -677,9 +678,10 @@ CONFIG_CMD_CONSOLE=y
 #
 CONFIG_CMD_BOOTD=y
 CONFIG_CMD_BOOTM=y
-# CONFIG_CMD_BOOTDEV is not set
+CONFIG_CMD_BOOTDEV=y
 CONFIG_CMD_BOOTFLOW=y
-# CONFIG_CMD_BOOTMETH is not set
+CONFIG_CMD_BOOTFLOW_FULL=y
+CONFIG_CMD_BOOTMETH=y
 CONFIG_BOOTM_EFI=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_BOOTI=y
@@ -689,14 +691,14 @@ CONFIG_BOOTM_NETBSD=y
 # CONFIG_BOOTM_OSE is not set
 CONFIG_BOOTM_PLAN9=y
 CONFIG_BOOTM_RTEMS=y
-# CONFIG_CMD_VBE is not set
+CONFIG_CMD_VBE=y
 CONFIG_BOOTM_VXWORKS=y
 CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_BOOTEFI=y
 CONFIG_CMD_BOOTEFI_HELLO_COMPILE=y
 # CONFIG_CMD_BOOTEFI_HELLO is not set
 # CONFIG_CMD_BOOTEFI_SELFTEST is not set
-# CONFIG_CMD_BOOTMENU is not set
+CONFIG_CMD_BOOTMENU=y
 # CONFIG_CMD_ADTIMG is not set
 CONFIG_CMD_ELF=y
 CONFIG_CMD_FDT=y