Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit d26dee0793389c63bb3bfbd90f3cf2a11518d2c4

Authored by Frank Li
1 parent 11b519b780
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-19250 weim nor and spi nor support fastboot 

Enable fastboot at below configs
sabraauto spi nor and wei nor
imx6slevk spi nor

Signed-off-by: Frank Li <Frank.Li@nxp.com>

Showing 12 changed files with 211 additions and 2 deletions Side-by-side Diff

arch/arm/mach-imx/mx6/soc.c
Diff comments   View file @ d26dee0
... ... @@ -648,7 +648,10 @@
648 648 return 0;
649 649 }
650 650  
651   -#ifdef CONFIG_ENV_IS_IN_MMC
  651 +#ifndef CONFIG_SYS_MMC_ENV_DEV
  652 +#define CONFIG_SYS_MMC_ENV_DEV -1
  653 +#endif
  654 +
652 655 __weak int board_mmc_get_env_dev(int devno)
653 656 {
654 657 return CONFIG_SYS_MMC_ENV_DEV;
... ... @@ -706,7 +709,6 @@
706 709  
707 710 return board_mmc_get_env_part(devno);
708 711 }
709   -#endif
710 712 #endif
711 713  
712 714 int board_postclk_init(void)
configs/mx6dlsabreauto_eimnor_defconfig
Diff comments   View file @ d26dee0
... ... @@ -45,4 +45,29 @@
45 45 CONFIG_DM_REGULATOR_FIXED=y
46 46 CONFIG_DM_REGULATOR_GPIO=y
47 47 CONFIG_DM_ETH=y
  48 +
  49 +CONFIG_FLASH_CFI_DRIVER=y
  50 +CONFIG_FLASH_CFI_MTD=y
  51 +ONFIG_CMD_FLASH=y
  52 +
  53 +CONFIG_DM_USB=y
  54 +CONFIG_USB=y
  55 +CONFIG_USB_STORAGE=y
  56 +CONFIG_USB_GADGET=y
  57 +CONFIG_CMD_USB=y
  58 +CONFIG_CI_UDC=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 +
  64 +CONFIG_CMD_FASTBOOT=y
  65 +CONFIG_USB_FUNCTION_FASTBOOT=y
  66 +CONFIG_FSL_FASTBOOT=y
  67 +CONFIG_FASTBOOT=y
  68 +CONFIG_FASTBOOT_BUF_ADDR=0x12C00000
  69 +CONFIG_FASTBOOT_BUF_SIZE=0x40000000
  70 +CONFIG_FASTBOOT_FLASH=y
  71 +CONFIG_FASTBOOT_FLASH_MMC_DEV=1
  72 +CONFIG_EFI_PARTITION=y
configs/mx6dlsabreauto_spinor_defconfig
Diff comments   View file @ d26dee0
... ... @@ -45,4 +45,25 @@
45 45 CONFIG_DM_REGULATOR_FIXED=y
46 46 CONFIG_DM_REGULATOR_GPIO=y
47 47 CONFIG_DM_ETH=y
  48 +
  49 +CONFIG_DM_USB=y
  50 +CONFIG_USB=y
  51 +CONFIG_USB_STORAGE=y
  52 +CONFIG_USB_GADGET=y
  53 +CONFIG_CMD_USB=y
  54 +CONFIG_CI_UDC=y
  55 +CONFIG_USB_GADGET_DOWNLOAD=y
  56 +CONFIG_USB_GADGET_MANUFACTURER="FSL"
  57 +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
  58 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
  59 +
  60 +CONFIG_CMD_FASTBOOT=y
  61 +CONFIG_USB_FUNCTION_FASTBOOT=y
  62 +CONFIG_FSL_FASTBOOT=y
  63 +CONFIG_FASTBOOT=y
  64 +CONFIG_FASTBOOT_BUF_ADDR=0x12C00000
  65 +CONFIG_FASTBOOT_BUF_SIZE=0x40000000
  66 +CONFIG_FASTBOOT_FLASH=y
  67 +CONFIG_FASTBOOT_FLASH_MMC_DEV=1
  68 +CONFIG_EFI_PARTITION=y
configs/mx6qpsabreauto_eimnor_defconfig
Diff comments   View file @ d26dee0
... ... @@ -45,4 +45,29 @@
45 45 CONFIG_DM_REGULATOR_FIXED=y
46 46 CONFIG_DM_REGULATOR_GPIO=y
47 47 CONFIG_DM_ETH=y
  48 +
  49 +CONFIG_FLASH_CFI_DRIVER=y
  50 +CONFIG_FLASH_CFI_MTD=y
  51 +ONFIG_CMD_FLASH=y
  52 +
  53 +CONFIG_DM_USB=y
  54 +CONFIG_USB=y
  55 +CONFIG_USB_STORAGE=y
  56 +CONFIG_USB_GADGET=y
  57 +CONFIG_CMD_USB=y
  58 +CONFIG_CI_UDC=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 +
  64 +CONFIG_CMD_FASTBOOT=y
  65 +CONFIG_USB_FUNCTION_FASTBOOT=y
  66 +CONFIG_FSL_FASTBOOT=y
  67 +CONFIG_FASTBOOT=y
  68 +CONFIG_FASTBOOT_BUF_ADDR=0x12C00000
  69 +CONFIG_FASTBOOT_BUF_SIZE=0x40000000
  70 +CONFIG_FASTBOOT_FLASH=y
  71 +CONFIG_FASTBOOT_FLASH_MMC_DEV=1
  72 +CONFIG_EFI_PARTITION=y
