Merge git://git.denx.de/u-boot-fsl-qoriq

[oweals/u-boot.git] / cmd / fastboot / Kconfig

diff --git a/cmd/fastboot/Kconfig b/cmd/fastboot/Kconfig
index 5d2facc298de5a1e6b1127087bf1a202c2b5d9ec..214bbc23fc5217a8ab2099bdbc722a91bcd404f9 100644 (file)
--- a/cmd/fastboot/Kconfig
+++ b/cmd/fastboot/Kconfig
@@ -1,13 +1,18 @@
 comment "FASTBOOT"
 
-config FASTBOOT
-       bool ""
+menuconfig FASTBOOT
+       bool "Fastboot support"
+       depends on USB_GADGET
+       default y if ARCH_SUNXI && USB_MUSB_GADGET
 
-menu "Fastboot support"
-       depends on FASTBOOT
+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.
 
@@ -19,16 +24,22 @@ config CMD_FASTBOOT
          protocol for downloading images, flashing and device control
          used on Android devices.
 
-config ANDROID_BOOT_IMAGE
-       bool "Enable support for Android Boot Images"
-       help
-         This enables support for booting images which use the Android
-         image format header.
+         See doc/README.android-fastboot for more information.
 
 if USB_FUNCTION_FASTBOOT
 
 config FASTBOOT_BUF_ADDR
        hex "Define FASTBOOT buffer address"
+       default 0x82000000 if MX6SX || MX6SL || MX6UL || MX6SLL
+       default 0x81000000 if ARCH_OMAP2PLUS
+       default 0x42000000 if ARCH_SUNXI && !MACH_SUN9I
+       default 0x22000000 if ARCH_SUNXI && MACH_SUN9I
+       default 0x60800800 if ROCKCHIP_RK3036 || ROCKCHIP_RK3188 || \
+                               ROCKCHIP_RK322X
+       default 0x800800 if ROCKCHIP_RK3288 || ROCKCHIP_RK3329 || \
+                               ROCKCHIP_RK3399
+       default 0x280000 if ROCKCHIP_RK3368
+       default 0x100000 if ARCH_ZYNQMP
        help
          The fastboot protocol requires a large memory buffer for
          downloads. Define this to the starting RAM address to use for
@@ -36,11 +47,23 @@ config FASTBOOT_BUF_ADDR
 
 config FASTBOOT_BUF_SIZE
        hex "Define FASTBOOT buffer size"
+       default 0x8000000 if ARCH_ROCKCHIP
+       default 0x6000000 if ARCH_ZYNQMP
+       default 0x2000000 if ARCH_SUNXI
+       default 0x7000000
        help
          The fastboot protocol requires a large memory buffer for
          downloads. This buffer should be as large as possible for a
          platform. Define this to the size available RAM for fastboot.
 
+config FASTBOOT_USB_DEV
+       int "USB controller number"
+       default 0
+       help
+         Some boards have USB OTG controller other than 0. Define this
+         option so it can be used in compiled environment (e.g. in
+         CONFIG_BOOTCOMMAND).
+
 config FASTBOOT_FLASH
        bool "Enable FASTBOOT FLASH command"
        help
@@ -50,7 +73,9 @@ config FASTBOOT_FLASH
 
 config FASTBOOT_FLASH_MMC_DEV
        int "Define FASTBOOT MMC FLASH default device"
-       depends on FASTBOOT_FLASH
+       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
@@ -81,4 +106,4 @@ config FASTBOOT_MBR_NAME
 
 endif # USB_FUNCTION_FASTBOOT
 
-endmenu
+endif # FASTBOOT