Merge tag 'v2023.10-rc4' into next

[J-u-boot.git] / boot / Kconfig

diff --git a/boot/Kconfig b/boot/Kconfig
index 86c2787dc5361b4c6e8e17935ae84e2384bff3e1..0a98f1e22207fb635947e9377ef42a64c9433eef 100644 (file)
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -464,8 +464,11 @@ config BOOTMETH_GLOBAL
 
 config BOOTMETH_CROS
        bool "Bootdev support for Chromium OS"
-       depends on X86 || SANDBOX
-       default y
+       depends on X86 || ARM || SANDBOX
+       default y if !ARM
+       select EFI_PARTITION
+       select PARTITION_TYPE_GUID
+       select PARTITION_UUIDS
        help
          Enables support for booting Chromium OS using bootdevs. This uses the
          kernel A slot and obtains the kernel command line from the parameters
@@ -1007,7 +1010,7 @@ config BOOTSTAGE_STASH
 
 config BOOTSTAGE_STASH_ADDR
        hex "Address to stash boot timing information"
-       default 0
+       default 0x0
        help
          Provide an address which will not be overwritten by the OS when it
          starts, so that it can read this information when ready.