configs/mx6qpsabreauto_spinor_defconfig
Diff comments   View file @ d26dee0
... ... @@ -45,4 +45,25 @@
45 45 CONFIG_DM_REGULATOR_FIXED=y
46 46 CONFIG_DM_REGULATOR_GPIO=y
47 47 CONFIG_DM_ETH=y
  48 +
  49 +CONFIG_DM_USB=y
  50 +CONFIG_USB=y
  51 +CONFIG_USB_STORAGE=y
  52 +CONFIG_USB_GADGET=y
  53 +CONFIG_CMD_USB=y
  54 +CONFIG_CI_UDC=y
  55 +CONFIG_USB_GADGET_DOWNLOAD=y
  56 +CONFIG_USB_GADGET_MANUFACTURER="FSL"
  57 +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
  58 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
  59 +
  60 +CONFIG_CMD_FASTBOOT=y
  61 +CONFIG_USB_FUNCTION_FASTBOOT=y
  62 +CONFIG_FSL_FASTBOOT=y
  63 +CONFIG_FASTBOOT=y
  64 +CONFIG_FASTBOOT_BUF_ADDR=0x12C00000
  65 +CONFIG_FASTBOOT_BUF_SIZE=0x40000000
  66 +CONFIG_FASTBOOT_FLASH=y
  67 +CONFIG_FASTBOOT_FLASH_MMC_DEV=1
  68 +CONFIG_EFI_PARTITION=y
configs/mx6qsabreauto_eimnor_defconfig
Diff comments   View file @ d26dee0
... ... @@ -45,4 +45,29 @@
45 45 CONFIG_DM_REGULATOR_FIXED=y
46 46 CONFIG_DM_REGULATOR_GPIO=y
47 47 CONFIG_DM_ETH=y
  48 +
  49 +CONFIG_FLASH_CFI_DRIVER=y
  50 +CONFIG_FLASH_CFI_MTD=y
  51 +ONFIG_CMD_FLASH=y
  52 +
  53 +CONFIG_DM_USB=y
  54 +CONFIG_USB=y
  55 +CONFIG_USB_STORAGE=y
  56 +CONFIG_USB_GADGET=y
  57 +CONFIG_CMD_USB=y
  58 +CONFIG_CI_UDC=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 +
  64 +CONFIG_CMD_FASTBOOT=y
  65 +CONFIG_USB_FUNCTION_FASTBOOT=y
  66 +CONFIG_FSL_FASTBOOT=y
  67 +CONFIG_FASTBOOT=y
  68 +CONFIG_FASTBOOT_BUF_ADDR=0x12C00000
  69 +CONFIG_FASTBOOT_BUF_SIZE=0x40000000
  70 +CONFIG_FASTBOOT_FLASH=y
  71 +CONFIG_FASTBOOT_FLASH_MMC_DEV=1
  72 +CONFIG_EFI_PARTITION=y
configs/mx6qsabreauto_spinor_defconfig
Diff comments   View file @ d26dee0
... ... @@ -45,4 +45,25 @@
45 45 CONFIG_DM_REGULATOR_FIXED=y
46 46 CONFIG_DM_REGULATOR_GPIO=y
47 47 CONFIG_DM_ETH=y
  48 +
  49 +CONFIG_DM_USB=y
  50 +CONFIG_USB=y
  51 +CONFIG_USB_STORAGE=y
  52 +CONFIG_USB_GADGET=y
  53 +CONFIG_CMD_USB=y
  54 +CONFIG_CI_UDC=y
  55 +CONFIG_USB_GADGET_DOWNLOAD=y
  56 +CONFIG_USB_GADGET_MANUFACTURER="FSL"
  57 +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
  58 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
  59 +
  60 +CONFIG_CMD_FASTBOOT=y
  61 +CONFIG_USB_FUNCTION_FASTBOOT=y
  62 +CONFIG_FSL_FASTBOOT=y
  63 +CONFIG_FASTBOOT=y
  64 +CONFIG_FASTBOOT_BUF_ADDR=0x12C00000
  65 +CONFIG_FASTBOOT_BUF_SIZE=0x40000000
  66 +CONFIG_FASTBOOT_FLASH=y
  67 +CONFIG_FASTBOOT_FLASH_MMC_DEV=1
  68 +CONFIG_EFI_PARTITION=y
