imx6ulz-14x14-evk.conf: Add i.MX 6ULZ EVK board

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>

2 files changed, 46 insertions, 8 deletions

diff --git a/conf/machine/imx6ulz-14x14-evk.conf b/conf/machine/imx6ulz-14x14-evk.conf
new file mode 100644
index 000000000..12f64d48a
--- /dev/null
+++ b/conf/machine/imx6ulz-14x14-evk.conf
@@ -0,0 +1,33 @@
+#@TYPE: Machine
+#@NAME: NXP i.MX6ULZ 14x14 Evaluation Kit
+#@SOC: i.MX6ULZ
+#@DESCRIPTION: Machine configuration for NXP i.MX6ULZ 14x14 EVK
+#@MAINTAINER: Jun Zhu <junzhu@nxp.com>
+
+MACHINEOVERRIDES =. "mx6:mx6ul:mx6ull:mx6ulz:"
+
+include conf/machine/include/imx-base.inc
+include conf/machine/include/tune-cortexa7.inc
+
+MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455"
+
+KERNEL_DEVICETREE = " \
+    imx6ulz-14x14-evk.dtb \
+"
+KERNEL_DEVICETREE_append_use-nxp-bsp = " \
+    imx6ulz-14x14-evk-btwifi.dtb \
+    imx6ulz-14x14-evk-emmc.dtb \
+    imx6ulz-14x14-evk-gpmi-weim.dtb \
+"
+
+UBOOT_CONFIG ??= " \
+    sd \
+    ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \
+"
+UBOOT_CONFIG[sd]       = "mx6ulz_14x14_evk_config,sdcard"
+UBOOT_CONFIG[sd-optee] = "mx6ulz_14x14_evk_optee_config,sdcard"
+UBOOT_CONFIG[emmc]     = "mx6ulz_14x14_evk_emmc_config,sdcard"
+UBOOT_CONFIG[nand]     = "mx6ulz_14x14_evk_nand_config,ubifs"
+UBOOT_CONFIG[qspi1]    = "mx6ulz_14x14_evk_qspi1_config"
+
+OPTEE_BIN_EXT = "6ulzevk"
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 868cd801a..23175318a 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -41,16 +41,17 @@ UBOOT_SUFFIX ?= "imx"
 UBOOT_SUFFIX_mxs ?= "sb"
 UBOOT_SUFFIX_mx8 ?= "bin"
 
-UBOOT_ENTRYPOINT_mxs = "0x40008000"
-UBOOT_ENTRYPOINT_mx51  = "0x90008000"
-UBOOT_ENTRYPOINT_mx53  = "0x70008000"
-UBOOT_ENTRYPOINT_mx6  = "0x10008000"
-UBOOT_ENTRYPOINT_mx6sl = "0x80008000"
+UBOOT_ENTRYPOINT_mxs    = "0x40008000"
+UBOOT_ENTRYPOINT_mx51   = "0x90008000"
+UBOOT_ENTRYPOINT_mx53   = "0x70008000"
+UBOOT_ENTRYPOINT_mx6    = "0x10008000"
+UBOOT_ENTRYPOINT_mx6sl  = "0x80008000"
 UBOOT_ENTRYPOINT_mx6sll = "0x80008000"
-UBOOT_ENTRYPOINT_mx6sx = "0x80008000"
+UBOOT_ENTRYPOINT_mx6sx  = "0x80008000"
 UBOOT_ENTRYPOINT_mx6ul  = "0x10008000"
-UBOOT_ENTRYPOINT_mx6ull  = "0x10008000"
-UBOOT_ENTRYPOINT_mx7 = "0x80008000"
+UBOOT_ENTRYPOINT_mx6ull = "0x10008000"
+UBOOT_ENTRYPOINT_mx6ulz = "0x10008000"
+UBOOT_ENTRYPOINT_mx7    = "0x80008000"
 UBOOT_ENTRYPOINT_mx7ulp = "0x60008000"
 UBOOT_ENTRYPOINT_mx8m   = "0x40480000"
 UBOOT_ENTRYPOINT_vf = "0x80008000"
@@ -78,6 +79,7 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
 DEFAULTTUNE_mx6    ?= "cortexa9thf-neon"
 DEFAULTTUNE_mx6ul  ?= "cortexa7thf-neon"
 DEFAULTTUNE_mx6ull ?= "cortexa7thf-neon"
+DEFAULTTUNE_mx6ulz ?= "cortexa7thf-neon"
 DEFAULTTUNE_mx7    ?= "cortexa7thf-neon"
 DEFAULTTUNE_vf     ?= "cortexa5thf-neon"
 
@@ -95,6 +97,7 @@ MACHINEOVERRIDES_EXTENDER_mx6sl  = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxepdc"
 MACHINEOVERRIDES_EXTENDER_mx6sll = "imxfbdev:imxpxp:imxepdc"
 MACHINEOVERRIDES_EXTENDER_mx6ul  = "imxfbdev:imxpxp"
 MACHINEOVERRIDES_EXTENDER_mx6ull = "imxfbdev:imxpxp:imxepdc"
+MACHINEOVERRIDES_EXTENDER_mx6ulz = "imxfbdev:imxpxp:imxepdc"
 MACHINEOVERRIDES_EXTENDER_mx7d   = "imxfbdev:imxpxp:imxepdc"
 MACHINEOVERRIDES_EXTENDER_mx7ulp = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d"
 MACHINEOVERRIDES_EXTENDER_mx8qm  = "imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d"
@@ -115,6 +118,7 @@ MACHINEOVERRIDES_EXTENDER_FILTER_OUT_use-mainline-bsp = " \
     mx6sll \
     mx6ul \
     mx6ull \
+    mx6ulz \
     \
     mx7 \
     mx7d \
@@ -143,6 +147,7 @@ MACHINE_SOCARCH_SUFFIX_vf60 = "-vf60"
 MACHINE_SOCARCH_SUFFIX_vf50 = "-vf50"
 MACHINE_SOCARCH_SUFFIX_mx6ul  = "-mx6ul"
 MACHINE_SOCARCH_SUFFIX_mx6ull = "-mx6ul"
+MACHINE_SOCARCH_SUFFIX_mx6ulz = "-mx6ul"
 MACHINE_SOCARCH_SUFFIX_mx8qm  = "-mx8"
 MACHINE_SOCARCH_SUFFIX_mx8mm  = "-mx8mm"
 MACHINE_SOCARCH_SUFFIX_mx8mn  = "-mx8mn"