Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 7c4ed06c09c4bfd93a7be426816549ce5363f1b1

Authored by Ye Li
1 parent c41050e26a
Exists in smarc-n7.1.2_2.0.0-ga and in 4 other branches smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m

MLK-14375-2 mx6ullevk: Add DTS and build configuration for various boot devices 

To support boot from QSPI/NAND/eMMC, add relevant DTS files and
build configurations.

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

Showing 6 changed files with 213 additions and 0 deletions Side-by-side Diff

arch/arm/dts/Makefile
Diff comments   View file @ 7c4ed06
... ... @@ -310,6 +310,8 @@
310 310 dtb-$(CONFIG_MX53) += imx53-cx9020.dtb
311 311  
312 312 dtb-$(CONFIG_MX6) += imx6ull-14x14-evk.dtb \
  313 + imx6ull-14x14-evk-emmc.dtb \
  314 + imx6ull-14x14-evk-gpmi-weim.dtb \
313 315 imx6sll-evk.dtb \
314 316 imx6dl-icore.dtb \
315 317 imx6dl-icore-rqs.dtb \
arch/arm/dts/imx6ull-14x14-evk-emmc.dts
Diff comments   View file @ 7c4ed06
  1 +/*
  2 + * Copyright (C) 2016 Freescale Semiconductor, Inc.
  3 + *
  4 + * This program is free software; you can redistribute it and/or modify
  5 + * it under the terms of the GNU General Public License version 2 as
  6 + * published by the Free Software Foundation.
  7 + */
  8 +
  9 +#include "imx6ull-14x14-evk.dts"
  10 +
  11 +&usdhc2 {
  12 + pinctrl-names = "default", "state_100mhz", "state_200mhz";
  13 + pinctrl-0 = <&pinctrl_usdhc2_8bit>;
  14 + pinctrl-1 = <&pinctrl_usdhc2_8bit_100mhz>;
  15 + pinctrl-2 = <&pinctrl_usdhc2_8bit_200mhz>;
  16 + bus-width = <8>;
  17 + non-removable;
  18 + status = "okay";
  19 +};
arch/arm/dts/imx6ull-14x14-evk-gpmi-weim.dts
Diff comments   View file @ 7c4ed06
  1 +/*
  2 + * Copyright (C) 2016 Freescale Semiconductor, Inc.
  3 + *
  4 + * This program is free software; you can redistribute it and/or modify
  5 + * it under the terms of the GNU General Public License version 2 as
  6 + * published by the Free Software Foundation.
  7 + */
  8 +
  9 +#include "imx6ull-14x14-evk.dts"
  10 +
  11 +&gpmi {
  12 + pinctrl-names = "default";
  13 + pinctrl-0 = <&pinctrl_gpmi_nand_1>;
  14 + status = "okay";
  15 + nand-on-flash-bbt;
  16 +};
  17 +
  18 +&iomuxc {
  19 + imx6ull-evk-gpmi-rework {
  20 + pinctrl_gpmi_nand_1: gpmi-nand-1 {
  21 + fsl,pins = <
  22 + MX6UL_PAD_NAND_CLE__RAWNAND_CLE 0xb0b1
  23 + MX6UL_PAD_NAND_ALE__RAWNAND_ALE 0xb0b1
  24 + MX6UL_PAD_NAND_WP_B__RAWNAND_WP_B 0xb0b1
  25 + MX6UL_PAD_NAND_READY_B__RAWNAND_READY_B 0xb000
  26 + MX6UL_PAD_NAND_CE0_B__RAWNAND_CE0_B 0xb0b1
  27 + MX6UL_PAD_NAND_CE1_B__RAWNAND_CE1_B 0xb0b1
  28 + MX6UL_PAD_NAND_RE_B__RAWNAND_RE_B 0xb0b1
  29 + MX6UL_PAD_NAND_WE_B__RAWNAND_WE_B 0xb0b1
  30 + MX6UL_PAD_NAND_DATA00__RAWNAND_DATA00 0xb0b1
  31 + MX6UL_PAD_NAND_DATA01__RAWNAND_DATA01 0xb0b1
  32 + MX6UL_PAD_NAND_DATA02__RAWNAND_DATA02 0xb0b1
  33 + MX6UL_PAD_NAND_DATA03__RAWNAND_DATA03 0xb0b1
  34 + MX6UL_PAD_NAND_DATA04__RAWNAND_DATA04 0xb0b1
  35 + MX6UL_PAD_NAND_DATA05__RAWNAND_DATA05 0xb0b1
  36 + MX6UL_PAD_NAND_DATA06__RAWNAND_DATA06 0xb0b1
  37 + MX6UL_PAD_NAND_DATA07__RAWNAND_DATA07 0xb0b1
  38 + >;
  39 + };
  40 + };
  41 +};
  42 +
  43 +&qspi {
  44 + status = "disabled";
  45 +};
  46 +
  47 +&usdhc2 {
  48 + status = "disabled";
  49 +};
