diff options
author | Alistair Strachan <astrachan@google.com> | 2018-08-22 09:22:05 -0700 |
---|---|---|
committer | Alistair Strachan <astrachan@google.com> | 2018-08-22 09:22:05 -0700 |
commit | 4b3d24a14532e03938f14526c7ec658a19da2a8b (patch) | |
tree | 9413c38873144d39d4886ef345f7bdb159da3498 /cmd/Kconfig | |
parent | 1739fd2be9612906597fb46009be51f3e3894bf0 (diff) | |
parent | e1ecafeac7d8273a25c7ef98f963648c5099cbd8 (diff) | |
download | u-boot-4b3d24a14532e03938f14526c7ec658a19da2a8b.tar.gz |
Merge branch 'master-aosp'
Change-Id: I245a6ebd825abaf8fc6b952e00383a7dc66d2917
Diffstat (limited to 'cmd/Kconfig')
-rw-r--r-- | cmd/Kconfig | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/cmd/Kconfig b/cmd/Kconfig index 0912fb9933..3c62f0a01d 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -607,6 +607,27 @@ config CMD_ADC Shows ADC device info and permit printing one-shot analog converted data from a named Analog to Digital Converter. +config CMD_ANDROID_AB_SELECT + bool "android_ab_select" + default n + depends on ANDROID_AB + help + On Android devices with more than one boot slot (multiple copies of + the kernel and system images) this provides a command to select which + slot should be used to boot from and register the boot attempt. This + is used by the new A/B update model where one slot is updated in the + background while running from the other slot. + +config CMD_BOOT_ANDROID + bool "boot_android" + default n + depends on ANDROID_BOOTLOADER + help + Performs the Android Bootloader boot flow, loading the appropriate + Android image (normal kernel, recovery kernel or "bootloader" mode) + and booting it. The boot mode is determined by the contents of the + Android Bootloader Message. + config CMD_CLK bool "clk - Show clock frequencies" help @@ -829,34 +850,13 @@ config CMD_LOADS Load an S-Record file over serial line config CMD_LOAD_ANDROID - bool "load_android" - default n - depends on ANDROID_BOOT_IMAGE - help - Load an Android Boot image from storage. The Android Boot images - define the size and kernel address on the header, which are used by - this command. - -config CMD_BOOT_ANDROID - bool "boot_android" - default n - depends on ANDROID_BOOTLOADER - help - Performs the Android Bootloader boot flow, loading the appropriate - Android image (normal kernel, recovery kernel or "bootloader" mode) - and booting it. The boot mode is determined by the contents of the - Android Bootloader Message. - -config CMD_ANDROID_AB_SELECT - bool "android_ab_select" - default n - depends on ANDROID_AB - help - On Android devices with more than one boot slot (multiple copies of - the kernel and system images) this provides a command to select which - slot should be used to boot from and register the boot attempt. This - is used by the new A/B update model where one slot is updated in the - background while running from the other slot. + bool "load_android" + default n + depends on ANDROID_BOOT_IMAGE + help + Load an Android Boot image from storage. The Android Boot images + define the size and kernel address on the header, which are used by + this command. config CMD_MMC bool "mmc" |