Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fastboot: Move fastboot to drivers/fastboot

Browse Source 
Separate CMD_FASTBOOT from FASTBOOT and move code and configuration to
drivers/fastboot.

Switch dependencies on FASTBOOT to USB_FUNCTION_FASTBOOT as anyone who wants
FASTBOOT before this series wants USB_FUNCTION_FASTBOOT. Split
USB_FUNCTION_FASTBOOT from FASTBOOT so they retain their existing
behaviour.

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
lime2-spi
Alex Kiernan 6 years ago committed by Marek Vasut
parent 6aae84769a
commit 312a10f16b
47 changed files with 75 additions and 79 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      arch/arm/Kconfig
  2. 1
      board/ti/common/Kconfig
  3. 14
      cmd/Kconfig
  4. 15
      common/Makefile
  5. 2
      configs/am335x_boneblack_defconfig
  6. 2
      configs/am335x_boneblack_vboot_defconfig
  7. 2
      configs/am335x_evm_defconfig
  8. 2
      configs/am335x_evm_nor_defconfig
  9. 2
      configs/am335x_evm_norboot_defconfig
  10. 2
      configs/am335x_evm_spiboot_defconfig
  11. 2
      configs/am335x_evm_usbspl_defconfig
  12. 2
      configs/am57xx_evm_defconfig
  13. 2
      configs/am57xx_hs_evm_defconfig
  14. 2
      configs/bcm23550_w1d_defconfig
  15. 2
      configs/bcm28155_ap_defconfig
  16. 2
      configs/birdland_bav335a_defconfig
  17. 2
      configs/birdland_bav335b_defconfig
  18. 2
      configs/cgtqmx6eval_defconfig
  19. 2
      configs/dra7xx_evm_defconfig
  20. 2
      configs/dra7xx_hs_evm_defconfig
  21. 2
      configs/imx6dl_mamoj_defconfig
  22. 2
      configs/kc1_defconfig
  23. 2
      configs/mx6qsabrelite_defconfig
  24. 2
      configs/mx6sabresd_defconfig
  25. 2
      configs/nitrogen6dl2g_defconfig
  26. 2
      configs/nitrogen6dl_defconfig
  27. 2
      configs/nitrogen6q2g_defconfig
  28. 2
      configs/nitrogen6q_defconfig
  29. 2
      configs/nitrogen6s1g_defconfig
  30. 2
      configs/nitrogen6s_defconfig
  31. 2
      configs/omap3_beagle_defconfig
  32. 2
      configs/omap3_evm_defconfig
  33. 2
      configs/omap3_logic_defconfig
  34. 2
      configs/sniper_defconfig
  35. 2
      configs/stih410-b2260_defconfig
  36. 2
      configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
  37. 2
      configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
  38. 2
      configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
  39. 2
      configs/xilinx_zynqmp_zcu102_revA_defconfig
  40. 2
      configs/xilinx_zynqmp_zcu102_revB_defconfig
  41. 2
      configs/xilinx_zynqmp_zcu106_revA_defconfig
  42. 2
      drivers/Kconfig
  43. 3
      drivers/Makefile
  44. 35
      drivers/fastboot/Kconfig
  45. 8
      drivers/fastboot/Makefile
  46. 0
      drivers/fastboot/fb_mmc.c
  47. 0
      drivers/fastboot/fb_nand.c

2
arch/arm/Kconfig
Unescape View File

@ -1258,9 +1258,7 @@ config ARCH_ROCKCHIP
select DM_REGULATOR select DM_REGULATOR
select ENABLE_ARM_SOC_BOOT0_HOOK select ENABLE_ARM_SOC_BOOT0_HOOK
select SPI select SPI
imply CMD_FASTBOOT
imply DISTRO_DEFAULTS imply DISTRO_DEFAULTS
imply FASTBOOT
imply FAT_WRITE imply FAT_WRITE
imply USB_FUNCTION_FASTBOOT imply USB_FUNCTION_FASTBOOT
imply SPL_SYSRESET imply SPL_SYSRESET

1
board/ti/common/Kconfig
Unescape View File

