From e5803f3314a5eb943b08d9b7a5a700b50386df39 Mon Sep 17 00:00:00 2001 From: Joakim Zhang Date: Wed, 1 Aug 2018 17:59:57 +0800 Subject: [PATCH] MLK-19062-1 fastboot: enable fastboot in mx6ul Modify mx6ul_14x14_evk.h file and defconfig files to enable fastboot in mx6ul_14x14 and mx6ul_9x9 board Signed-off-by: Joakim Zhang --- configs/mx6ul_14x14_evk_defconfig | 16 ++++++++++++++++ configs/mx6ul_14x14_evk_emmc_defconfig | 16 ++++++++++++++++ configs/mx6ul_14x14_evk_optee_defconfig | 16 ++++++++++++++++ configs/mx6ul_14x14_evk_plugin_defconfig | 16 ++++++++++++++++ configs/mx6ul_9x9_evk_defconfig | 16 ++++++++++++++++ configs/mx6ul_9x9_evk_optee_defconfig | 16 ++++++++++++++++ configs/mx6ul_9x9_evk_plugin_defconfig | 16 ++++++++++++++++ include/configs/mx6ul_14x14_evk.h | 24 ++++++++---------------- 8 files changed, 120 insertions(+), 16 deletions(-) diff --git a/configs/mx6ul_14x14_evk_defconfig b/configs/mx6ul_14x14_evk_defconfig index 65f821044b..b9c2e41e1b 100644 --- a/configs/mx6ul_14x14_evk_defconfig +++ b/configs/mx6ul_14x14_evk_defconfig @@ -52,3 +52,19 @@ CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_VIDEO=y CONFIG_DM_ETH=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/mx6ul_14x14_evk_emmc_defconfig b/configs/mx6ul_14x14_evk_emmc_defconfig index f036256255..854ab20e58 100644 --- a/configs/mx6ul_14x14_evk_emmc_defconfig +++ b/configs/mx6ul_14x14_evk_emmc_defconfig @@ -53,3 +53,19 @@ CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_VIDEO=y CONFIG_DM_ETH=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/mx6ul_14x14_evk_optee_defconfig b/configs/mx6ul_14x14_evk_optee_defconfig index 474f8363c5..8a34a9353f 100644 --- a/configs/mx6ul_14x14_evk_optee_defconfig +++ b/configs/mx6ul_14x14_evk_optee_defconfig @@ -53,3 +53,19 @@ CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_VIDEO=y CONFIG_DM_ETH=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/mx6ul_14x14_evk_plugin_defconfig b/configs/mx6ul_14x14_evk_plugin_defconfig index 03592d6b7a..f1cd90cab3 100644 --- a/configs/mx6ul_14x14_evk_plugin_defconfig +++ b/configs/mx6ul_14x14_evk_plugin_defconfig @@ -53,3 +53,19 @@ CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_VIDEO=y CONFIG_DM_ETH=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/mx6ul_9x9_evk_defconfig b/configs/mx6ul_9x9_evk_defconfig index 9fbcc58d21..47952a4cb6 100644 --- a/configs/mx6ul_9x9_evk_defconfig +++ b/configs/mx6ul_9x9_evk_defconfig @@ -55,3 +55,19 @@ CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_VIDEO=y CONFIG_DM_ETH=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/mx6ul_9x9_evk_optee_defconfig b/configs/mx6ul_9x9_evk_optee_defconfig index 7b5c93f2c3..2b9051132d 100644 --- a/configs/mx6ul_9x9_evk_optee_defconfig +++ b/configs/mx6ul_9x9_evk_optee_defconfig @@ -56,3 +56,19 @@ CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_VIDEO=y CONFIG_DM_ETH=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/mx6ul_9x9_evk_plugin_defconfig b/configs/mx6ul_9x9_evk_plugin_defconfig index b35fa0b197..20e45f4f67 100644 --- a/configs/mx6ul_9x9_evk_plugin_defconfig +++ b/configs/mx6ul_9x9_evk_plugin_defconfig @@ -56,3 +56,19 @@ CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_VIDEO=y CONFIG_DM_ETH=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/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index eff547dfeb..429ddb83ae 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -13,6 +13,7 @@ #include #include "mx6_common.h" #include +#include "imx_env.h" /* uncomment for BEE support, needs to enable CONFIG_CMD_FUSE */ /* #define CONFIG_CMD_BEE */ @@ -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 \