Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 4aea93d82dfec66e9ce8da9a5e5f0e288b6fac64

Authored by Ye Li
1 parent 161b715f72
Exists in smarc_8mq-imx_v2020.04_5.4.24_2.1.0 and in 3 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, smarc-8m-android-10.0.0_2.6.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0

MLK-20945-7 imx8qm/qxp: Add MEK FSPI configurations 

Add MEK FSPI configs to enable SPL SPI and NOR support for flexspi booting

Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit f303f969ebb0f525c413c47519725275d00025a1)

Showing 4 changed files with 286 additions and 1 deletions Side-by-side Diff

configs/imx8qm_mek_fspi_defconfig
Diff comments   View file @ 4aea93d
  1 +CONFIG_ARM=y
  2 +CONFIG_SPL_SYS_ICACHE_OFF=y
  3 +CONFIG_SPL_SYS_DCACHE_OFF=y
  4 +CONFIG_ARCH_IMX8=y
  5 +CONFIG_SYS_TEXT_BASE=0x80020000
  6 +CONFIG_SPL_LIBCOMMON_SUPPORT=y
  7 +CONFIG_SPL_LIBGENERIC_SUPPORT=y
  8 +CONFIG_SYS_MALLOC_F_LEN=0x8000
  9 +CONFIG_ENV_SIZE=0x2000
  10 +CONFIG_ENV_OFFSET=0x400000
  11 +CONFIG_DM_GPIO=y
  12 +CONFIG_SPL_LOAD_IMX_CONTAINER=y
  13 +CONFIG_IMX_CONTAINER_CFG="board/freescale/imx8qm_mek/uboot-container.cfg"
  14 +CONFIG_TARGET_IMX8QM_MEK=y
  15 +CONFIG_SPL_SPI_FLASH_SUPPORT=y
  16 +CONFIG_SPL_SPI_SUPPORT=y
  17 +CONFIG_SPL_SPI_LOAD=y
  18 +CONFIG_SPL_SPI_FLASH_TINY=y
  19 +CONFIG_SYS_SPI_U_BOOT_OFFS=0x200000
  20 +CONFIG_SPL_NOR_SUPPORT=y
  21 +CONFIG_SPL_EFI_PARTITION=n
  22 +CONFIG_SPL_DOS_PARTITION=n
  23 +CONFIG_SPL_DM_SEQ_ALIAS=y
  24 +CONFIG_SPL_SERIAL_SUPPORT=y
  25 +CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
  26 +CONFIG_SPL_ENV_IS_NOWHERE=y
  27 +CONFIG_USE_TINY_PRINTF=y
  28 +CONFIG_NR_DRAM_BANKS=4
  29 +CONFIG_SPL=y
  30 +CONFIG_PANIC_HANG=y
  31 +CONFIG_SPL_TEXT_BASE=0x100000
  32 +CONFIG_OF_SYSTEM_SETUP=y
  33 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qm_mek/imximage.cfg"
  34 +CONFIG_BOOTDELAY=3
  35 +CONFIG_LOG=y
  36 +CONFIG_SPL_BOARD_INIT=y
  37 +# CONFIG_SPL_SYS_MALLOC_SIMPLE is not set
  38 +CONFIG_SPL_SEPARATE_BSS=y
  39 +CONFIG_SPL_POWER_SUPPORT=y
  40 +CONFIG_SPL_POWER_DOMAIN=y
  41 +CONFIG_SPL_WATCHDOG_SUPPORT=y
  42 +CONFIG_HUSH_PARSER=y
  43 +CONFIG_CMD_CPU=y
  44 +# CONFIG_BOOTM_NETBSD is not set
  45 +# CONFIG_CMD_IMPORTENV is not set
  46 +CONFIG_CMD_CLK=y
  47 +CONFIG_CMD_DM=y
  48 +CONFIG_CMD_GPIO=y
  49 +CONFIG_CMD_I2C=y
  50 +CONFIG_CMD_MMC=y
  51 +CONFIG_CMD_DHCP=y
  52 +CONFIG_CMD_MII=y
  53 +CONFIG_CMD_PING=y
  54 +CONFIG_CMD_CACHE=y
  55 +CONFIG_CMD_FAT=y
  56 +CONFIG_SPL_OF_CONTROL=y
  57 +CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-mek"
  58 +CONFIG_ENV_IS_IN_MMC=y
  59 +CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  60 +CONFIG_NET_RANDOM_ETHADDR=y
  61 +CONFIG_SPL_DM=y
  62 +CONFIG_SPL_CLK=y
  63 +CONFIG_CLK_IMX8=y
  64 +CONFIG_CPU=y
  65 +CONFIG_MXC_GPIO=y
  66 +CONFIG_DM_PCA953X=y
  67 +CONFIG_DM_I2C=y
  68 +CONFIG_SYS_I2C_IMX_LPI2C=y
  69 +CONFIG_I2C_MUX=y
  70 +CONFIG_I2C_MUX_PCA954x=y
  71 +CONFIG_MISC=y
  72 +CONFIG_DM_MMC=y
  73 +CONFIG_SUPPORT_EMMC_BOOT=y
  74 +CONFIG_FSL_USDHC=y
  75 +CONFIG_MMC_IO_VOLTAGE=y
  76 +CONFIG_MMC_UHS_SUPPORT=y
  77 +CONFIG_MMC_HS400_SUPPORT=y
  78 +CONFIG_EFI_PARTITION=y
  79 +CONFIG_PHYLIB=y
  80 +CONFIG_PHY_ADDR_ENABLE=y
  81 +CONFIG_PHY_ATHEROS=y
  82 +CONFIG_DM_ETH=y
  83 +CONFIG_PHY_GIGE=y
  84 +CONFIG_FEC_MXC_SHARE_MDIO=y
  85 +CONFIG_FEC_MXC_MDIO_BASE=0x5B040000
  86 +CONFIG_FEC_MXC=y
  87 +CONFIG_MII=y
  88 +CONFIG_PINCTRL=y
  89 +CONFIG_SPL_PINCTRL=y
  90 +CONFIG_PINCTRL_IMX8=y
  91 +CONFIG_POWER_DOMAIN=y
  92 +CONFIG_IMX8_POWER_DOMAIN=y
  93 +CONFIG_DM_REGULATOR=y
  94 +CONFIG_DM_REGULATOR_FIXED=y
  95 +CONFIG_DM_REGULATOR_GPIO=y
  96 +CONFIG_DM_SERIAL=y
  97 +CONFIG_FSL_LPUART=y
  98 +CONFIG_SPL_TINY_MEMSET=y
  99 +# CONFIG_EFI_LOADER is not set
  100 +
  101 +CONFIG_CMD_FUSE=y
  102 +CONFIG_CMD_MEMTEST=y
  103 +
  104 +CONFIG_IMX_BOOTAUX=y
  105 +
  106 +CONFIG_DM_THERMAL=y
  107 +CONFIG_IMX_SCU_THERMAL=y
  108 +CONFIG_SPI=y
  109 +CONFIG_FSL_FSPI=y
  110 +CONFIG_DM_SPI=y
  111 +CONFIG_DM_SPI_FLASH=y
  112 +CONFIG_SPI_FLASH=y
  113 +CONFIG_SPI_FLASH_STMICRO=y
  114 +CONFIG_CMD_SF=y
  115 +CONFIG_SF_DEFAULT_BUS=0
  116 +CONFIG_SF_DEFAULT_CS=0
  117 +CONFIG_SF_DEFAULT_SPEED=40000000
  118 +CONFIG_SF_DEFAULT_MODE=0
  119 +
  120 +CONFIG_USB_XHCI_HCD=y
  121 +CONFIG_USB_XHCI_IMX8=y
  122 +CONFIG_DM_USB=y
  123 +CONFIG_DM_USB_GADGET=y
  124 +CONFIG_USB=y
  125 +CONFIG_USB_TCPC=y
  126 +CONFIG_USB_GADGET=y
  127 +CONFIG_USB_GADGET_DOWNLOAD=y
  128 +CONFIG_USB_GADGET_MANUFACTURER="FSL"
  129 +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
  130 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
  131 +CONFIG_USB_CDNS3=y
  132 +CONFIG_USB_CDNS3_GADGET=y
  133 +CONFIG_USB_GADGET_DUALSPEED=y
  134 +CONFIG_CDNS3_USB_PHY=y
  135 +CONFIG_PHY=y