@ -25,7 +25,6 @@ config TI_COMMON_CMD_OPTIONS
imply CMD_EXT2 imply CMD_EXT2
imply CMD_EXT4 imply CMD_EXT4
imply CMD_EXT4_WRITE imply CMD_EXT4_WRITE
imply CMD_FASTBOOT if FASTBOOT
imply CMD_FAT imply CMD_FAT
imply FAT_WRITE if CMD_FAT imply FAT_WRITE if CMD_FAT
imply CMD_FS_GENERIC imply CMD_FS_GENERIC

14
cmd/Kconfig
Unescape View File

@ -137,8 +137,6 @@ config AUTOBOOT_STOP_STR_SHA256
endmenu endmenu
source "cmd/fastboot/Kconfig"
config BUILD_BIN2C config BUILD_BIN2C
bool bool
@ -650,6 +648,18 @@ config CMD_DM
can be useful to see the state of driver model for debugging or can be useful to see the state of driver model for debugging or
interest. interest.
config CMD_FASTBOOT
bool "fastboot - Android fastboot support"
depends on FASTBOOT
help
This enables the command "fastboot" which enables the Android
fastboot mode for the platform. Fastboot is a protocol for
downloading images, flashing and device control used on
Android devices. Fastboot requires support for acting as a USB
device.
See doc/README.android-fastboot for more information.
config CMD_FDC config CMD_FDC
bool "fdcboot - Boot from floppy device" bool "fdcboot - Boot from floppy device"
help help

15
common/Makefile
Unescape View File

@ -29,7 +29,7 @@ obj-$(CONFIG_CMD_BOOTI) += bootm.o bootm_os.o
obj-$(CONFIG_CMD_BEDBUG) += bedbug.o obj-$(CONFIG_CMD_BEDBUG) += bedbug.o
obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o
obj-$(CONFIG_FASTBOOT_FLASH) += image-sparse.o
obj-$(CONFIG_MII) += miiphyutil.o obj-$(CONFIG_MII) += miiphyutil.o
obj-$(CONFIG_CMD_MII) += miiphyutil.o obj-$(CONFIG_CMD_MII) += miiphyutil.o
obj-$(CONFIG_PHYLIB) += miiphyutil.o obj-$(CONFIG_PHYLIB) += miiphyutil.o
@ -109,19 +109,6 @@ obj-$(CONFIG_IO_TRACE) += iotrace.o
obj-y += memsize.o obj-y += memsize.o
obj-y += stdio.o obj-y += stdio.o
ifndef CONFIG_SPL_BUILD
# This option is not just y/n - it can have a numeric value
ifdef CONFIG_FASTBOOT_FLASH
obj-y += image-sparse.o
ifdef CONFIG_FASTBOOT_FLASH_MMC_DEV
obj-y += fb_mmc.o
endif
ifdef CONFIG_FASTBOOT_FLASH_NAND_DEV
obj-y += fb_nand.o
endif
endif
endif
ifdef CONFIG_CMD_EEPROM_LAYOUT ifdef CONFIG_CMD_EEPROM_LAYOUT
obj-y += eeprom/eeprom_field.o eeprom/eeprom_layout.o obj-y += eeprom/eeprom_field.o eeprom/eeprom_layout.o
endif endif

2
configs/am335x_boneblack_defconfig
Unescape View File

@ -16,7 +16,7 @@ CONFIG_AUTOBOOT_KEYED=y
CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
CONFIG_AUTOBOOT_DELAY_STR="d" CONFIG_AUTOBOOT_DELAY_STR="d"
CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_AUTOBOOT_STOP_STR=" "
CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH=y
CONFIG_FASTBOOT_FLASH_MMC_DEV=1 CONFIG_FASTBOOT_FLASH_MMC_DEV=1
CONFIG_CMD_SPL=y CONFIG_CMD_SPL=y

2
configs/am335x_boneblack_vboot_defconfig
Unescape View File

@ -19,7 +19,7 @@ CONFIG_AUTOBOOT_KEYED=y
CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
CONFIG_AUTOBOOT_DELAY_STR="d" CONFIG_AUTOBOOT_DELAY_STR="d"
CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_AUTOBOOT_STOP_STR=" "
CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_CMD_SPL=y CONFIG_CMD_SPL=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set

2
configs/am335x_evm_defconfig
Unescape View File