configs/mx6ull_14x14_evk_emmc_defconfig
Diff comments   View file @ 7c4ed06
  1 +CONFIG_ARM=y
  2 +CONFIG_ARCH_MX6=y
  3 +CONFIG_TARGET_MX6ULL_14X14_EVK=y
  4 +CONFIG_VIDEO=y
  5 +CONFIG_DEFAULT_DEVICE_TREE="imx6ull-14x14-evk-emmc"
  6 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6ullevk/imximage.cfg"
  7 +CONFIG_BOOTDELAY=3
  8 +CONFIG_BOARD_EARLY_INIT_F=y
  9 +CONFIG_HUSH_PARSER=y
  10 +CONFIG_CMD_BOOTZ=y
  11 +# CONFIG_CMD_IMLS is not set
  12 +CONFIG_CMD_MEMTEST=y
  13 +CONFIG_CMD_MMC=y
  14 +CONFIG_CMD_SF=y
  15 +CONFIG_CMD_USB=y
  16 +CONFIG_CMD_I2C=y
  17 +CONFIG_CMD_GPIO=y
  18 +CONFIG_CMD_DHCP=y
  19 +CONFIG_CMD_PING=y
  20 +CONFIG_CMD_CACHE=y
  21 +CONFIG_CMD_NET=y
  22 +CONFIG_CMD_EXT2=y
  23 +CONFIG_CMD_EXT4=y
  24 +CONFIG_CMD_EXT4_WRITE=y
  25 +CONFIG_CMD_FAT=y
  26 +CONFIG_CMD_FS_GENERIC=y
  27 +CONFIG_OF_CONTROL=y
  28 +# CONFIG_BLK is not set
  29 +CONFIG_DM_GPIO=y
  30 +CONFIG_DM_74X164=y
  31 +CONFIG_DM_I2C=y
  32 +CONFIG_DM_MMC=y
  33 +CONFIG_DM_SPI=y
  34 +CONFIG_DM_SPI_FLASH=y
  35 +CONFIG_SPI_FLASH=y
  36 +CONFIG_SPI_FLASH_BAR=y
  37 +CONFIG_SPI_FLASH_STMICRO=y
  38 +# CONFIG_DM_MMC_OPS is not set
  39 +CONFIG_PINCTRL=y
  40 +CONFIG_PINCTRL_IMX6=y
  41 +CONFIG_DM_REGULATOR=y
  42 +CONFIG_DM_REGULATOR_FIXED=y
  43 +CONFIG_DM_REGULATOR_GPIO=y
  44 +CONFIG_USB=y
  45 +CONFIG_DM_USB=y
  46 +CONFIG_USB_EHCI_HCD=y
  47 +CONFIG_USB_STORAGE=y
  48 +CONFIG_FSL_QSPI=y
  49 +CONFIG_DM_ETH=y