configs/mx6slevk_spinor_defconfig
Diff comments   View file @ d26dee0
... ... @@ -52,4 +52,21 @@
52 52 CONFIG_USB_HOST_ETHER=y
53 53 CONFIG_USB_ETHER_ASIX=y
54 54 CONFIG_DM_ETH=y
  55 +
  56 +CONFIG_USB_GADGET=y
  57 +CONFIG_CI_UDC=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 +
  63 +CONFIG_CMD_FASTBOOT=y
  64 +CONFIG_USB_FUNCTION_FASTBOOT=y
  65 +CONFIG_FSL_FASTBOOT=y
  66 +CONFIG_FASTBOOT=y
  67 +CONFIG_FASTBOOT_BUF_ADDR=0x12C00000
  68 +CONFIG_FASTBOOT_BUF_SIZE=0x40000000
  69 +CONFIG_FASTBOOT_FLASH=y
  70 +CONFIG_FASTBOOT_FLASH_MMC_DEV=1
  71 +CONFIG_EFI_PARTITION=y
configs/mx6solosabreauto_eimnor_defconfig
Diff comments   View file @ d26dee0
... ... @@ -45,4 +45,29 @@
45 45 CONFIG_DM_REGULATOR_FIXED=y
46 46 CONFIG_DM_REGULATOR_GPIO=y
47 47 CONFIG_DM_ETH=y
  48 +
  49 +CONFIG_FLASH_CFI_DRIVER=y
  50 +CONFIG_FLASH_CFI_MTD=y
  51 +ONFIG_CMD_FLASH=y
  52 +
  53 +CONFIG_DM_USB=y
  54 +CONFIG_USB=y
  55 +CONFIG_USB_STORAGE=y
  56 +CONFIG_USB_GADGET=y
  57 +CONFIG_CMD_USB=y
  58 +CONFIG_CI_UDC=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 +
  64 +CONFIG_CMD_FASTBOOT=y
  65 +CONFIG_USB_FUNCTION_FASTBOOT=y
  66 +CONFIG_FSL_FASTBOOT=y
  67 +CONFIG_FASTBOOT=y
  68 +CONFIG_FASTBOOT_BUF_ADDR=0x12C00000
  69 +CONFIG_FASTBOOT_BUF_SIZE=0x40000000
  70 +CONFIG_FASTBOOT_FLASH=y
  71 +CONFIG_FASTBOOT_FLASH_MMC_DEV=1
  72 +CONFIG_EFI_PARTITION=y
configs/mx6solosabreauto_spinor_defconfig
Diff comments   View file @ d26dee0
... ... @@ -45,4 +45,25 @@
45 45 CONFIG_DM_REGULATOR_FIXED=y
46 46 CONFIG_DM_REGULATOR_GPIO=y
47 47 CONFIG_DM_ETH=y
  48 +
  49 +CONFIG_DM_USB=y
  50 +CONFIG_USB=y
  51 +CONFIG_USB_STORAGE=y
  52 +CONFIG_USB_GADGET=y
  53 +CONFIG_CMD_USB=y
  54 +CONFIG_CI_UDC=y
  55 +CONFIG_USB_GADGET_DOWNLOAD=y
  56 +CONFIG_USB_GADGET_MANUFACTURER="FSL"
  57 +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
  58 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
  59 +
  60 +CONFIG_CMD_FASTBOOT=y
  61 +CONFIG_USB_FUNCTION_FASTBOOT=y
  62 +CONFIG_FSL_FASTBOOT=y
  63 +CONFIG_FASTBOOT=y
  64 +CONFIG_FASTBOOT_BUF_ADDR=0x12C00000
  65 +CONFIG_FASTBOOT_BUF_SIZE=0x40000000
  66 +CONFIG_FASTBOOT_FLASH=y
  67 +CONFIG_FASTBOOT_FLASH_MMC_DEV=1
  68 +CONFIG_EFI_PARTITION=y
include/configs/mx6sabre_common.h
Diff comments   View file @ d26dee0
... ... @@ -59,6 +59,10 @@
59 59 "initrd_high=0xffffffff\0" \
60 60 "emmc_dev=2\0"\
61 61 "sd_dev=1\0" \
  62 + "weim_uboot=0x08001000\0"\
  63 + "weim_base=0x08000000\0"\
  64 + "spi_bus=1\0"\
  65 + "spi_uboot=0x400\0"
62 66  
63 67 #ifdef CONFIG_SUPPORT_EMMC_BOOT
64 68 #define EMMC_ENV \
include/configs/mx6slevk.h
Diff comments   View file @ d26dee0
... ... @@ -70,6 +70,8 @@
70 70 "initrd_high=0xffffffff\0" \
71 71 "emmc_dev=2\0"\
72 72 "sd_dev=1\0" \
  73 + "spi_bus=1\0"\
  74 + "spi_uboot=0x400\0"
73 75  
74 76 #define CONFIG_EXTRA_ENV_SETTINGS \
75 77 CONFIG_MFG_ENV_SETTINGS \