@ -13,7 +13,7 @@ CONFIG_ARCH_MISC_INIT=y
CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_MTD_SUPPORT=y
CONFIG_SPL_MUSB_NEW_SUPPORT=y CONFIG_SPL_MUSB_NEW_SUPPORT=y
CONFIG_SPL_OS_BOOT=y CONFIG_SPL_OS_BOOT=y
CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_CMD_SPL=y CONFIG_CMD_SPL=y
CONFIG_CMD_SPL_NAND_OFS=0x00080000 CONFIG_CMD_SPL_NAND_OFS=0x00080000
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set

2
configs/am335x_evm_nor_defconfig
Unescape View File

@ -12,7 +12,7 @@ CONFIG_ARCH_MISC_INIT=y
CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_MTD_SUPPORT=y
CONFIG_SPL_MUSB_NEW_SUPPORT=y CONFIG_SPL_MUSB_NEW_SUPPORT=y
CONFIG_SPL_OS_BOOT=y CONFIG_SPL_OS_BOOT=y
CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_CMD_SPL=y CONFIG_CMD_SPL=y
CONFIG_CMD_SPL_NAND_OFS=0x00080000 CONFIG_CMD_SPL_NAND_OFS=0x00080000
CONFIG_CMD_NAND=y CONFIG_CMD_NAND=y

2
configs/am335x_evm_norboot_defconfig
Unescape View File

@ -12,7 +12,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_VERSION_VARIABLE=y CONFIG_VERSION_VARIABLE=y
CONFIG_ARCH_MISC_INIT=y CONFIG_ARCH_MISC_INIT=y
CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_MTDPARTS=y CONFIG_CMD_MTDPARTS=y
CONFIG_MTDIDS_DEFAULT="nor0=physmap-flash.0" CONFIG_MTDIDS_DEFAULT="nor0=physmap-flash.0"

2
configs/am335x_evm_spiboot_defconfig
Unescape View File

@ -15,7 +15,7 @@ CONFIG_VERSION_VARIABLE=y
CONFIG_ARCH_MISC_INIT=y CONFIG_ARCH_MISC_INIT=y
CONFIG_SPL_MUSB_NEW_SUPPORT=y CONFIG_SPL_MUSB_NEW_SUPPORT=y
CONFIG_SPL_SPI_LOAD=y CONFIG_SPL_SPI_LOAD=y
CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_MTDPARTS=y CONFIG_CMD_MTDPARTS=y

2
configs/am335x_evm_usbspl_defconfig
Unescape View File

@ -19,7 +19,7 @@ CONFIG_SPL_OS_BOOT=y
CONFIG_SPL_USB_GADGET_SUPPORT=y CONFIG_SPL_USB_GADGET_SUPPORT=y
CONFIG_SPL_USB_ETHER=y CONFIG_SPL_USB_ETHER=y
# CONFIG_SPL_YMODEM_SUPPORT is not set # CONFIG_SPL_YMODEM_SUPPORT is not set
CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_CMD_SPL=y CONFIG_CMD_SPL=y
CONFIG_CMD_SPL_NAND_OFS=0x00080000 CONFIG_CMD_SPL_NAND_OFS=0x00080000
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set

2
configs/am57xx_evm_defconfig
Unescape View File

@ -24,7 +24,7 @@ CONFIG_SPL_SEPARATE_BSS=y
CONFIG_SPL_DMA_SUPPORT=y CONFIG_SPL_DMA_SUPPORT=y
CONFIG_SPL_OS_BOOT=y CONFIG_SPL_OS_BOOT=y
CONFIG_SPL_SPI_LOAD=y CONFIG_SPL_SPI_LOAD=y
CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x82000000 CONFIG_FASTBOOT_BUF_ADDR=0x82000000
CONFIG_FASTBOOT_BUF_SIZE=0x2F000000 CONFIG_FASTBOOT_BUF_SIZE=0x2F000000
CONFIG_FASTBOOT_USB_DEV=1 CONFIG_FASTBOOT_USB_DEV=1

2
configs/am57xx_hs_evm_defconfig
Unescape View File

