diff options
author | Xiaoning Wang <xiaoning.wang@nxp.com> | 2018-08-03 10:27:17 +0800 |
---|---|---|
committer | Xiaoning Wang <xiaoning.wang@nxp.com> | 2018-08-03 10:31:04 +0800 |
commit | 7beceb156bc4e9a5b69ab2ce7ef23cdeb3da314b (patch) | |
tree | 28a464fbdc31880d1aa8409592ef32cfeffdbc65 | |
parent | e5803f3314a5eb943b08d9b7a5a700b50386df39 (diff) |
MLK-19059-5 Enable uuu for i.MX6SL in 2018 uboot
i.MX6SL boards enable fastboot as default.
Support: mx6slevk_defconfig
mx6slevk_epdc_defconfig
mx6slevk_optee_defconfig
mx6slevk_plugin_defconfig
uuu will use fastboot command to write emmc.
Signed-off-by: Xiaoning Wang <xiaoning.wang@nxp.com>
-rw-r--r-- | configs/mx6slevk_defconfig | 16 | ||||
-rw-r--r-- | configs/mx6slevk_epdc_defconfig | 16 | ||||
-rw-r--r-- | configs/mx6slevk_optee_defconfig | 16 | ||||
-rw-r--r-- | configs/mx6slevk_plugin_defconfig | 16 | ||||
-rw-r--r-- | include/configs/mx6slevk.h | 21 |
5 files changed, 72 insertions, 13 deletions
diff --git a/configs/mx6slevk_defconfig b/configs/mx6slevk_defconfig index ed3f92f4050..6145b33f42b 100644 --- a/configs/mx6slevk_defconfig +++ b/configs/mx6slevk_defconfig @@ -51,3 +51,19 @@ CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_DM_ETH=y + +CONFIG_CMD_FASTBOOT=y +CONFIG_USB_FUNCTION_FASTBOOT=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_USB_GADGET_MANUFACTURER="FSL" +CONFIG_USB_GADGET_VENDOR_NUM=0x0525 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 +CONFIG_CI_UDC=y +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/mx6slevk_epdc_defconfig b/configs/mx6slevk_epdc_defconfig index 47c1420af52..e7fa073d202 100644 --- a/configs/mx6slevk_epdc_defconfig +++ b/configs/mx6slevk_epdc_defconfig @@ -53,3 +53,19 @@ CONFIG_USB_ETHER_ASIX=y CONFIG_DM_ETH=y CONFIG_LCD=y CONFIG_MXC_EPDC=y + +CONFIG_CMD_FASTBOOT=y +CONFIG_USB_FUNCTION_FASTBOOT=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_USB_GADGET_MANUFACTURER="FSL" +CONFIG_USB_GADGET_VENDOR_NUM=0x0525 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 +CONFIG_CI_UDC=y +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/mx6slevk_optee_defconfig b/configs/mx6slevk_optee_defconfig index b7c12fa16ca..0519db90696 100644 --- a/configs/mx6slevk_optee_defconfig +++ b/configs/mx6slevk_optee_defconfig @@ -52,3 +52,19 @@ CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_DM_ETH=y + +CONFIG_CMD_FASTBOOT=y +CONFIG_USB_FUNCTION_FASTBOOT=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_USB_GADGET_MANUFACTURER="FSL" +CONFIG_USB_GADGET_VENDOR_NUM=0x0525 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 +CONFIG_CI_UDC=y +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/mx6slevk_plugin_defconfig b/configs/mx6slevk_plugin_defconfig index 7a025f033b1..1b6ee74b209 100644 --- a/configs/mx6slevk_plugin_defconfig +++ b/configs/mx6slevk_plugin_defconfig @@ -52,3 +52,19 @@ CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_DM_ETH=y + +CONFIG_CMD_FASTBOOT=y +CONFIG_USB_FUNCTION_FASTBOOT=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_USB_GADGET_MANUFACTURER="FSL" +CONFIG_USB_GADGET_VENDOR_NUM=0x0525 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 +CONFIG_CI_UDC=y +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/mx6slevk.h b/include/configs/mx6slevk.h index c154833b279..8e05943947f 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -10,6 +10,7 @@ #define __CONFIG_H #include "mx6_common.h" +#include "imx_env.h" #ifdef CONFIG_SPL #include "imx6_spl.h" @@ -59,22 +60,16 @@ #define CONFIG_PHY_SMSC +#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} " \ - "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=\"\" "\ - "\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=2\0"\ + "sd_dev=1\0" \ #define CONFIG_EXTRA_ENV_SETTINGS \ CONFIG_MFG_ENV_SETTINGS \ |