Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 7beceb156bc4e9a5b69ab2ce7ef23cdeb3da314b

Authored by Xiaoning Wang
1 parent e5803f3314
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-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>

Showing 5 changed files with 72 additions and 13 deletions Side-by-side Diff

configs/mx6slevk_defconfig
Diff comments   View file @ 7beceb1
... ... @@ -51,4 +51,20 @@
51 51 CONFIG_USB_HOST_ETHER=y
52 52 CONFIG_USB_ETHER_ASIX=y
53 53 CONFIG_DM_ETH=y
  54 +
  55 +CONFIG_CMD_FASTBOOT=y
  56 +CONFIG_USB_FUNCTION_FASTBOOT=y
  57 +CONFIG_USB_GADGET=y
  58 +CONFIG_USB_GADGET_DOWNLOAD=y
  59 +CONFIG_USB_GADGET_MANUFACTURER="FSL"
  60 +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
  61 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
  62 +CONFIG_CI_UDC=y
  63 +CONFIG_FSL_FASTBOOT=y
  64 +CONFIG_FASTBOOT=y
  65 +CONFIG_FASTBOOT_BUF_ADDR=0x83800000
  66 +CONFIG_FASTBOOT_BUF_SIZE=0x40000000
  67 +CONFIG_FASTBOOT_FLASH=y
  68 +CONFIG_FASTBOOT_FLASH_MMC_DEV=1
  69 +CONFIG_EFI_PARTITION=y
configs/mx6slevk_epdc_defconfig
Diff comments   View file @ 7beceb1
... ... @@ -53,4 +53,20 @@
53 53 CONFIG_DM_ETH=y
54 54 CONFIG_LCD=y
55 55 CONFIG_MXC_EPDC=y
  56 +
  57 +CONFIG_CMD_FASTBOOT=y
  58 +CONFIG_USB_FUNCTION_FASTBOOT=y
  59 +CONFIG_USB_GADGET=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_CI_UDC=y
  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/mx6slevk_optee_defconfig
Diff comments   View file @ 7beceb1
... ... @@ -52,4 +52,20 @@
52 52 CONFIG_USB_HOST_ETHER=y
53 53 CONFIG_USB_ETHER_ASIX=y
54 54 CONFIG_DM_ETH=y
  55 +
  56 +CONFIG_CMD_FASTBOOT=y
  57 +CONFIG_USB_FUNCTION_FASTBOOT=y
  58 +CONFIG_USB_GADGET=y
  59 +CONFIG_USB_GADGET_DOWNLOAD=y
  60 +CONFIG_USB_GADGET_MANUFACTURER="FSL"
  61 +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
  62 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
  63 +CONFIG_CI_UDC=y
  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/mx6slevk_plugin_defconfig
Diff comments   View file @ 7beceb1
... ... @@ -52,4 +52,20 @@
52 52 CONFIG_USB_HOST_ETHER=y
53 53 CONFIG_USB_ETHER_ASIX=y
54 54 CONFIG_DM_ETH=y
  55 +
  56 +CONFIG_CMD_FASTBOOT=y
  57 +CONFIG_USB_FUNCTION_FASTBOOT=y
  58 +CONFIG_USB_GADGET=y
  59 +CONFIG_USB_GADGET_DOWNLOAD=y
  60 +CONFIG_USB_GADGET_MANUFACTURER="FSL"
  61 +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
  62 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
  63 +CONFIG_CI_UDC=y
  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
include/configs/mx6slevk.h
Diff comments   View file @ 7beceb1
... ... @@ -10,6 +10,7 @@
10 10 #define __CONFIG_H
11 11  
12 12 #include "mx6_common.h"
  13 +#include "imx_env.h"
13 14  
14 15 #ifdef CONFIG_SPL
15 16 #include "imx6_spl.h"
16 17  
17 18  
... ... @@ -59,22 +60,16 @@
59 60  
60 61 #define CONFIG_PHY_SMSC
61 62  
  63 +#define CONFIG_CMD_READ
  64 +#define CONFIG_SERIAL_TAG
  65 +#define CONFIG_FASTBOOT_USB_DEV 0
  66 +
62 67 #define CONFIG_MFG_ENV_SETTINGS \
63   - "mfgtool_args=setenv bootargs console=${console},${baudrate} " \
64   - "rdinit=/linuxrc " \
65   - "g_mass_storage.stall=0 g_mass_storage.removable=1 " \
66   - "g_mass_storage.file=/fat g_mass_storage.ro=1 " \
67   - "g_mass_storage.idVendor=0x066F g_mass_storage.idProduct=0x37FF "\
68   - "g_mass_storage.iSerialNumber=\"\" "\
69   - "\0" \
  68 + CONFIG_MFG_ENV_SETTINGS_DEFAULT \
70 69 "initrd_addr=0x83800000\0" \
71 70 "initrd_high=0xffffffff\0" \
72   - "bootcmd_mfg=run mfgtool_args;" \
73   - "if test ${tee} = yes; then " \
74   - "bootm ${tee_addr} ${initrd_addr} ${fdt_addr}; " \
75   - "else " \
76   - "bootz ${loadaddr} ${initrd_addr} ${fdt_addr}; " \
77   - "fi;\0"
  71 + "emmc_dev=2\0"\
  72 + "sd_dev=1\0" \
78 73  
79 74 #define CONFIG_EXTRA_ENV_SETTINGS \
80 75 CONFIG_MFG_ENV_SETTINGS \