@ -29,7 +29,7 @@ CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_SEPARATE_BSS=y CONFIG_SPL_SEPARATE_BSS=y
CONFIG_SPL_DMA_SUPPORT=y CONFIG_SPL_DMA_SUPPORT=y
CONFIG_SPL_SPI_LOAD=y CONFIG_SPL_SPI_LOAD=y
CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x82000000 CONFIG_FASTBOOT_BUF_ADDR=0x82000000
CONFIG_FASTBOOT_BUF_SIZE=0x2F000000 CONFIG_FASTBOOT_BUF_SIZE=0x2F000000
CONFIG_FASTBOOT_USB_DEV=1 CONFIG_FASTBOOT_USB_DEV=1

2
configs/bcm23550_w1d_defconfig
Unescape View File

@ -7,7 +7,7 @@ CONFIG_VERSION_VARIABLE=y
# CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x80000000 CONFIG_FASTBOOT_BUF_ADDR=0x80000000
CONFIG_FASTBOOT_BUF_SIZE=0x1D000000 CONFIG_FASTBOOT_BUF_SIZE=0x1D000000
CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH=y

2
configs/bcm28155_ap_defconfig
Unescape View File

@ -8,7 +8,7 @@ CONFIG_VERSION_VARIABLE=y
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
# CONFIG_AUTOBOOT is not set # CONFIG_AUTOBOOT is not set
CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x80000000 CONFIG_FASTBOOT_BUF_ADDR=0x80000000
CONFIG_FASTBOOT_BUF_SIZE=0x7FF00000 CONFIG_FASTBOOT_BUF_SIZE=0x7FF00000
CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH=y

2
configs/birdland_bav335a_defconfig
Unescape View File

@ -25,7 +25,7 @@ CONFIG_SPL_MUSB_NEW_SUPPORT=y
CONFIG_SPL_OS_BOOT=y CONFIG_SPL_OS_BOOT=y
CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_POWER_SUPPORT=y
CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_SPL_YMODEM_SUPPORT=y
CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x82000000 CONFIG_FASTBOOT_BUF_ADDR=0x82000000
CONFIG_CMD_SPL=y CONFIG_CMD_SPL=y
CONFIG_CMD_ASKENV=y CONFIG_CMD_ASKENV=y

2
configs/birdland_bav335b_defconfig
Unescape View File

@ -25,7 +25,7 @@ CONFIG_SPL_MUSB_NEW_SUPPORT=y
CONFIG_SPL_OS_BOOT=y CONFIG_SPL_OS_BOOT=y
CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_POWER_SUPPORT=y
CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_SPL_YMODEM_SUPPORT=y
CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x82000000 CONFIG_FASTBOOT_BUF_ADDR=0x82000000
CONFIG_CMD_SPL=y CONFIG_CMD_SPL=y
CONFIG_CMD_ASKENV=y CONFIG_CMD_ASKENV=y

2
configs/cgtqmx6eval_defconfig
Unescape View File

@ -24,7 +24,7 @@ CONFIG_SPL_I2C_SUPPORT=y
CONFIG_SPL_SPI_LOAD=y CONFIG_SPL_SPI_LOAD=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="CGT-QMX6-Quad U-Boot > " CONFIG_SYS_PROMPT="CGT-QMX6-Quad U-Boot > "
CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x12000000 CONFIG_FASTBOOT_BUF_ADDR=0x12000000
CONFIG_CMD_BOOTZ=y CONFIG_CMD_BOOTZ=y
CONFIG_CMD_DFU=y CONFIG_CMD_DFU=y

2
configs/dra7xx_evm_defconfig
Unescape View File

@ -25,7 +25,7 @@ CONFIG_SPL_SEPARATE_BSS=y
CONFIG_SPL_DMA_SUPPORT=y CONFIG_SPL_DMA_SUPPORT=y
CONFIG_SPL_OS_BOOT=y CONFIG_SPL_OS_BOOT=y
CONFIG_SPL_SPI_LOAD=y CONFIG_SPL_SPI_LOAD=y
CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x82000000 CONFIG_FASTBOOT_BUF_ADDR=0x82000000
CONFIG_FASTBOOT_BUF_SIZE=0x2F000000 CONFIG_FASTBOOT_BUF_SIZE=0x2F000000
CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH=y

2
configs/dra7xx_hs_evm_defconfig
Unescape View File

