Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 64c88236e467f5dc7aa1c9d3047137707af97103

Authored by Ye Li
1 parent 69514b8e04
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-19342 imx8qm_mek: Enable fastboot to support uuu 

Add fastboot relevant configurations and update mfgtool environments
to support uuu.

Signed-off-by: Ye Li <ye.li@nxp.com>

Showing 3 changed files with 33 additions and 12 deletions Side-by-side Diff

configs/imx8qm_mek_defconfig
Diff comments   View file @ 64c8823
... ... @@ -16,6 +16,17 @@
16 16 CONFIG_SYS_I2C_IMX_LPI2C=y
17 17 CONFIG_CMD_I2C=y
18 18  
  19 +CONFIG_FASTBOOT=y
  20 +CONFIG_USB_FUNCTION_FASTBOOT=y
  21 +CONFIG_CMD_FASTBOOT=y
  22 +CONFIG_ANDROID_BOOT_IMAGE=y
  23 +CONFIG_FSL_FASTBOOT=y
  24 +CONFIG_FASTBOOT_BUF_ADDR=0x82800000
  25 +CONFIG_FASTBOOT_BUF_SIZE=0x40000000
  26 +CONFIG_FASTBOOT_FLASH=y
  27 +CONFIG_FASTBOOT_FLASH_MMC_DEV=0
  28 +CONFIG_FASTBOOT_USB_DEV=1
  29 +
19 30 CONFIG_USB_XHCI_HCD=y
20 31 CONFIG_USB_XHCI_IMX8=y
21 32  
... ... @@ -51,6 +62,7 @@
51 62 CONFIG_MMC_IO_VOLTAGE=y
52 63 CONFIG_MMC_UHS_SUPPORT=y
53 64 CONFIG_MMC_HS400_SUPPORT=y
  65 +CONFIG_EFI_PARTITION=y
54 66 CONFIG_FSL_FSPI=y
55 67 CONFIG_DM_SPI=y
56 68 CONFIG_DM_SPI_FLASH=y
configs/imx8qm_mek_fspi_defconfig
Diff comments   View file @ 64c8823
... ... @@ -16,6 +16,17 @@
16 16 CONFIG_SYS_I2C_IMX_LPI2C=y
17 17 CONFIG_CMD_I2C=y
18 18  
  19 +CONFIG_FASTBOOT=y
  20 +CONFIG_USB_FUNCTION_FASTBOOT=y
  21 +CONFIG_CMD_FASTBOOT=y
  22 +CONFIG_ANDROID_BOOT_IMAGE=y
  23 +CONFIG_FSL_FASTBOOT=y
  24 +CONFIG_FASTBOOT_BUF_ADDR=0x82800000
  25 +CONFIG_FASTBOOT_BUF_SIZE=0x40000000
  26 +CONFIG_FASTBOOT_FLASH=y
  27 +CONFIG_FASTBOOT_FLASH_MMC_DEV=0
  28 +CONFIG_FASTBOOT_USB_DEV=1
  29 +
19 30 CONFIG_USB_XHCI_HCD=y
20 31 CONFIG_USB_XHCI_IMX8=y
21 32  
... ... @@ -51,6 +62,7 @@
51 62 CONFIG_MMC_IO_VOLTAGE=y
52 63 CONFIG_MMC_UHS_SUPPORT=y
53 64 CONFIG_MMC_HS400_SUPPORT=y
  65 +CONFIG_EFI_PARTITION=y
54 66 CONFIG_QSPI_BOOT=y
55 67 CONFIG_FSL_FSPI=y
56 68 CONFIG_DM_SPI=y
include/configs/imx8qm_mek.h
Diff comments   View file @ 64c8823
... ... @@ -9,12 +9,15 @@
9 9  
10 10 #include <linux/sizes.h>
11 11 #include <asm/arch/imx-regs.h>
  12 +#include "imx_env.h"
12 13  
13 14 #define CONFIG_REMAKE_ELF
14 15  
15 16 #define CONFIG_BOARD_EARLY_INIT_F
16 17 #define CONFIG_ARCH_MISC_INIT
17 18  
  19 +#define CONFIG_CMD_READ
  20 +
18 21 /* Flat Device Tree Definitions */
19 22 #define CONFIG_OF_BOARD_SETUP
20 23  
21 24  
... ... @@ -153,17 +156,11 @@
153 156 #endif
154 157  
155 158 #define CONFIG_MFG_ENV_SETTINGS \
156   - "mfgtool_args=setenv bootargs console=${console},${baudrate} " \
157   - "rdinit=/linuxrc " \
158   - "g_mass_storage.stall=0 g_mass_storage.removable=1 " \
159   - "g_mass_storage.idVendor=0x066F g_mass_storage.idProduct=0x37FF "\
160   - "g_mass_storage.iSerialNumber=\"\" "\
161   - MFG_NAND_PARTITION \
162   - "clk_ignore_unused "\
163   - "\0" \
164   - "initrd_addr=0x83800000\0" \
  159 + CONFIG_MFG_ENV_SETTINGS_DEFAULT \
  160 + "initrd_addr=0x83100000\0" \
165 161 "initrd_high=0xffffffff\0" \
166   - "bootcmd_mfg=run mfgtool_args;booti ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
  162 + "emmc_dev=0\0" \
  163 + "sd_dev=1\0" \
167 164  
168 165 /* Initial environment variables */
169 166 #define CONFIG_EXTRA_ENV_SETTINGS \
... ... @@ -183,8 +180,6 @@
183 180 "cntr_file=os_cntr_signed.bin\0" \
184 181 "boot_fdt=try\0" \
185 182 "fdt_file=fsl-imx8qm-mek.dtb\0" \
186   - "initrd_addr=0x83800000\0" \
187   - "initrd_high=0xffffffffffffffff\0" \
188 183 "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
189 184 "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
190 185 "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
... ... @@ -345,6 +340,8 @@
345 340 #define FSPI0_AMBA_BASE 0
346 341 #define CONFIG_SYS_FSL_FSPI_AHB
347 342 #endif
  343 +
  344 +#define CONFIG_SERIAL_TAG
348 345  
349 346 /* USB Config */
350 347 #ifdef CONFIG_CMD_USB