Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit e5803f3314a5eb943b08d9b7a5a700b50386df39

Authored by Joakim Zhang
1 parent 2da6c17aa0
Exists in smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga and in 5 other branches smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga

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 <qiangqing.zhang@nxp.com>

Showing 8 changed files with 120 additions and 16 deletions Side-by-side Diff

configs/mx6ul_14x14_evk_defconfig
Diff comments   View file @ e5803f3
... ... @@ -52,4 +52,20 @@
52 52 CONFIG_USB_ETHER_ASIX=y
53 53 CONFIG_VIDEO=y
54 54 CONFIG_DM_ETH=y
  55 +
  56 +CONFIG_CMD_FASTBOOT=y
  57 +CONFIG_CI_UDC=y
  58 +CONFIG_USB_GADGET=y
  59 +CONFIG_USB_FUNCTION_FASTBOOT=y
  60 +CONFIG_USB_GADGET_DOWNLOAD=y
  61 +CONFIG_USB_GADGET_MANUFACTURER="FSL"
  62 +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
  63 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
  64 +CONFIG_FSL_FASTBOOT=y
  65 +CONFIG_FASTBOOT=y
  66 +CONFIG_FASTBOOT_BUF_ADDR=0x83800000
  67 +CONFIG_FASTBOOT_BUF_SIZE=0x40000000
  68 +CONFIG_FASTBOOT_FLASH=y
  69 +CONFIG_FASTBOOT_FLASH_MMC_DEV=1
  70 +CONFIG_EFI_PARTITION=y
configs/mx6ul_14x14_evk_emmc_defconfig
Diff comments   View file @ e5803f3
... ... @@ -53,4 +53,20 @@
53 53 CONFIG_USB_ETHER_ASIX=y
54 54 CONFIG_VIDEO=y
55 55 CONFIG_DM_ETH=y
  56 +
  57 +CONFIG_CMD_FASTBOOT=y
  58 +CONFIG_CI_UDC=y
  59 +CONFIG_USB_GADGET=y
  60 +CONFIG_USB_FUNCTION_FASTBOOT=y
  61 +CONFIG_USB_GADGET_DOWNLOAD=y
  62 +CONFIG_USB_GADGET_MANUFACTURER="FSL"
  63 +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
  64 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
  65 +CONFIG_FSL_FASTBOOT=y
  66 +CONFIG_FASTBOOT=y
  67 +CONFIG_FASTBOOT_BUF_ADDR=0x83800000
  68 +CONFIG_FASTBOOT_BUF_SIZE=0x40000000
  69 +CONFIG_FASTBOOT_FLASH=y
  70 +CONFIG_FASTBOOT_FLASH_MMC_DEV=1
  71 +CONFIG_EFI_PARTITION=y
configs/mx6ul_14x14_evk_optee_defconfig
Diff comments   View file @ e5803f3
... ... @@ -53,4 +53,20 @@
53 53 CONFIG_USB_ETHER_ASIX=y
54 54 CONFIG_VIDEO=y
55 55 CONFIG_DM_ETH=y
  56 +
  57 +CONFIG_CMD_FASTBOOT=y
  58 +CONFIG_CI_UDC=y
  59 +CONFIG_USB_GADGET=y
  60 +CONFIG_USB_FUNCTION_FASTBOOT=y
  61 +CONFIG_USB_GADGET_DOWNLOAD=y
  62 +CONFIG_USB_GADGET_MANUFACTURER="FSL"
  63 +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
  64 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
  65 +CONFIG_FSL_FASTBOOT=y
  66 +CONFIG_FASTBOOT=y
  67 +CONFIG_FASTBOOT_BUF_ADDR=0x83800000
  68 +CONFIG_FASTBOOT_BUF_SIZE=0x40000000
  69 +CONFIG_FASTBOOT_FLASH=y
  70 +CONFIG_FASTBOOT_FLASH_MMC_DEV=1
  71 +CONFIG_EFI_PARTITION=y
configs/mx6ul_14x14_evk_plugin_defconfig
Diff comments   View file @ e5803f3
... ... @@ -53,4 +53,20 @@
53 53 CONFIG_USB_ETHER_ASIX=y
54 54 CONFIG_VIDEO=y
55 55 CONFIG_DM_ETH=y
  56 +
  57 +CONFIG_CMD_FASTBOOT=y
  58 +CONFIG_CI_UDC=y
  59 +CONFIG_USB_GADGET=y
  60 +CONFIG_USB_FUNCTION_FASTBOOT=y
  61 +CONFIG_USB_GADGET_DOWNLOAD=y
  62 +CONFIG_USB_GADGET_MANUFACTURER="FSL"
  63 +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
  64 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
  65 +CONFIG_FSL_FASTBOOT=y
  66 +CONFIG_FASTBOOT=y
  67 +CONFIG_FASTBOOT_BUF_ADDR=0x83800000
  68 +CONFIG_FASTBOOT_BUF_SIZE=0x40000000
  69 +CONFIG_FASTBOOT_FLASH=y
  70 +CONFIG_FASTBOOT_FLASH_MMC_DEV=1
  71 +CONFIG_EFI_PARTITION=y