@ -30,7 +30,7 @@ CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_SEPARATE_BSS=y CONFIG_SPL_SEPARATE_BSS=y
CONFIG_SPL_DMA_SUPPORT=y CONFIG_SPL_DMA_SUPPORT=y
CONFIG_SPL_SPI_LOAD=y CONFIG_SPL_SPI_LOAD=y
CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x82000000 CONFIG_FASTBOOT_BUF_ADDR=0x82000000
CONFIG_FASTBOOT_BUF_SIZE=0x2F000000 CONFIG_FASTBOOT_BUF_SIZE=0x2F000000
CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH=y

2
configs/imx6dl_mamoj_defconfig
Unescape View File

@ -9,7 +9,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6dl-mamoj"
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x12000000 CONFIG_FASTBOOT_BUF_ADDR=0x12000000
CONFIG_FASTBOOT_BUF_SIZE=0x10000000 CONFIG_FASTBOOT_BUF_SIZE=0x10000000
CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH=y

2
configs/kc1_defconfig
Unescape View File

@ -12,7 +12,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=2 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=2
CONFIG_SYS_PROMPT="kc1 # " CONFIG_SYS_PROMPT="kc1 # "
CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x82000000 CONFIG_FASTBOOT_BUF_ADDR=0x82000000
CONFIG_FASTBOOT_BUF_SIZE=0x2000000 CONFIG_FASTBOOT_BUF_SIZE=0x2000000
CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH=y

2
configs/mx6qsabrelite_defconfig
Unescape View File

@ -9,7 +9,7 @@ CONFIG_BOOTDELAY=3
# CONFIG_USE_BOOTCOMMAND is not set # CONFIG_USE_BOOTCOMMAND is not set
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x12000000 CONFIG_FASTBOOT_BUF_ADDR=0x12000000
CONFIG_CMD_MEMTEST=y CONFIG_CMD_MEMTEST=y
CONFIG_SYS_ALT_MEMTEST=y CONFIG_SYS_ALT_MEMTEST=y

2
configs/mx6sabresd_defconfig
Unescape View File

@ -22,7 +22,7 @@ CONFIG_SPL_USB_HOST_SUPPORT=y
CONFIG_SPL_USB_GADGET_SUPPORT=y CONFIG_SPL_USB_GADGET_SUPPORT=y
CONFIG_SPL_USB_SDP_SUPPORT=y CONFIG_SPL_USB_SDP_SUPPORT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x12000000 CONFIG_FASTBOOT_BUF_ADDR=0x12000000
CONFIG_FASTBOOT_BUF_SIZE=0x10000000 CONFIG_FASTBOOT_BUF_SIZE=0x10000000
CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH=y

2
configs/nitrogen6dl2g_defconfig
Unescape View File

@ -9,7 +9,7 @@ CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_SUPPORT_RAW_INITRD=y CONFIG_SUPPORT_RAW_INITRD=y
CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x12000000 CONFIG_FASTBOOT_BUF_ADDR=0x12000000
CONFIG_CMD_BOOTZ=y CONFIG_CMD_BOOTZ=y
CONFIG_CMD_MEMTEST=y CONFIG_CMD_MEMTEST=y

2
configs/nitrogen6dl_defconfig
Unescape View File

@ -9,7 +9,7 @@ CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_SUPPORT_RAW_INITRD=y CONFIG_SUPPORT_RAW_INITRD=y
CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x12000000 CONFIG_FASTBOOT_BUF_ADDR=0x12000000
CONFIG_CMD_BOOTZ=y CONFIG_CMD_BOOTZ=y
CONFIG_CMD_MEMTEST=y CONFIG_CMD_MEMTEST=y

2
configs/nitrogen6q2g_defconfig
Unescape View File

@ -9,7 +9,7 @@ CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_SUPPORT_RAW_INITRD=y CONFIG_SUPPORT_RAW_INITRD=y
CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x12000000 CONFIG_FASTBOOT_BUF_ADDR=0x12000000
CONFIG_CMD_BOOTZ=y CONFIG_CMD_BOOTZ=y
CONFIG_CMD_MEMTEST=y CONFIG_CMD_MEMTEST=y

2
configs/nitrogen6q_defconfig
Unescape View File

