imx8mp-lpddr4-evk: Rework 8M Plus EVK config file

There are two variants of the 8M Plus Evaluation Kit board, one with
LPDDR4 and one with DDR4. Rework our existing config file to make
this distinction explicit in the machine config file name and to allow
for configuration re-use.

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

3 files changed, 102 insertions, 93 deletions

diff --git a/conf/machine/imx8mp-evk.conf b/conf/machine/imx8mp-evk.conf
deleted file mode 100644
index 8dbbe8d0..00000000
--- a/conf/machine/imx8mp-evk.conf
+++ /dev/null
@@ -1,93 +0,0 @@
-#@TYPE: Machine
-#@NAME: NXP i.MX 8M Plus EVK
-#@SOC: i.MX8MP
-#@DESCRIPTION: Machine configuration for NXP i.MX 8M Plus Evaluation Kit
-#@MAINTAINER: Jun Zhu <junzhu@nxp.com>
-
-MACHINEOVERRIDES =. "imx-boot-container:mx8:mx8m:mx8mp:"
-
-require conf/machine/include/imx-base.inc
-require conf/machine/include/tune-cortexa53.inc
-
-MACHINE_FEATURES += "pci wifi bluetooth jailhouse"
-
-# OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have
-# a full support for it yet.
-MACHINE_FEATURES_append_use-nxp-bsp = " optee mrvl8997"
-
-# Mainline kernel contains only one DTB file for
-# imx8mpevk machine
-KERNEL_DEVICETREE = "freescale/imx8mp-evk.dtb"
-
-# NXP kernel has additional DTB files for various board configuration and
-# derivates. Include them here for NXP BSP only
-KERNEL_DEVICETREE_append_use-nxp-bsp = " \
-        freescale/imx8mp-ab2.dtb \
-        freescale/imx8mp-evk-basler.dtb \
-        freescale/imx8mp-evk-basler-ov5640.dtb \
-        freescale/imx8mp-evk-dsp.dtb \
-        freescale/imx8mp-evk-dsp-lpa.dtb \
-        freescale/imx8mp-evk-dual-ov2775.dtb \
-        freescale/imx8mp-evk-flexcan2.dtb \
-        freescale/imx8mp-evk-inmate.dtb \
-        freescale/imx8mp-evk-it6263-lvds-dual-channel.dtb \
-        freescale/imx8mp-evk-jdi-wuxga-lvds-panel.dtb \
-        freescale/imx8mp-evk-ov2775.dtb \
-        freescale/imx8mp-evk-ov2775-ov5640.dtb \
-        freescale/imx8mp-evk-pcie-ep.dtb \
-        freescale/imx8mp-evk-rm67191.dtb \
-        freescale/imx8mp-evk-root.dtb \
-        freescale/imx8mp-evk-rpmsg.dtb \
-        freescale/imx8mp-evk-sof-wm8960.dtb \
-        freescale/imx8mp-evk-spdif-lb.dtb \
-"
-
-IMX_DEFAULT_BOOTLOADER_use-nxp-bsp = "u-boot-imx"
-IMX_DEFAULT_BOOTLOADER_use-mainline-bsp = "u-boot-fslc"
-
-UBOOT_SUFFIX = "bin"
-
-UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd]      = "imx8mp_evk_defconfig,sdcard"
-UBOOT_CONFIG[fspi]    = "imx8mp_evk_defconfig"
-UBOOT_CONFIG[ecc]     = "imx8mp_evk_inline_ecc_defconfig"
-UBOOT_CONFIG[mfgtool] = "imx8mp_evk_defconfig"
-
-SPL_BINARY = "spl/u-boot-spl.bin"
-
-# Set DDR FIRMWARE
-DDR_FIRMWARE_VERSION = "202006"
-DDR_FIRMWARE_NAME = " \
-        lpddr4_pmu_train_1d_dmem_${DDR_FIRMWARE_VERSION}.bin \
-        lpddr4_pmu_train_1d_imem_${DDR_FIRMWARE_VERSION}.bin \
-        lpddr4_pmu_train_2d_dmem_${DDR_FIRMWARE_VERSION}.bin \
-        lpddr4_pmu_train_2d_imem_${DDR_FIRMWARE_VERSION}.bin \
-"
-
-# Set u-boot DTB
-UBOOT_DTB_NAME = "imx8mp-evk.dtb"
-
-# Set ATF platform name and load address
-ATF_PLATFORM = "imx8mp"
-ATF_LOAD_ADDR = "0x970000"
-
-# Extra firmware package name, that is required to build boot container for fslc bsp
-IMX_EXTRA_FIRMWARE = "firmware-imx-8m"
-
-# Set imx-mkimage boot target
-IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_evk_flexspi', 'flash_evk', d)}"
-IMX_BOOT_SOC_TARGET = "iMX8MP"
-
-# Set Serial console
-SERIAL_CONSOLES = "115200;ttymxc1"
-
-LOADADDR = ""
-UBOOT_SUFFIX = "bin"
-UBOOT_MAKE_TARGET = "all"
-IMX_BOOT_SEEK = "32"
-
-OPTEE_BIN_EXT = "8mp"
-TEE_LOAD_ADDR = "0x56000000"
-
-# Add additional firmware
-MACHINE_FIRMWARE_append = " linux-firmware-ath10k"
diff --git a/conf/machine/imx8mp-lpddr4-evk.conf b/conf/machine/imx8mp-lpddr4-evk.conf
new file mode 100644
index 00000000..6484da7c
--- /dev/null
+++ b/conf/machine/imx8mp-lpddr4-evk.conf
@@ -0,0 +1,47 @@
+#@TYPE: Machine
+#@NAME: NXP i.MX 8M Plus EVK with LPDDR4
+#@SOC: i.MX8MP
+#@DESCRIPTION: Machine configuration for NXP i.MX 8M Plus Evaluation Kit with LPDDR4
+#@MAINTAINER: Jun Zhu <junzhu@nxp.com>
+
+require include/imx8mp-evk.inc
+
+# The device tree name is implicit for LPDDR4, so can't use MACHINE here
+KERNEL_DEVICETREE_BASENAME = "imx8mp-evk"
+
+# NXP kernel has additional DTB files for various board configuration and
+# derivates. Include them here for NXP BSP only
+KERNEL_DEVICETREE_append_use-nxp-bsp = " \
+        freescale/imx8mp-ab2.dtb \
+        freescale/imx8mp-evk-basler.dtb \
+        freescale/imx8mp-evk-basler-ov5640.dtb \
+        freescale/imx8mp-evk-dsp.dtb \
+        freescale/imx8mp-evk-dsp-lpa.dtb \
+        freescale/imx8mp-evk-dual-ov2775.dtb \
+        freescale/imx8mp-evk-flexcan2.dtb \
+        freescale/imx8mp-evk-inmate.dtb \
+        freescale/imx8mp-evk-it6263-lvds-dual-channel.dtb \
+        freescale/imx8mp-evk-jdi-wuxga-lvds-panel.dtb \
+        freescale/imx8mp-evk-ov2775.dtb \
+        freescale/imx8mp-evk-ov2775-ov5640.dtb \
+        freescale/imx8mp-evk-pcie-ep.dtb \
+        freescale/imx8mp-evk-rm67191.dtb \
+        freescale/imx8mp-evk-root.dtb \
+        freescale/imx8mp-evk-rpmsg.dtb \
+        freescale/imx8mp-evk-sof-wm8960.dtb \
+        freescale/imx8mp-evk-spdif-lb.dtb \
+"
+
+UBOOT_CONFIG_BASENAME = "imx8mp_evk"
+UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_defconfig"
+
+# Set DDR FIRMWARE
+DDR_FIRMWARE_VERSION = "202006"
+DDR_FIRMWARE_NAME = " \
+        lpddr4_pmu_train_1d_dmem_${DDR_FIRMWARE_VERSION}.bin \
+        lpddr4_pmu_train_1d_imem_${DDR_FIRMWARE_VERSION}.bin \
+        lpddr4_pmu_train_2d_dmem_${DDR_FIRMWARE_VERSION}.bin \
+        lpddr4_pmu_train_2d_imem_${DDR_FIRMWARE_VERSION}.bin \
+"
+
+IMXBOOT_TARGETS_BASENAME = "flash_evk"
diff --git a/conf/machine/include/imx8mp-evk.inc b/conf/machine/include/imx8mp-evk.inc
new file mode 100644
index 00000000..7da9f137
--- /dev/null
+++ b/conf/machine/include/imx8mp-evk.inc
@@ -0,0 +1,55 @@
+MACHINEOVERRIDES =. "imx-boot-container:mx8:mx8m:mx8mp:"
+
+require conf/machine/include/imx-base.inc
+require conf/machine/include/tune-cortexa53.inc
+
+MACHINE_FEATURES += "pci wifi bluetooth jailhouse"
+
+# OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have
+# a full support for it yet.
+MACHINE_FEATURES_append_use-nxp-bsp = " optee mrvl8997"
+
+# Mainline kernel contains only one DTB file for
+# imx8mpevk machine
+KERNEL_DEVICETREE = " \
+    freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \
+"
+
+UBOOT_DTB_NAME = "${KERNEL_DEVICETREE_BASENAME}.dtb"
+
+IMX_DEFAULT_BOOTLOADER_use-nxp-bsp = "u-boot-imx"
+IMX_DEFAULT_BOOTLOADER_use-mainline-bsp = "u-boot-fslc"
+
+UBOOT_SUFFIX = "bin"
+
+UBOOT_CONFIG ??= "sd"
+UBOOT_CONFIG[sd]      = "${UBOOT_CONFIG_BASENAME}_defconfig,sdcard"
+UBOOT_CONFIG[ecc]     = "${UBOOT_CONFIG_BASENAME}_inline_ecc_defconfig"
+UBOOT_CONFIG[mfgtool] = "${UBOOT_CONFIG_BASENAME}_defconfig"
+
+SPL_BINARY = "spl/u-boot-spl.bin"
+
+ATF_PLATFORM = "imx8mp"
+ATF_LOAD_ADDR = "0x970000"
+
+# Extra firmware package name, that is required to build boot container for fslc bsp
+IMX_EXTRA_FIRMWARE = "firmware-imx-8m"
+
+IMXBOOT_TARGETS = \
+    "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', '${IMXBOOT_TARGETS_BASENAME}_flexspi', \
+                                                  '${IMXBOOT_TARGETS_BASENAME}', d)}"
+
+IMX_BOOT_SOC_TARGET = "iMX8MP"
+
+SERIAL_CONSOLES = "115200;ttymxc1"
+
+LOADADDR = ""
+UBOOT_SUFFIX = "bin"
+UBOOT_MAKE_TARGET = ""
+IMX_BOOT_SEEK = "32"
+
+OPTEE_BIN_EXT = "8mp"
+TEE_LOAD_ADDR = "0x56000000"
+
+# Add additional firmware
+MACHINE_FIRMWARE_append = " linux-firmware-ath10k"