configs/imx8qxp_mek_fspi_defconfig
Diff comments   View file @ 4aea93d
  1 +CONFIG_ARM=y
  2 +CONFIG_SPL_SYS_ICACHE_OFF=y
  3 +CONFIG_SPL_SYS_DCACHE_OFF=y
  4 +CONFIG_ARCH_IMX8=y
  5 +CONFIG_SYS_TEXT_BASE=0x80020000
  6 +CONFIG_SPL_LIBCOMMON_SUPPORT=y
  7 +CONFIG_SPL_LIBGENERIC_SUPPORT=y
  8 +CONFIG_SYS_MALLOC_F_LEN=0x8000
  9 +CONFIG_ENV_SIZE=0x2000
  10 +CONFIG_ENV_OFFSET=0x400000
  11 +CONFIG_DM_GPIO=y
  12 +CONFIG_SPL_LOAD_IMX_CONTAINER=y
  13 +CONFIG_IMX_CONTAINER_CFG="board/freescale/imx8qxp_mek/uboot-container.cfg"
  14 +CONFIG_TARGET_IMX8QXP_MEK=y
  15 +CONFIG_SPL_SPI_FLASH_SUPPORT=y
  16 +CONFIG_SPL_SPI_SUPPORT=y
  17 +CONFIG_SPL_SPI_LOAD=y
  18 +CONFIG_SPL_SPI_FLASH_TINY=y
  19 +CONFIG_SYS_SPI_U_BOOT_OFFS=0x200000
  20 +CONFIG_SPL_NOR_SUPPORT=y
  21 +CONFIG_SPL_EFI_PARTITION=n
  22 +CONFIG_SPL_DOS_PARTITION=n
  23 +CONFIG_SPL_DM_SEQ_ALIAS=y
  24 +CONFIG_SPL_SERIAL_SUPPORT=y
  25 +CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
  26 +CONFIG_SPL_ENV_IS_NOWHERE=y
  27 +CONFIG_USE_TINY_PRINTF=y
  28 +CONFIG_NR_DRAM_BANKS=4
  29 +CONFIG_SPL=y
  30 +CONFIG_PANIC_HANG=y
  31 +CONFIG_SPL_TEXT_BASE=0x100000
  32 +CONFIG_OF_SYSTEM_SETUP=y
  33 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qxp_mek/imximage.cfg"
  34 +CONFIG_BOOTDELAY=3
  35 +CONFIG_LOG=y
  36 +CONFIG_SPL_BOARD_INIT=y
  37 +# CONFIG_SPL_SYS_MALLOC_SIMPLE is not set
  38 +CONFIG_SPL_SEPARATE_BSS=y
  39 +CONFIG_SPL_POWER_SUPPORT=y
  40 +CONFIG_SPL_POWER_DOMAIN=y
  41 +CONFIG_SPL_WATCHDOG_SUPPORT=y
  42 +CONFIG_HUSH_PARSER=y
  43 +CONFIG_CMD_CPU=y
  44 +# CONFIG_BOOTM_NETBSD is not set
  45 +# CONFIG_CMD_IMPORTENV is not set
  46 +CONFIG_CMD_CLK=y
  47 +CONFIG_CMD_DM=y
  48 +CONFIG_CMD_GPIO=y
  49 +CONFIG_CMD_I2C=y
  50 +CONFIG_CMD_MMC=y
  51 +CONFIG_CMD_DHCP=y
  52 +CONFIG_CMD_MII=y
  53 +CONFIG_CMD_PING=y
  54 +CONFIG_CMD_CACHE=y
  55 +CONFIG_CMD_FAT=y
  56 +CONFIG_SPL_OF_CONTROL=y
  57 +CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-mek"
  58 +CONFIG_ENV_IS_IN_MMC=y
  59 +CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  60 +CONFIG_NET_RANDOM_ETHADDR=y
  61 +CONFIG_SPL_DM=y
  62 +CONFIG_SPL_CLK=y
  63 +CONFIG_CLK_IMX8=y
  64 +CONFIG_CPU=y
  65 +CONFIG_MXC_GPIO=y
  66 +CONFIG_DM_PCA953X=y
  67 +CONFIG_DM_I2C=y
  68 +CONFIG_SYS_I2C_IMX_LPI2C=y
  69 +CONFIG_I2C_MUX=y
  70 +CONFIG_I2C_MUX_PCA954x=y
  71 +CONFIG_MISC=y
  72 +CONFIG_DM_MMC=y
  73 +CONFIG_SUPPORT_EMMC_BOOT=y
  74 +CONFIG_FSL_USDHC=y
  75 +CONFIG_MMC_IO_VOLTAGE=y
  76 +CONFIG_MMC_UHS_SUPPORT=y
  77 +CONFIG_MMC_HS400_SUPPORT=y
  78 +CONFIG_EFI_PARTITION=y
  79 +CONFIG_PHYLIB=y
  80 +CONFIG_PHY_ADDR_ENABLE=y
  81 +CONFIG_PHY_ATHEROS=y
  82 +CONFIG_DM_ETH=y
  83 +CONFIG_PHY_GIGE=y
  84 +CONFIG_FEC_MXC_SHARE_MDIO=y
  85 +CONFIG_FEC_MXC_MDIO_BASE=0x5B040000
  86 +CONFIG_FEC_MXC=y
  87 +CONFIG_MII=y
  88 +CONFIG_PINCTRL=y
  89 +CONFIG_SPL_PINCTRL=y
  90 +CONFIG_PINCTRL_IMX8=y
  91 +CONFIG_POWER_DOMAIN=y
  92 +CONFIG_IMX8_POWER_DOMAIN=y
  93 +CONFIG_DM_REGULATOR=y
  94 +CONFIG_DM_REGULATOR_FIXED=y
  95 +CONFIG_DM_REGULATOR_GPIO=y
  96 +CONFIG_DM_SERIAL=y
  97 +CONFIG_FSL_LPUART=y
  98 +CONFIG_SPL_TINY_MEMSET=y
  99 +# CONFIG_EFI_LOADER is not set
  100 +
  101 +CONFIG_CMD_FUSE=y
  102 +CONFIG_SMC_FUSE=y
  103 +CONFIG_CMD_MEMTEST=y
  104 +
  105 +CONFIG_IMX_BOOTAUX=y
  106 +
  107 +CONFIG_DM_THERMAL=y
  108 +CONFIG_IMX_SCU_THERMAL=y
  109 +
  110 +CONFIG_SPI=y
  111 +CONFIG_FSL_FSPI=y
  112 +CONFIG_DM_SPI=y
  113 +CONFIG_DM_SPI_FLASH=y
  114 +CONFIG_SPI_FLASH=y
  115 +CONFIG_SPI_FLASH_STMICRO=y
  116 +CONFIG_CMD_SF=y
  117 +CONFIG_SF_DEFAULT_BUS=0
  118 +CONFIG_SF_DEFAULT_CS=0
  119 +CONFIG_SF_DEFAULT_SPEED=40000000
  120 +CONFIG_SF_DEFAULT_MODE=0
  121 +
  122 +CONFIG_USB_XHCI_HCD=y
  123 +CONFIG_USB_XHCI_IMX8=y
  124 +CONFIG_DM_USB=y
  125 +CONFIG_DM_USB_GADGET=y
  126 +CONFIG_USB=y
  127 +CONFIG_USB_TCPC=y
  128 +CONFIG_USB_GADGET=y
  129 +CONFIG_USB_GADGET_DOWNLOAD=y
  130 +CONFIG_USB_GADGET_MANUFACTURER="FSL"
  131 +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
  132 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
  133 +CONFIG_USB_CDNS3=y
  134 +CONFIG_USB_CDNS3_GADGET=y
  135 +CONFIG_USB_GADGET_DUALSPEED=y
  136 +CONFIG_CDNS3_USB_PHY=y
  137 +CONFIG_PHY=y