@ -9,7 +9,7 @@ CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_SUPPORT_RAW_INITRD=y CONFIG_SUPPORT_RAW_INITRD=y
CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x12000000 CONFIG_FASTBOOT_BUF_ADDR=0x12000000
CONFIG_CMD_BOOTZ=y CONFIG_CMD_BOOTZ=y
CONFIG_CMD_MEMTEST=y CONFIG_CMD_MEMTEST=y

2
configs/nitrogen6s1g_defconfig
Unescape View File

@ -9,7 +9,7 @@ CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_SUPPORT_RAW_INITRD=y CONFIG_SUPPORT_RAW_INITRD=y
CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x12000000 CONFIG_FASTBOOT_BUF_ADDR=0x12000000
CONFIG_CMD_BOOTZ=y CONFIG_CMD_BOOTZ=y
CONFIG_CMD_MEMTEST=y CONFIG_CMD_MEMTEST=y

2
configs/nitrogen6s_defconfig
Unescape View File

@ -9,7 +9,7 @@ CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_SUPPORT_RAW_INITRD=y CONFIG_SUPPORT_RAW_INITRD=y
CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x12000000 CONFIG_FASTBOOT_BUF_ADDR=0x12000000
CONFIG_CMD_BOOTZ=y CONFIG_CMD_BOOTZ=y
CONFIG_CMD_MEMTEST=y CONFIG_CMD_MEMTEST=y

2
configs/omap3_beagle_defconfig
Unescape View File

@ -13,7 +13,7 @@ CONFIG_VERSION_VARIABLE=y
CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_MTD_SUPPORT=y
CONFIG_SPL_OS_BOOT=y CONFIG_SPL_OS_BOOT=y
CONFIG_SYS_PROMPT="BeagleBoard # " CONFIG_SYS_PROMPT="BeagleBoard # "
CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x82000000 CONFIG_FASTBOOT_BUF_ADDR=0x82000000
CONFIG_CMD_SPL=y CONFIG_CMD_SPL=y
CONFIG_CMD_SPL_NAND_OFS=0x280000 CONFIG_CMD_SPL_NAND_OFS=0x280000

2
configs/omap3_evm_defconfig
Unescape View File

@ -12,7 +12,7 @@ CONFIG_VERSION_VARIABLE=y
CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_MTD_SUPPORT=y
CONFIG_SPL_OS_BOOT=y CONFIG_SPL_OS_BOOT=y
CONFIG_SYS_PROMPT="OMAP3_EVM # " CONFIG_SYS_PROMPT="OMAP3_EVM # "
CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x82000000 CONFIG_FASTBOOT_BUF_ADDR=0x82000000
CONFIG_CMD_SPL=y CONFIG_CMD_SPL=y
CONFIG_CMD_SPL_NAND_OFS=0x280000 CONFIG_CMD_SPL_NAND_OFS=0x280000

2
configs/omap3_logic_defconfig
Unescape View File

@ -13,7 +13,7 @@ CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_MTD_SUPPORT=y
CONFIG_SPL_OS_BOOT=y CONFIG_SPL_OS_BOOT=y
CONFIG_SYS_PROMPT="OMAP Logic # " CONFIG_SYS_PROMPT="OMAP Logic # "
CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x82000000 CONFIG_FASTBOOT_BUF_ADDR=0x82000000
# CONFIG_CMD_IMI is not set # CONFIG_CMD_IMI is not set
CONFIG_CMD_SPL=y CONFIG_CMD_SPL=y

2
configs/sniper_defconfig
Unescape View File

@ -13,7 +13,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=2 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=2
# CONFIG_SPL_EXT_SUPPORT is not set # CONFIG_SPL_EXT_SUPPORT is not set
CONFIG_SYS_PROMPT="sniper # " CONFIG_SYS_PROMPT="sniper # "
CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x82000000 CONFIG_FASTBOOT_BUF_ADDR=0x82000000
CONFIG_FASTBOOT_BUF_SIZE=0x2000000 CONFIG_FASTBOOT_BUF_SIZE=0x2000000
CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH=y

2
configs/stih410-b2260_defconfig
Unescape View File

