Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 1d293e6804fe077853636b0517ef00609299936e

Authored by Peng Fan
Committed by Stefano Babic
1 parent 81ae46c2e6
Exists in smarc_8mq_lf_v2020.04 and in 9 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

imx: add i.MX6ULZ board 

Add i.MX6ULZ board support. the i.MX6ULZ is SW compatible
with i.MX6ULL. so most code of i.MX6ULL can be reused
by i.MX6ULZ.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Fabio Estevam <festevam@gmail.com>

Showing 5 changed files with 87 additions and 3 deletions Side-by-side Diff

arch/arm/dts/imx6ulz-14x14-evk.dts
Diff comments   View file @ 1d293e6
  1 +// SPDX-License-Identifier: (GPL-2.0 OR MIT)
  2 +//
  3 +// Copyright 2018 NXP.
  4 +
  5 +/dts-v1/;
  6 +
  7 +#include "imx6ulz.dtsi"
  8 +#include "imx6ul-14x14-evk.dtsi"
  9 +
  10 +/delete-node/ &fec1;
  11 +/delete-node/ &fec2;
  12 +/delete-node/ &can1;
  13 +/delete-node/ &can2;
  14 +/delete-node/ &lcdif;
  15 +/delete-node/ &tsc;
  16 +
  17 +/ {
  18 + model = "Freescale i.MX6 ULZ 14x14 EVK Board";
  19 + compatible = "fsl,imx6ulz-14x14-evk", "fsl,imx6ull", "fsl,imx6ulz";
  20 +
  21 + /delete-node/ panel;
  22 +};
board/freescale/mx6ullevk/MAINTAINERS
Diff comments   View file @ 1d293e6
... ... @@ -5,4 +5,5 @@
5 5 F: include/configs/mx6ullevk.h
6 6 F: configs/mx6ull_14x14_evk_defconfig
7 7 F: configs/mx6ull_14x14_evk_plugin_defconfig
  8 +F: configs/mx6ulz_14x14_evk_defconfig
board/freescale/mx6ullevk/mx6ullevk.c
Diff comments   View file @ 1d293e6
... ... @@ -84,7 +84,10 @@
84 84 #endif
85 85  
86 86 #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
87   - env_set("board_name", "EVK");
  87 + if (is_cpu_type(MXC_CPU_MX6ULZ))
  88 + env_set("board_name", "ULZ-EVK");
  89 + else
  90 + env_set("board_name", "EVK");
88 91 env_set("board_rev", "14X14");
89 92 #endif
90 93  
... ... @@ -93,7 +96,10 @@
93 96  
94 97 int checkboard(void)
95 98 {
96   - puts("Board: MX6ULL 14x14 EVK\n");
  99 + if (is_cpu_type(MXC_CPU_MX6ULZ))
  100 + puts("Board: MX6ULZ 14x14 EVK\n");
  101 + else
  102 + puts("Board: MX6ULL 14x14 EVK\n");
97 103  
98 104 return 0;
99 105 }
configs/mx6ulz_14x14_evk_defconfig
Diff comments   View file @ 1d293e6
  1 +CONFIG_ARM=y
  2 +CONFIG_ARCH_MX6=y
  3 +CONFIG_SYS_TEXT_BASE=0x87800000
  4 +CONFIG_TARGET_MX6ULL_14X14_EVK=y
  5 +CONFIG_NR_DRAM_BANKS=1
  6 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6ullevk/imximage.cfg"
  7 +CONFIG_SUPPORT_RAW_INITRD=y
  8 +CONFIG_BOUNCE_BUFFER=y
  9 +CONFIG_BOARD_EARLY_INIT_F=y
  10 +CONFIG_HUSH_PARSER=y
  11 +CONFIG_CMD_BOOTZ=y
  12 +CONFIG_CMD_MEMTEST=y
  13 +CONFIG_CMD_GPIO=y
  14 +CONFIG_CMD_I2C=y
  15 +CONFIG_CMD_MMC=y
  16 +CONFIG_CMD_SF=y
  17 +CONFIG_CMD_DHCP=y
  18 +CONFIG_CMD_PING=y
  19 +CONFIG_CMD_CACHE=y
  20 +CONFIG_CMD_EXT2=y
  21 +CONFIG_CMD_EXT4=y
  22 +CONFIG_CMD_EXT4_WRITE=y
  23 +CONFIG_CMD_FAT=y
  24 +CONFIG_CMD_FS_GENERIC=y
  25 +CONFIG_OF_CONTROL=y
  26 +CONFIG_DEFAULT_DEVICE_TREE="imx6ulz-14x14-evk"
  27 +CONFIG_ENV_IS_IN_MMC=y
  28 +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
  29 +CONFIG_DM_GPIO=y
  30 +CONFIG_DM_74X164=y
  31 +CONFIG_DM_I2C=y
  32 +CONFIG_DM_MMC=y
  33 +CONFIG_FSL_ESDHC_IMX=y
  34 +CONFIG_DM_SPI_FLASH=y
  35 +CONFIG_SPI_FLASH=y
  36 +CONFIG_SF_DEFAULT_MODE=0
  37 +CONFIG_SF_DEFAULT_SPEED=40000000
  38 +CONFIG_SPI_FLASH_STMICRO=y
  39 +CONFIG_PINCTRL=y
  40 +CONFIG_PINCTRL_IMX6=y
  41 +CONFIG_DM_REGULATOR=y
  42 +CONFIG_SPI=y
  43 +CONFIG_DM_SPI=y
  44 +CONFIG_FSL_QSPI=y
include/configs/mx6ullevk.h
Diff comments   View file @ 1d293e6
... ... @@ -55,7 +55,7 @@
55 55 "console=ttymxc0\0" \
56 56 "fdt_high=0xffffffff\0" \
57 57 "initrd_high=0xffffffff\0" \
58   - "fdt_file=imx6ull-14x14-evk.dtb\0" \" \
  58 + "fdt_file=undefined\0" \" \
59 59 "fdt_addr=0x83000000\0" \
60 60 "boot_fdt=try\0" \
61 61 "ip_dyn=yes\0" \
... ... @@ -87,6 +87,16 @@
87 87 "else " \
88 88 "bootz; " \
89 89 "fi;\0" \
  90 + "findfdt="\
  91 + "if test $fdt_file = undefined; then " \
  92 + "if test $board_name = ULZ-EVK && test $board_rev = 14X14; then " \
  93 + "setenv fdt_file imx6ulz-14x14-evk.dtb; fi; " \
  94 + "if test $board_name = EVK && test $board_rev = 14X14; then " \
  95 + "setenv fdt_file imx6ull-14x14-evk.dtb; fi; " \
  96 + "if test $fdt_file = undefined; then " \
  97 + "echo WARNING: Could not determine dtb to use; " \
  98 + "fi; " \
  99 + "fi;\0" \
90 100 "netargs=setenv bootargs console=${console},${baudrate} " \
91 101 "root=/dev/nfs " \
92 102 "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
... ... @@ -113,6 +123,7 @@
113 123 "fi;\0" \
114 124  
115 125 #define CONFIG_BOOTCOMMAND \
  126 + "run findfdt;" \
116 127 "mmc dev ${mmcdev};" \
117 128 "mmc dev ${mmcdev}; if mmc rescan; then " \
118 129 "if run loadbootscript; then " \