configs/mx6ull_14x14_evk_nand_defconfig
Diff comments   View file @ 7c4ed06
  1 +CONFIG_ARM=y
  2 +CONFIG_ARCH_MX6=y
  3 +CONFIG_TARGET_MX6ULL_14X14_EVK=y
  4 +CONFIG_VIDEO=y
  5 +CONFIG_DEFAULT_DEVICE_TREE="imx6ull-14x14-evk-gpmi-weim"
  6 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6ullevk/imximage.cfg"
  7 +CONFIG_NAND_BOOT=y
  8 +CONFIG_BOOTDELAY=3
  9 +CONFIG_BOARD_EARLY_INIT_F=y
  10 +CONFIG_HUSH_PARSER=y
  11 +CONFIG_CMD_BOOTZ=y
  12 +# CONFIG_CMD_IMLS is not set
  13 +CONFIG_CMD_MEMTEST=y
  14 +CONFIG_CMD_MMC=y
  15 +CONFIG_CMD_USB=y
  16 +CONFIG_CMD_I2C=y
  17 +CONFIG_CMD_GPIO=y
  18 +CONFIG_CMD_DHCP=y
  19 +CONFIG_CMD_PING=y
  20 +CONFIG_CMD_CACHE=y
  21 +CONFIG_CMD_NET=y
  22 +CONFIG_CMD_EXT2=y
  23 +CONFIG_CMD_EXT4=y
  24 +CONFIG_CMD_EXT4_WRITE=y
  25 +CONFIG_CMD_FAT=y
  26 +CONFIG_CMD_FS_GENERIC=y
  27 +CONFIG_OF_CONTROL=y
  28 +# CONFIG_BLK is not set
  29 +CONFIG_DM_GPIO=y
  30 +CONFIG_DM_74X164=y
  31 +CONFIG_DM_I2C=y
  32 +CONFIG_DM_MMC=y
  33 +CONFIG_DM_SPI=y
  34 +# CONFIG_DM_MMC_OPS is not set
  35 +CONFIG_PINCTRL=y
  36 +CONFIG_PINCTRL_IMX6=y
  37 +CONFIG_DM_REGULATOR=y
  38 +CONFIG_DM_REGULATOR_FIXED=y
  39 +CONFIG_DM_REGULATOR_GPIO=y
  40 +CONFIG_USB=y
  41 +CONFIG_DM_USB=y
  42 +CONFIG_USB_EHCI_HCD=y
  43 +CONFIG_USB_STORAGE=y
  44 +CONFIG_DM_ETH=y
configs/mx6ull_14x14_evk_qspi1_defconfig
Diff comments   View file @ 7c4ed06
  1 +CONFIG_ARM=y
  2 +CONFIG_ARCH_MX6=y
  3 +CONFIG_TARGET_MX6ULL_14X14_EVK=y
  4 +CONFIG_VIDEO=y
  5 +CONFIG_DEFAULT_DEVICE_TREE="imx6ull-14x14-evk"
  6 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6ullevk/imximage.cfg"
  7 +CONFIG_QSPI_BOOT=y
  8 +CONFIG_BOOTDELAY=3
  9 +CONFIG_BOARD_EARLY_INIT_F=y
  10 +CONFIG_HUSH_PARSER=y
  11 +CONFIG_CMD_BOOTZ=y
  12 +# CONFIG_CMD_IMLS is not set
  13 +CONFIG_CMD_MEMTEST=y
  14 +CONFIG_CMD_MMC=y
  15 +CONFIG_CMD_SF=y
  16 +CONFIG_CMD_USB=y
  17 +CONFIG_CMD_I2C=y
  18 +CONFIG_CMD_GPIO=y
  19 +CONFIG_CMD_DHCP=y
  20 +CONFIG_CMD_PING=y
  21 +CONFIG_CMD_CACHE=y
  22 +CONFIG_CMD_NET=y
  23 +CONFIG_CMD_EXT2=y
  24 +CONFIG_CMD_EXT4=y
  25 +CONFIG_CMD_EXT4_WRITE=y
  26 +CONFIG_CMD_FAT=y
  27 +CONFIG_CMD_FS_GENERIC=y
  28 +CONFIG_OF_CONTROL=y
  29 +# CONFIG_BLK is not set
  30 +CONFIG_DM_GPIO=y
  31 +CONFIG_DM_74X164=y
  32 +CONFIG_DM_I2C=y
  33 +CONFIG_DM_MMC=y
  34 +CONFIG_DM_SPI=y
  35 +CONFIG_DM_SPI_FLASH=y
  36 +CONFIG_SPI_FLASH=y
  37 +CONFIG_SPI_FLASH_BAR=y
  38 +CONFIG_SPI_FLASH_STMICRO=y
  39 +# CONFIG_DM_MMC_OPS is not set
  40 +CONFIG_PINCTRL=y
  41 +CONFIG_PINCTRL_IMX6=y
  42 +CONFIG_DM_REGULATOR=y
  43 +CONFIG_DM_REGULATOR_FIXED=y
  44 +CONFIG_DM_REGULATOR_GPIO=y
  45 +CONFIG_USB=y
  46 +CONFIG_DM_USB=y
  47 +CONFIG_USB_EHCI_HCD=y
  48 +CONFIG_USB_STORAGE=y
  49 +CONFIG_FSL_QSPI=y
  50 +CONFIG_DM_ETH=y