diff --git a/configs/mx6ull_14x14_evk_defconfig b/configs/mx6ull_14x14_evk_defconfig index 7634a51919..7ca7cfc691 100644 --- a/configs/mx6ull_14x14_evk_defconfig +++ b/configs/mx6ull_14x14_evk_defconfig @@ -50,3 +50,19 @@ CONFIG_FSL_QSPI=y CONFIG_DM_ETH=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y + +CONFIG_CMD_FASTBOOT=y +CONFIG_CI_UDC=y +CONFIG_USB_GADGET=y +CONFIG_USB_FUNCTION_FASTBOOT=y +CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_USB_GADGET_MANUFACTURER="FSL" +CONFIG_USB_GADGET_VENDOR_NUM=0x0525 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 +CONFIG_FSL_FASTBOOT=y +CONFIG_FASTBOOT=y +CONFIG_FASTBOOT_BUF_ADDR=0x83800000 +CONFIG_FASTBOOT_BUF_SIZE=0x40000000 +CONFIG_FASTBOOT_FLASH=y +CONFIG_FASTBOOT_FLASH_MMC_DEV=1 +CONFIG_EFI_PARTITION=y diff --git a/configs/mx6ull_14x14_evk_emmc_defconfig b/configs/mx6ull_14x14_evk_emmc_defconfig index ab960cae5f..b862db7839 100644 --- a/configs/mx6ull_14x14_evk_emmc_defconfig +++ b/configs/mx6ull_14x14_evk_emmc_defconfig @@ -50,3 +50,19 @@ CONFIG_FSL_QSPI=y CONFIG_DM_ETH=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y + +CONFIG_CMD_FASTBOOT=y +CONFIG_CI_UDC=y +CONFIG_USB_GADGET=y +CONFIG_USB_FUNCTION_FASTBOOT=y +CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_USB_GADGET_MANUFACTURER="FSL" +CONFIG_USB_GADGET_VENDOR_NUM=0x0525 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 +CONFIG_FSL_FASTBOOT=y +CONFIG_FASTBOOT=y +CONFIG_FASTBOOT_BUF_ADDR=0x83800000 +CONFIG_FASTBOOT_BUF_SIZE=0x40000000 +CONFIG_FASTBOOT_FLASH=y +CONFIG_FASTBOOT_FLASH_MMC_DEV=1 +CONFIG_EFI_PARTITION=y diff --git a/configs/mx6ull_14x14_evk_optee_defconfig b/configs/mx6ull_14x14_evk_optee_defconfig index 1975128497..11f846bb17 100644 --- a/configs/mx6ull_14x14_evk_optee_defconfig +++ b/configs/mx6ull_14x14_evk_optee_defconfig @@ -51,3 +51,19 @@ CONFIG_FSL_QSPI=y CONFIG_DM_ETH=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y + +CONFIG_CMD_FASTBOOT=y +CONFIG_CI_UDC=y +CONFIG_USB_GADGET=y +CONFIG_USB_FUNCTION_FASTBOOT=y +CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_USB_GADGET_MANUFACTURER="FSL" +CONFIG_USB_GADGET_VENDOR_NUM=0x0525 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 +CONFIG_FSL_FASTBOOT=y +CONFIG_FASTBOOT=y +CONFIG_FASTBOOT_BUF_ADDR=0x83800000 +CONFIG_FASTBOOT_BUF_SIZE=0x40000000 +CONFIG_FASTBOOT_FLASH=y +CONFIG_FASTBOOT_FLASH_MMC_DEV=1 +CONFIG_EFI_PARTITION=y diff --git a/configs/mx6ull_14x14_evk_plugin_defconfig b/configs/mx6ull_14x14_evk_plugin_defconfig index cdf52c0b3a..e57cd5da96 100644 --- a/configs/mx6ull_14x14_evk_plugin_defconfig +++ b/configs/mx6ull_14x14_evk_plugin_defconfig @@ -51,3 +51,19 @@ CONFIG_FSL_QSPI=y CONFIG_DM_ETH=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y + +CONFIG_CMD_FASTBOOT=y +CONFIG_CI_UDC=y +CONFIG_USB_GADGET=y +CONFIG_USB_FUNCTION_FASTBOOT=y +CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_USB_GADGET_MANUFACTURER="FSL" +CONFIG_USB_GADGET_VENDOR_NUM=0x0525 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 +CONFIG_FSL_FASTBOOT=y +CONFIG_FASTBOOT=y +CONFIG_FASTBOOT_BUF_ADDR=0x83800000 +CONFIG_FASTBOOT_BUF_SIZE=0x40000000 +CONFIG_FASTBOOT_FLASH=y +CONFIG_FASTBOOT_FLASH_MMC_DEV=1 +CONFIG_EFI_PARTITION=y diff --git a/configs/mx6ull_9x9_evk_defconfig b/configs/mx6ull_9x9_evk_defconfig index 13fbd7ecf3..b3e0892731 100644 --- a/configs/mx6ull_9x9_evk_defconfig +++ b/configs/mx6ull_9x9_evk_defconfig @@ -53,3 +53,19 @@ CONFIG_FSL_QSPI=y CONFIG_DM_ETH=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y + +CONFIG_CMD_FASTBOOT=y +CONFIG_CI_UDC=y +CONFIG_USB_GADGET=y +CONFIG_USB_FUNCTION_FASTBOOT=y +CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_USB_GADGET_MANUFACTURER="FSL" +CONFIG_USB_GADGET_VENDOR_NUM=0x0525 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 +CONFIG_FSL_FASTBOOT=y +CONFIG_FASTBOOT=y +CONFIG_FASTBOOT_BUF_ADDR=0x83800000 +CONFIG_FASTBOOT_BUF_SIZE=0x40000000 +CONFIG_FASTBOOT_FLASH=y +CONFIG_FASTBOOT_FLASH_MMC_DEV=1 +CONFIG_EFI_PARTITION=y diff --git a/configs/mx6ull_9x9_evk_plugin_defconfig b/configs/mx6ull_9x9_evk_plugin_defconfig index 83cc45f4a8..82dcf34c36 100644 --- a/configs/mx6ull_9x9_evk_plugin_defconfig +++ b/configs/mx6ull_9x9_evk_plugin_defconfig @@ -54,3 +54,19 @@ CONFIG_FSL_QSPI=y CONFIG_DM_ETH=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y + +CONFIG_CMD_FASTBOOT=y +CONFIG_CI_UDC=y +CONFIG_USB_GADGET=y +CONFIG_USB_FUNCTION_FASTBOOT=y +CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_USB_GADGET_MANUFACTURER="FSL" +CONFIG_USB_GADGET_VENDOR_NUM=0x0525 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 +CONFIG_FSL_FASTBOOT=y +CONFIG_FASTBOOT=y +CONFIG_FASTBOOT_BUF_ADDR=0x83800000 +CONFIG_FASTBOOT_BUF_SIZE=0x40000000 +CONFIG_FASTBOOT_FLASH=y +CONFIG_FASTBOOT_FLASH_MMC_DEV=1 +CONFIG_EFI_PARTITION=y diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h index 49afa5f148..12f89cb540 100644 --- a/include/configs/mx6ullevk.h +++ b/include/configs/mx6ullevk.h @@ -14,6 +14,7 @@ #include #include "mx6_common.h" #include +#include "imx_env.h" #ifdef CONFIG_SECURE_BOOT #ifndef CONFIG_CSF_SIZE @@ -80,25 +81,16 @@ #define MFG_NAND_PARTITION "" #endif +#define CONFIG_CMD_READ +#define CONFIG_SERIAL_TAG +#define CONFIG_FASTBOOT_USB_DEV 0 + #define CONFIG_MFG_ENV_SETTINGS \ - "mfgtool_args=setenv bootargs console=${console},${baudrate} " \ - BOOTARGS_CMA_SIZE \ - "rdinit=/linuxrc " \ - "g_mass_storage.stall=0 g_mass_storage.removable=1 " \ - "g_mass_storage.file=/fat g_mass_storage.ro=1 " \ - "g_mass_storage.idVendor=0x066F g_mass_storage.idProduct=0x37FF "\ - "g_mass_storage.iSerialNumber=\"\" "\ - MFG_NAND_PARTITION \ - "clk_ignore_unused "\ - "\0" \ + CONFIG_MFG_ENV_SETTINGS_DEFAULT \ "initrd_addr=0x83800000\0" \ "initrd_high=0xffffffff\0" \ - "bootcmd_mfg=run mfgtool_args; " \ - "if test ${tee} = yes; then " \ - "bootm ${tee_addr} ${initrd_addr} ${fdt_addr}; " \ - "else " \ - "bootz ${loadaddr} ${initrd_addr} ${fdt_addr}; " \ - "fi;\0" + "emmc_dev=1\0"\ + "sd_dev=1\0" \ #if defined(CONFIG_NAND_BOOT) #define CONFIG_EXTRA_ENV_SETTINGS \