include/configs/imx8qm_mek.h
Diff comments   View file @ 4aea93d
... ... @@ -14,7 +14,14 @@
14 14 #define CONFIG_SYS_MONITOR_LEN (1024 * 1024)
15 15 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
16 16 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x1040 /* (flash.bin_offset + 2Mb)/sector_size */
17   -#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 0
  17 +
  18 +/*
  19 + * 0x08081000 - 0x08180FFF is for m4_0 xip image,
  20 + * 0x08181000 - 0x008280FFF is for m4_1 xip image
  21 + * So 3rd container image may start from 0x8281000
  22 + */
  23 +#define CONFIG_SYS_UBOOT_BASE 0x08281000
  24 +#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 0
18 25  
19 26 #define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/armv8/u-boot-spl.lds"
20 27 #define CONFIG_SPL_STACK 0x013fff0
include/configs/imx8qxp_mek.h
Diff comments   View file @ 4aea93d
... ... @@ -14,6 +14,12 @@
14 14 #define CONFIG_SYS_MONITOR_LEN (1024 * 1024)
15 15 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
16 16 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x1040 /* (32K + 2Mb)/sector_size */
  17 +
  18 +/*
  19 + * 0x08081000 - 0x08180FFF is for m4_0 xip image,
  20 + * So 3rd container image may start from 0x8181000
  21 + */
  22 +#define CONFIG_SYS_UBOOT_BASE 0x08181000
17 23 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 0
18 24  
19 25 #define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/armv8/u-boot-spl.lds"