aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Hochstein <tom.hochstein@nxp.com>2021-04-08 07:29:49 -0500
committerOtavio Salvador <otavio@ossystems.com.br>2021-04-10 14:39:40 -0300
commit502b903c2a9947549e3564801d149e6455d54406 (patch)
tree893a721aff1f6d0c10b715661da7a05c99eaf3aa
parentfbad2da63ed7ef652e2fa0085faafd0945c09635 (diff)
downloadmeta-freescale-502b903c2a9947549e3564801d149e6455d54406.tar.gz
meta-freescale-502b903c2a9947549e3564801d149e6455d54406.tar.bz2
meta-freescale-502b903c2a9947549e3564801d149e6455d54406.zip
imx8dxl-lpddr4-evk: Rework machine for re-use
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
-rw-r--r--conf/machine/imx8dxl-lpddr4-evk.conf18
-rw-r--r--conf/machine/include/imx8dxl-evk.inc (renamed from conf/machine/imx8dxl-evk.conf)29
2 files changed, 30 insertions, 17 deletions
diff --git a/conf/machine/imx8dxl-lpddr4-evk.conf b/conf/machine/imx8dxl-lpddr4-evk.conf
new file mode 100644
index 00000000..1ea5260b
--- /dev/null
+++ b/conf/machine/imx8dxl-lpddr4-evk.conf
@@ -0,0 +1,18 @@
+#@TYPE: Machine
+#@NAME: i.MX 8DXL EVK with LPDDR4
+#@DESCRIPTION: i.MX 8DXLite Evaluation Kit with LPDDR4
+#@MAINTAINER: Lauren Post <lauren.post@nxp.com>
+
+require conf/machine/include/imx8dxl-evk.inc
+KERNEL_DEVICETREE_BASENAME = "imx8dxl-evk"
+KERNEL_DEVICETREE_append_use-nxp-bsp = " \
+ freescale/${KERNEL_DEVICETREE_BASENAME}-enet0.dtb \
+ freescale/${KERNEL_DEVICETREE_BASENAME}-enet0-tja1100.dtb \
+ freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \
+ freescale/${KERNEL_DEVICETREE_BASENAME}-lcdif.dtb \
+ freescale/${KERNEL_DEVICETREE_BASENAME}-lpspi-slave.dtb \
+ freescale/${KERNEL_DEVICETREE_BASENAME}-pcie-ep.dtb \
+ freescale/${KERNEL_DEVICETREE_BASENAME}-root.dtb \
+"
+UBOOT_CONFIG_BASENAME = "imx8dxl_evk"
+UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_fspi_defconfig"
diff --git a/conf/machine/imx8dxl-evk.conf b/conf/machine/include/imx8dxl-evk.inc
index d905f9de..2868b4d6 100644
--- a/conf/machine/imx8dxl-evk.conf
+++ b/conf/machine/include/imx8dxl-evk.inc
@@ -1,8 +1,3 @@
-#@TYPE: Machine
-#@NAME: i.MX 8DXL EVK
-#@DESCRIPTION: i.MX 8DXLite Evaluation Kit (EVK) board
-#@MAINTAINER: Lauren Post <lauren.post@nxp.com>
-
MACHINEOVERRIDES =. "mx8:mx8x:mx8dxl:"
require conf/machine/include/imx-base.inc
@@ -25,16 +20,11 @@ SERIAL_CONSOLES = "115200;ttyLP0"
# auto-serial-console there
USE_VT = "0"
-KERNEL_DEVICETREE = "freescale/imx8dxl-evk.dtb"
+KERNEL_DEVICETREE = " \
+ freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \
+"
KERNEL_DEVICETREE_append_use-nxp-bsp = " \
- freescale/imx8dxl-evk-enet0.dtb \
- freescale/imx8dxl-evk-enet0-tja1100.dtb \
- freescale/imx8dxl-evk-inmate.dtb \
- freescale/imx8dxl-evk-lcdif.dtb \
- freescale/imx8dxl-evk-lpspi-slave.dtb \
- freescale/imx8dxl-evk-pcie-ep.dtb \
- freescale/imx8dxl-evk-root.dtb \
- freescale/imx8dxl-evk-rpmsg.dtb \
+ freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \
"
ATF_PLATFORM = "imx8dxl"
@@ -49,8 +39,7 @@ SPL_BINARY = "spl/u-boot-spl.bin"
UBOOT_SUFFIX = "bin"
UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd] = "imx8dxl_evk_defconfig,sdcard"
-UBOOT_CONFIG[fspi] = "imx8dxl_evk_fspi_defconfig"
+UBOOT_CONFIG[sd] = "${UBOOT_CONFIG_BASENAME}_defconfig,sdcard"
IMX_BOOT_SEEK = "32"
@@ -60,8 +49,14 @@ IMXBOOT_TARGETS_SD = \
IMXBOOT_TARGETS_FSPI = \
"${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'flash_spl_flexspi', \
'flash_flexspi', d)}"
+IMXBOOT_TARGETS_NAND = \
+ "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'flash_spl_nand', \
+ 'flash_nand flash_nand_fw', d)}"
IMXBOOT_TARGETS = \
"${@bb.utils.contains('UBOOT_CONFIG', 'sd', '${IMXBOOT_TARGETS_SD}', \
- '${IMXBOOT_TARGETS_FSPI}', d)}"
+ bb.utils.contains('UBOOT_CONFIG', 'fspi', '${IMXBOOT_TARGETS_FSPI}', \
+ bb.utils.contains('UBOOT_CONFIG', 'nand', '${IMXBOOT_TARGETS_NAND}', \
+ 'INVALID', d), d), d)}"
+
BOARD_TYPE = "evk"