diff options
| author | Tom Rini <trini@konsulko.com> | 2017-10-05 08:26:36 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-10-05 08:26:36 -0400 |
| commit | 4f42a0d7210bd8d4d1f5e2fb73456679d74c44cd (patch) | |
| tree | 9d86a09455140a0dc85bc7caa82c09a9eac82202 /cmd | |
| parent | 6a3e65dea3e525b5337ca8014aa4be9f5fafeb92 (diff) | |
| parent | e6ee85a6891eca187c9a9364c51690d3f6a36932 (diff) | |
| download | u-boot-4f42a0d7210bd8d4d1f5e2fb73456679d74c44cd.tar.gz | |
Merge git://git.denx.de/u-boot-sunxi
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/Kconfig | 7 | ||||
| -rw-r--r-- | cmd/fastboot/Kconfig | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/cmd/Kconfig b/cmd/Kconfig index 07ec03b507..28c91ca181 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -665,10 +665,17 @@ config CMD_GPT bool "GPT (GUID Partition Table) command" select PARTITION_UUIDS select EFI_PARTITION + imply RANDOM_UUID help Enable the 'gpt' command to ready and write GPT style partition tables. +config RANDOM_UUID + bool "GPT Random UUID generation" + help + Enable the generation of partitions with random UUIDs if none + are provided. + config CMD_GPT_RENAME bool "GPT partition renaming commands" depends on CMD_GPT diff --git a/cmd/fastboot/Kconfig b/cmd/fastboot/Kconfig index fb0c5da94c..214bbc23fc 100644 --- a/cmd/fastboot/Kconfig +++ b/cmd/fastboot/Kconfig @@ -3,11 +3,16 @@ comment "FASTBOOT" menuconfig FASTBOOT bool "Fastboot support" depends on USB_GADGET + default y if ARCH_SUNXI && USB_MUSB_GADGET if FASTBOOT config USB_FUNCTION_FASTBOOT bool "Enable USB fastboot gadget" + default y + select USB_GADGET_DOWNLOAD + imply ANDROID_BOOT_IMAGE + imply CMD_FASTBOOT help This enables the USB part of the fastboot gadget. @@ -69,6 +74,8 @@ config FASTBOOT_FLASH config FASTBOOT_FLASH_MMC_DEV int "Define FASTBOOT MMC FLASH default device" depends on FASTBOOT_FLASH && MMC + default 0 if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA = -1 + default 1 if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA != -1 help The fastboot "flash" command requires additional information regarding the non-volatile storage device. Define this to |