@ -10,7 +10,7 @@ CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyAS1,115200 CONSOLE=/dev/ttyAS1 consoleblank=0 root=/dev/mmcblk0p2 rootfstype=ext4 rw rootwait mem=992M@0x40000000 vmalloc=256m" CONFIG_BOOTARGS="console=ttyAS1,115200 CONSOLE=/dev/ttyAS1 consoleblank=0 root=/dev/mmcblk0p2 rootfstype=ext4 rw rootwait mem=992M@0x40000000 vmalloc=256m"
# CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_CPUINFO is not set
CONFIG_SYS_PROMPT="stih410-b2260 => " CONFIG_SYS_PROMPT="stih410-b2260 => "
CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x40000000 CONFIG_FASTBOOT_BUF_ADDR=0x40000000
CONFIG_FASTBOOT_BUF_SIZE=0x3DF00000 CONFIG_FASTBOOT_BUF_SIZE=0x3DF00000
CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH=y

2
configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
Unescape View File

@ -19,7 +19,7 @@ CONFIG_SPL_RAM_SUPPORT=y
CONFIG_SPL_RAM_DEVICE=y CONFIG_SPL_RAM_DEVICE=y
CONFIG_SPL_ATF=y CONFIG_SPL_ATF=y
CONFIG_SYS_PROMPT="ZynqMP> " CONFIG_SYS_PROMPT="ZynqMP> "
CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH=y
CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_FLASH_MMC_DEV=0
CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_THOR_DOWNLOAD=y

2
configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
Unescape View File

@ -20,7 +20,7 @@ CONFIG_SPL_RAM_SUPPORT=y
CONFIG_SPL_RAM_DEVICE=y CONFIG_SPL_RAM_DEVICE=y
CONFIG_SPL_ATF=y CONFIG_SPL_ATF=y
CONFIG_SYS_PROMPT="ZynqMP> " CONFIG_SYS_PROMPT="ZynqMP> "
CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH=y
CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_THOR_DOWNLOAD=y
CONFIG_CMD_MEMTEST=y CONFIG_CMD_MEMTEST=y

2
configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
Unescape View File

@ -19,7 +19,7 @@ CONFIG_SPL_RAM_SUPPORT=y
CONFIG_SPL_RAM_DEVICE=y CONFIG_SPL_RAM_DEVICE=y
CONFIG_SPL_ATF=y CONFIG_SPL_ATF=y
CONFIG_SYS_PROMPT="ZynqMP> " CONFIG_SYS_PROMPT="ZynqMP> "
CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH=y
CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_FLASH_MMC_DEV=0
CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_THOR_DOWNLOAD=y

2
configs/xilinx_zynqmp_zcu102_revA_defconfig
Unescape View File

@ -19,7 +19,7 @@ CONFIG_SPL_RAM_SUPPORT=y
CONFIG_SPL_RAM_DEVICE=y CONFIG_SPL_RAM_DEVICE=y
CONFIG_SPL_ATF=y CONFIG_SPL_ATF=y
CONFIG_SYS_PROMPT="ZynqMP> " CONFIG_SYS_PROMPT="ZynqMP> "
CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH=y
CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_FLASH_MMC_DEV=0
CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_THOR_DOWNLOAD=y

2
configs/xilinx_zynqmp_zcu102_revB_defconfig
Unescape View File

@ -19,7 +19,7 @@ CONFIG_SPL_RAM_SUPPORT=y
CONFIG_SPL_RAM_DEVICE=y CONFIG_SPL_RAM_DEVICE=y
CONFIG_SPL_ATF=y CONFIG_SPL_ATF=y
CONFIG_SYS_PROMPT="ZynqMP> " CONFIG_SYS_PROMPT="ZynqMP> "
CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH=y
CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_FLASH_MMC_DEV=0
CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_THOR_DOWNLOAD=y

2
configs/xilinx_zynqmp_zcu106_revA_defconfig
Unescape View File

@ -18,7 +18,7 @@ CONFIG_SPL_RAM_SUPPORT=y
CONFIG_SPL_RAM_DEVICE=y CONFIG_SPL_RAM_DEVICE=y
CONFIG_SPL_ATF=y CONFIG_SPL_ATF=y
CONFIG_SYS_PROMPT="ZynqMP> " CONFIG_SYS_PROMPT="ZynqMP> "
CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH=y
CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_FLASH_MMC_DEV=0
CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_THOR_DOWNLOAD=y

