3 files changed, 71 insertions, 76 deletions

diff --git a/conf/machine/imx8mn-ddr4-evk.conf b/conf/machine/imx8mn-ddr4-evk.conf
new file mode 100644
index 00000000..c35f7e74
--- /dev/null
+++ b/conf/machine/imx8mn-ddr4-evk.conf
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@NAME: NXP i.MX 8M Nano Evaluation Kit with DDR4
+#@SOC: i.MX8MM
+#@DESCRIPTION: Machine configuration for NXP i.MX 8M Nano EVK with DDR4
+#@MAINTAINER: Andrey Zhizhikin <andrey.z@gmail.com>
+
+require include/imx8mn-evk.inc
+
+KERNEL_DEVICETREE_BASENAME = "${MACHINE}"
+KERNEL_DEVICETREE_append_use-nxp-bsp = " \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-usd-wifi.dtb \
+"
+UBOOT_CONFIG_BASENAME = "imx8mn_ddr4_evk"
+DDR_FIRMWARE_NAME = " \
+    ddr4_imem_1d_201810.bin \
+    ddr4_dmem_1d_201810.bin \
+    ddr4_imem_2d_201810.bin \
+    ddr4_dmem_2d_201810.bin \
+"
+IMXBOOT_TARGETS_BASENAME = "flash_ddr4_evk"
diff --git a/conf/machine/imx8mnevk.conf b/conf/machine/imx8mnevk.conf
deleted file mode 100644
index 1571e9f4..00000000
--- a/conf/machine/imx8mnevk.conf
+++ /dev/null
@@ -1,76 +0,0 @@
-#@TYPE: Machine
-#@NAME: NXP i.MX8M Nano DDR4 Evaluation Kit
-#@SOC: i.MX8MM
-#@DESCRIPTION: Machine configuration for NXP i.MX8M Nano DDR4 EVK
-#@MAINTAINER: Andrey Zhizhikin <andrey.z@gmail.com>
-
-MACHINEOVERRIDES =. "mx8:mx8m:mx8mn:"
-
-require conf/machine/include/imx-base.inc
-require conf/machine/include/tune-cortexa53.inc
-
-MACHINE_FEATURES += "wifi bluetooth optee bcm43455 bcm4356"
-
-# NXP BSP can consume proprietary jailhouse and Broadcom drivers
-MACHINE_FEATURES_append_use-nxp-bsp = " jailhouse bcm4359"
-
-# Mainline kernel contains only two DTB file for
-# imx8mnevk machine
-KERNEL_DEVICETREE = " \
-        freescale/imx8mn-ddr4-evk.dtb \
-        freescale/imx8mn-evk.dtb \
-"
-
-KERNEL_DEVICETREE_append_use-nxp-bsp = " \
-        freescale/imx8mn-ddr4-evk-ak5558.dtb \
-        freescale/imx8mn-ddr4-evk-inmate.dtb \
-        freescale/imx8mn-ddr4-evk-rm67191.dtb \
-        freescale/imx8mn-ddr4-evk-root.dtb \
-        freescale/imx8mn-ddr4-evk-rpmsg.dtb \
-        freescale/imx8mn-ddr4-evk-usd-wifi.dtb \
-        freescale/imx8mn-evk-ak5558.dtb \
-        freescale/imx8mn-evk-inmate.dtb \
-        freescale/imx8mn-evk-rm67191.dtb \
-        freescale/imx8mn-evk-root.dtb \
-        freescale/imx8mn-evk-rpmsg.dtb \
-        freescale/imx8mn-evk-8mic-revE.dtb \
-"
-
-UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd]      = "imx8mn_ddr4_evk_defconfig,sdcard"
-UBOOT_CONFIG[mfgtool] = "imx8mn_ddr4_evk_defconfig"
-SPL_BINARY = "spl/u-boot-spl.bin"
-
-# Set DDR FIRMWARE
-DDR_FIRMWARE_NAME = "ddr4_imem_1d_201810.bin \
-                     ddr4_dmem_1d_201810.bin \
-                     ddr4_imem_2d_201810.bin \
-                     ddr4_dmem_2d_201810.bin"
-
-# Set u-boot DTB
-UBOOT_DTB_NAME = "imx8mn-ddr4-evk.dtb"
-
-# Set ATF platform name
-ATF_PLATFORM = "imx8mn"
-
-# Set imx-mkimage boot target
-IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_ddr4_evk_flexspi', 'flash_ddr4_evk', d)}"
-IMX_BOOT_SOC_TARGET = "iMX8MN"
-
-# Set Serial console
-SERIAL_CONSOLES = "115200;ttymxc1"
-
-BOOT_SPACE = "65536"
-LOADADDR = ""
-UBOOT_SUFFIX = "bin"
-UBOOT_MAKE_TARGET = ""
-
-# Image boot offset as defined in section 6.1.6.1 "Primary image offset and IVT offset" of
-# i.MX 8M Nano Applications Processor Reference Manual, Rev. 0, 12/2019
-# Doc ID: IMX8MNRM
-IMX_BOOT_SEEK = "32"
-
-OPTEE_BIN_EXT = "8mn"
-
-# Add additional firmware
-MACHINE_FIRMWARE_append = " linux-firmware-ath10k"
diff --git a/conf/machine/include/imx8mn-evk.inc b/conf/machine/include/imx8mn-evk.inc
new file mode 100644
index 00000000..8e68f2fe
--- /dev/null
+++ b/conf/machine/include/imx8mn-evk.inc
@@ -0,0 +1,51 @@
+MACHINEOVERRIDES =. "mx8:mx8m:mx8mn:"
+
+require conf/machine/include/imx-base.inc
+require conf/machine/include/tune-cortexa53.inc
+
+MACHINE_FEATURES += "wifi bluetooth optee bcm43455 bcm4356"
+
+# NXP BSP can consume proprietary jailhouse and Broadcom drivers
+MACHINE_FEATURES_append_use-nxp-bsp = " jailhouse bcm4359"
+
+KERNEL_DEVICETREE = " \
+        freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \
+"
+KERNEL_DEVICETREE_append_use-nxp-bsp = " \
+        freescale/${KERNEL_DEVICETREE_BASENAME}-ak5558.dtb \
+        freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \
+        freescale/${KERNEL_DEVICETREE_BASENAME}-rm67191.dtb \
+        freescale/${KERNEL_DEVICETREE_BASENAME}-root.dtb \
+        freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \
+"
+UBOOT_DTB_NAME = "${KERNEL_DEVICETREE_BASENAME}.dtb"
+
+UBOOT_CONFIG ??= "sd"
+UBOOT_CONFIG[sd]      = "${UBOOT_CONFIG_BASENAME}_defconfig,sdcard"
+UBOOT_CONFIG[fspi]    = "${UBOOT_CONFIG_BASENAME}_defconfig"
+UBOOT_CONFIG[mfgtool] = "${UBOOT_CONFIG_BASENAME}_defconfig"
+
+SPL_BINARY = "spl/u-boot-spl.bin"
+
+ATF_PLATFORM = "imx8mn"
+
+IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', '${IMXBOOT_TARGETS_BASENAME}_flexspi', '${IMXBOOT_TARGETS_BASENAME}', d)}"
+
+IMX_BOOT_SOC_TARGET = "iMX8MN"
+
+SERIAL_CONSOLES = "115200;ttymxc1"
+
+BOOT_SPACE = "65536"
+LOADADDR = ""
+UBOOT_SUFFIX = "bin"
+UBOOT_MAKE_TARGET = ""
+
+# Image boot offset as defined in section 6.1.6.1 "Primary image offset and IVT offset" of
+# i.MX 8M Nano Applications Processor Reference Manual, Rev. 0, 12/2019
+# Doc ID: IMX8MNRM
+IMX_BOOT_SEEK = "32"
+
+OPTEE_BIN_EXT = "8mn"
+
+# Add additional firmware
+MACHINE_FIRMWARE_append = " linux-firmware-ath10k"