configs/mx6ul_9x9_evk_defconfig
Diff comments   View file @ e5803f3
... ... @@ -55,4 +55,20 @@
55 55 CONFIG_USB_ETHER_ASIX=y
56 56 CONFIG_VIDEO=y
57 57 CONFIG_DM_ETH=y
  58 +
  59 +CONFIG_CMD_FASTBOOT=y
  60 +CONFIG_CI_UDC=y
  61 +CONFIG_USB_GADGET=y
  62 +CONFIG_USB_FUNCTION_FASTBOOT=y
  63 +CONFIG_USB_GADGET_DOWNLOAD=y
  64 +CONFIG_USB_GADGET_MANUFACTURER="FSL"
  65 +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
  66 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
  67 +CONFIG_FSL_FASTBOOT=y
  68 +CONFIG_FASTBOOT=y
  69 +CONFIG_FASTBOOT_BUF_ADDR=0x83800000
  70 +CONFIG_FASTBOOT_BUF_SIZE=0x40000000
  71 +CONFIG_FASTBOOT_FLASH=y
  72 +CONFIG_FASTBOOT_FLASH_MMC_DEV=1
  73 +CONFIG_EFI_PARTITION=y
configs/mx6ul_9x9_evk_optee_defconfig
Diff comments   View file @ e5803f3
... ... @@ -56,4 +56,20 @@
56 56 CONFIG_USB_ETHER_ASIX=y
57 57 CONFIG_VIDEO=y
58 58 CONFIG_DM_ETH=y
  59 +
  60 +CONFIG_CMD_FASTBOOT=y
  61 +CONFIG_CI_UDC=y
  62 +CONFIG_USB_GADGET=y
  63 +CONFIG_USB_FUNCTION_FASTBOOT=y
  64 +CONFIG_USB_GADGET_DOWNLOAD=y
  65 +CONFIG_USB_GADGET_MANUFACTURER="FSL"
  66 +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
  67 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
  68 +CONFIG_FSL_FASTBOOT=y
  69 +CONFIG_FASTBOOT=y
  70 +CONFIG_FASTBOOT_BUF_ADDR=0x83800000
  71 +CONFIG_FASTBOOT_BUF_SIZE=0x40000000
  72 +CONFIG_FASTBOOT_FLASH=y
  73 +CONFIG_FASTBOOT_FLASH_MMC_DEV=1
  74 +CONFIG_EFI_PARTITION=y
configs/mx6ul_9x9_evk_plugin_defconfig
Diff comments   View file @ e5803f3
... ... @@ -56,4 +56,20 @@
56 56 CONFIG_USB_ETHER_ASIX=y
57 57 CONFIG_VIDEO=y
58 58 CONFIG_DM_ETH=y
  59 +
  60 +CONFIG_CMD_FASTBOOT=y
  61 +CONFIG_CI_UDC=y
  62 +CONFIG_USB_GADGET=y
  63 +CONFIG_USB_FUNCTION_FASTBOOT=y
  64 +CONFIG_USB_GADGET_DOWNLOAD=y
  65 +CONFIG_USB_GADGET_MANUFACTURER="FSL"
  66 +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
  67 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
  68 +CONFIG_FSL_FASTBOOT=y
  69 +CONFIG_FASTBOOT=y
  70 +CONFIG_FASTBOOT_BUF_ADDR=0x83800000
  71 +CONFIG_FASTBOOT_BUF_SIZE=0x40000000
  72 +CONFIG_FASTBOOT_FLASH=y
  73 +CONFIG_FASTBOOT_FLASH_MMC_DEV=1
  74 +CONFIG_EFI_PARTITION=y
include/configs/mx6ul_14x14_evk.h
Diff comments   View file @ e5803f3
... ... @@ -13,6 +13,7 @@
13 13 #include <linux/sizes.h>
14 14 #include "mx6_common.h"
15 15 #include <asm/mach-imx/gpio.h>
  16 +#include "imx_env.h"
16 17  
17 18 /* uncomment for BEE support, needs to enable CONFIG_CMD_FUSE */
18 19 /* #define CONFIG_CMD_BEE */
19 20  
20 21  
... ... @@ -80,25 +81,16 @@
80 81 #define MFG_NAND_PARTITION ""
81 82 #endif
82 83  
  84 +#define CONFIG_CMD_READ
  85 +#define CONFIG_SERIAL_TAG
  86 +#define CONFIG_FASTBOOT_USB_DEV 0
  87 +
83 88 #define CONFIG_MFG_ENV_SETTINGS \
84   - "mfgtool_args=setenv bootargs console=${console},${baudrate} " \
85   - BOOTARGS_CMA_SIZE \
86   - "rdinit=/linuxrc " \
87   - "g_mass_storage.stall=0 g_mass_storage.removable=1 " \
88   - "g_mass_storage.file=/fat g_mass_storage.ro=1 " \
89   - "g_mass_storage.idVendor=0x066F g_mass_storage.idProduct=0x37FF "\
90   - "g_mass_storage.iSerialNumber=\"\" "\
91   - MFG_NAND_PARTITION \
92   - "clk_ignore_unused "\
93   - "\0" \
  89 + CONFIG_MFG_ENV_SETTINGS_DEFAULT \
94 90 "initrd_addr=0x83800000\0" \
95 91 "initrd_high=0xffffffff\0" \
96   - "bootcmd_mfg=run mfgtool_args; " \
97   - "if test ${tee} = yes; then " \
98   - "bootm ${tee_addr} ${initrd_addr} ${fdt_addr}; " \
99   - "else " \
100   - "bootz ${loadaddr} ${initrd_addr} ${fdt_addr}; " \
101   - "fi;\0"
  92 + "emmc_dev=1\0"\
  93 + "sd_dev=1\0" \
102 94  
103 95 #if defined(CONFIG_NAND_BOOT)
104 96 #define CONFIG_EXTRA_ENV_SETTINGS \