2
drivers/Kconfig
Unescape View File

@ -28,6 +28,8 @@ source "drivers/dfu/Kconfig"
source "drivers/dma/Kconfig" source "drivers/dma/Kconfig"
source "drivers/fastboot/Kconfig"
source "drivers/firmware/Kconfig" source "drivers/firmware/Kconfig"
source "drivers/fpga/Kconfig" source "drivers/fpga/Kconfig"

3
drivers/Makefile
Unescape View File

@ -71,6 +71,9 @@ obj-y += block/
obj-$(CONFIG_BOOTCOUNT_LIMIT) += bootcount/ obj-$(CONFIG_BOOTCOUNT_LIMIT) += bootcount/
obj-$(CONFIG_CPU) += cpu/ obj-$(CONFIG_CPU) += cpu/
obj-y += crypto/ obj-y += crypto/
ifneq ($(CONFIG_FASTBOOT_FLASH_MMC_DEV)$(CONFIG_FASTBOOT_FLASH_NAND_DEV),)
obj-y += fastboot/
endif
obj-y += firmware/ obj-y += firmware/
obj-$(CONFIG_FPGA) += fpga/ obj-$(CONFIG_FPGA) += fpga/
obj-y += misc/ obj-y += misc/

35
cmd/fastboot/Kconfig → drivers/fastboot/Kconfig
Unescape View File

@ -1,32 +1,20 @@
comment "FASTBOOT" menu "Fastboot support"
menuconfig FASTBOOT config FASTBOOT
bool "Fastboot support" bool
depends on USB_GADGET imply ANDROID_BOOT_IMAGE
default y if ARCH_SUNXI && USB_MUSB_GADGET imply CMD_FASTBOOT
if FASTBOOT
config USB_FUNCTION_FASTBOOT config USB_FUNCTION_FASTBOOT
bool "Enable USB fastboot gadget" bool "Enable USB fastboot gadget"
default y depends on USB_GADGET
default y if ARCH_SUNXI && USB_MUSB_GADGET
select FASTBOOT
select USB_GADGET_DOWNLOAD select USB_GADGET_DOWNLOAD
imply ANDROID_BOOT_IMAGE
imply CMD_FASTBOOT
help help
This enables the USB part of the fastboot gadget. This enables the USB part of the fastboot gadget.
config CMD_FASTBOOT if FASTBOOT
bool "Enable FASTBOOT command"
help
This enables the command "fastboot" which enables the Android
fastboot mode for the platform's USB device. Fastboot is a USB
protocol for downloading images, flashing and device control
used on Android devices.
See doc/README.android-fastboot for more information.
if USB_FUNCTION_FASTBOOT
config FASTBOOT_BUF_ADDR config FASTBOOT_BUF_ADDR
hex "Define FASTBOOT buffer address" hex "Define FASTBOOT buffer address"
@ -58,6 +46,7 @@ config FASTBOOT_BUF_SIZE
config FASTBOOT_USB_DEV config FASTBOOT_USB_DEV
int "USB controller number" int "USB controller number"
depends on USB_FUNCTION_FASTBOOT
default 0 default 0
help help
Some boards have USB OTG controller other than 0. Define this Some boards have USB OTG controller other than 0. Define this
@ -129,6 +118,6 @@ config FASTBOOT_MBR_NAME
specified on the "fastboot flash" command line matches the value specified on the "fastboot flash" command line matches the value
defined here. The default target name for updating MBR is "mbr". defined here. The default target name for updating MBR is "mbr".
endif # USB_FUNCTION_FASTBOOT
endif # FASTBOOT endif # FASTBOOT
endmenu

8
drivers/fastboot/Makefile
Unescape View File

@ -0,0 +1,8 @@
# SPDX-License-Identifier: GPL-2.0+
ifdef CONFIG_FASTBOOT_FLASH_MMC_DEV
obj-y += fb_mmc.o
endif
ifdef CONFIG_FASTBOOT_FLASH_NAND_DEV
obj-y += fb_nand.o
endif

0
common/fb_mmc.c → drivers/fastboot/fb_mmc.c
Unescape View File

0
common/fb_nand.c → drivers/fastboot/fb_nand.c
Unescape View File

Write Preview
Loading…
Cancel
Save