Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[u-boot] / drivers / fastboot / Kconfig

diff --git a/drivers/fastboot/Kconfig b/drivers/fastboot/Kconfig
index 93a8ac64e76563fc1c78c77879ec548becc8eb0e..bc25ea1d9c7ac8452c2a2b894d91e90dff23be13 100644 (file)
--- a/drivers/fastboot/Kconfig
+++ b/drivers/fastboot/Kconfig
@@ -14,6 +14,13 @@ config USB_FUNCTION_FASTBOOT
        help
          This enables the USB part of the fastboot gadget.
 
+config UDP_FUNCTION_FASTBOOT
+       depends on NET
+       select FASTBOOT
+       bool "Enable fastboot protocol over UDP"
+       help
+         This enables the fastboot protocol over UDP.
+
 if FASTBOOT
 
 config FASTBOOT_BUF_ADDR
@@ -56,6 +63,8 @@ config FASTBOOT_USB_DEV
 config FASTBOOT_FLASH
        bool "Enable FASTBOOT FLASH command"
        default y if ARCH_SUNXI
+       depends on MMC || (NAND && CMD_MTDPARTS)
+       select IMAGE_SPARSE
        help
          The fastboot protocol includes a "flash" command for writing
          the downloaded image to a non-volatile storage device. Define
@@ -71,7 +80,7 @@ config FASTBOOT_FLASH_MMC
 
 config FASTBOOT_FLASH_NAND
        bool "FASTBOOT on NAND"
-       depends on NAND
+       depends on NAND && CMD_MTDPARTS
 
 endchoice
 
@@ -85,19 +94,16 @@ config FASTBOOT_FLASH_MMC_DEV
          regarding the non-volatile storage device. Define this to
          the eMMC device that fastboot should use to store the image.
 
-config FASTBOOT_FLASH_NAND_DEV
-       int "Define FASTBOOT NAND FLASH default device"
+config FASTBOOT_FLASH_NAND_TRIMFFS
+       bool "Skip empty pages when flashing NAND"
        depends on FASTBOOT_FLASH_NAND
-       depends on CMD_MTDPARTS
-       default 0 if ARCH_SUNXI && NAND_SUNXI
        help
-         The fastboot "flash" command requires additional information
-         regarding the non-volatile storage device. Define this to
-         the NAND device that fastboot should use to store the image.
+         When flashing NAND enable the DROP_FFS flag to drop trailing all-0xff
+         pages.
 
 config FASTBOOT_GPT_NAME
        string "Target name for updating GPT"
-       depends on FASTBOOT_FLASH
+       depends on FASTBOOT_FLASH_MMC && EFI_PARTITION
        default "gpt"
        help
          The fastboot "flash" command supports writing the downloaded
@@ -110,7 +116,7 @@ config FASTBOOT_GPT_NAME
 
 config FASTBOOT_MBR_NAME
        string "Target name for updating MBR"
-       depends on FASTBOOT_FLASH
+       depends on FASTBOOT_FLASH_MMC && DOS_PARTITION
        default "mbr"
        help
          The fastboot "flash" command allows to write the downloaded image
@@ -118,6 +124,14 @@ config FASTBOOT_MBR_NAME
          specified on the "fastboot flash" command line matches the value
          defined here. The default target name for updating MBR is "mbr".
 
+config FASTBOOT_CMD_OEM_FORMAT
+       bool "Enable the 'oem format' command"
+       depends on FASTBOOT_FLASH_MMC && CMD_GPT
+       help
+         Add support for the "oem format" command from a client. This
+         relies on the env variable partitions to contain the list of
+         partitions as required by the gpt command.
+
 endif # FASTBOOT
 
 endmenu