From 2ad6396d8aac4dc7957c4510c9bd9b50ca7461d2 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Mon, 2 May 2022 10:08:15 -0500 Subject: imx8dx-mek: Fix name and description Signed-off-by: Tom Hochstein (cherry picked from commit fe3d509ce6168a2a1a8239f6526be31398eaf931) --- conf/machine/imx8dx-mek.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/machine/imx8dx-mek.conf b/conf/machine/imx8dx-mek.conf index 8e8bdee0..fbb35f13 100644 --- a/conf/machine/imx8dx-mek.conf +++ b/conf/machine/imx8dx-mek.conf @@ -1,6 +1,6 @@ #@TYPE: Machine -#@NAME: i.MX 8DXP MEK -#@DESCRIPTION: i.MX 8DualXPlus Multisensory Enablement Kit board +#@NAME: i.MX 8DX MEK +#@DESCRIPTION: i.MX 8DualX Multisensory Enablement Kit board #@MAINTAINER: Lauren Post MACHINEOVERRIDES =. "mx8dx:" -- cgit v1.2.3-54-g00ecf From 4b56437e94368bfe5f770f7170d9ca94ddabe6f4 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Mon, 2 May 2022 10:19:38 -0500 Subject: imx8dxl-ddr3l-evk: Add uboot config fspi Signed-off-by: Tom Hochstein (cherry picked from commit 6b82b2c90c94f433f8a4beb9f0ea594449ecf90b) --- conf/machine/imx8dxl-lpddr4-evk.conf | 1 - conf/machine/include/imx8dxl-evk.inc | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/imx8dxl-lpddr4-evk.conf b/conf/machine/imx8dxl-lpddr4-evk.conf index d44a4732..e824d1a4 100644 --- a/conf/machine/imx8dxl-lpddr4-evk.conf +++ b/conf/machine/imx8dxl-lpddr4-evk.conf @@ -15,4 +15,3 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \ freescale/${KERNEL_DEVICETREE_BASENAME}-root.dtb \ " UBOOT_CONFIG_BASENAME = "imx8dxl_evk" -UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_fspi_defconfig" diff --git a/conf/machine/include/imx8dxl-evk.inc b/conf/machine/include/imx8dxl-evk.inc index e12dfb00..837ecc33 100644 --- a/conf/machine/include/imx8dxl-evk.inc +++ b/conf/machine/include/imx8dxl-evk.inc @@ -40,6 +40,7 @@ UBOOT_SUFFIX = "bin" UBOOT_CONFIG ??= "sd" UBOOT_CONFIG[sd] = "${UBOOT_CONFIG_BASENAME}_defconfig,sdcard" +UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_fspi_defconfig" IMX_BOOT_SEEK = "32" -- cgit v1.2.3-54-g00ecf From 5ba85f0254a11f4f54a83192d7292423413f7d07 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Mon, 2 May 2022 10:21:15 -0500 Subject: imx8dxl-lpddr4-evk: Add uboot config lcd Signed-off-by: Tom Hochstein (cherry picked from commit b281aff059a90d1d99a9cda3c99250e4d89403d9) --- conf/machine/imx8dxl-lpddr4-evk.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/machine/imx8dxl-lpddr4-evk.conf b/conf/machine/imx8dxl-lpddr4-evk.conf index e824d1a4..11a5dc85 100644 --- a/conf/machine/imx8dxl-lpddr4-evk.conf +++ b/conf/machine/imx8dxl-lpddr4-evk.conf @@ -15,3 +15,5 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \ freescale/${KERNEL_DEVICETREE_BASENAME}-root.dtb \ " UBOOT_CONFIG_BASENAME = "imx8dxl_evk" + +UBOOT_CONFIG[lcd] = "${UBOOT_CONFIG_BASENAME}_lcd_defconfig" -- cgit v1.2.3-54-g00ecf From 3fa1e758376e78cca1a715eb7bf676cd420cbcef Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Mon, 2 May 2022 10:22:08 -0500 Subject: imx8dxl-lpddr4-evk: Cleanup BOARD_TYPE assignment The BOARD_TYPE is board-specific, so move it from the .inc to the .conf. Signed-off-by: Tom Hochstein (cherry picked from commit 40d5578d5d873fa005fbaa920d35d6cce9b0d1dd) --- conf/machine/imx8dxl-lpddr4-evk.conf | 2 ++ conf/machine/include/imx8dxl-evk.inc | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/conf/machine/imx8dxl-lpddr4-evk.conf b/conf/machine/imx8dxl-lpddr4-evk.conf index 11a5dc85..2ca9b986 100644 --- a/conf/machine/imx8dxl-lpddr4-evk.conf +++ b/conf/machine/imx8dxl-lpddr4-evk.conf @@ -17,3 +17,5 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \ UBOOT_CONFIG_BASENAME = "imx8dxl_evk" UBOOT_CONFIG[lcd] = "${UBOOT_CONFIG_BASENAME}_lcd_defconfig" + +BOARD_TYPE = "evk" diff --git a/conf/machine/include/imx8dxl-evk.inc b/conf/machine/include/imx8dxl-evk.inc index 837ecc33..491ebffe 100644 --- a/conf/machine/include/imx8dxl-evk.inc +++ b/conf/machine/include/imx8dxl-evk.inc @@ -58,6 +58,3 @@ IMXBOOT_TARGETS = \ 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" -- cgit v1.2.3-54-g00ecf From 769972d1e9b4b0ec1344c37049e6f1868e0f4a11 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Mon, 2 May 2022 10:25:41 -0500 Subject: imx8mn-evk: Add uboot config ld Signed-off-by: Tom Hochstein (cherry picked from commit 17aed5a1b8edff1922ff34ee13621010ae023d23) --- conf/machine/include/imx8mn-evk.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/machine/include/imx8mn-evk.inc b/conf/machine/include/imx8mn-evk.inc index 1404abd2..5a5b447f 100644 --- a/conf/machine/include/imx8mn-evk.inc +++ b/conf/machine/include/imx8mn-evk.inc @@ -35,6 +35,7 @@ UBOOT_SUFFIX = "bin" UBOOT_CONFIG ??= "sd" UBOOT_CONFIG[sd] = "${UBOOT_CONFIG_BASENAME}_defconfig,sdcard" UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_defconfig" +UBOOT_CONFIG[ld] = "${UBOOT_CONFIG_BASENAME}_ld_defconfig" UBOOT_CONFIG[mfgtool] = "${UBOOT_CONFIG_BASENAME}_defconfig" SPL_BINARY = "spl/u-boot-spl.bin" -- cgit v1.2.3-54-g00ecf From 31de9bd98100f99830772e9b9b708a0378436d83 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Mon, 2 May 2022 10:26:27 -0500 Subject: imx8mn-ddr4-evk: Add uboot config nom Signed-off-by: Tom Hochstein (cherry picked from commit 53df19c4d33d2e465d32d533f6f9540a519b0490) --- conf/machine/imx8mn-ddr4-evk.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/machine/imx8mn-ddr4-evk.conf b/conf/machine/imx8mn-ddr4-evk.conf index 1a03cdca..7a796d38 100644 --- a/conf/machine/imx8mn-ddr4-evk.conf +++ b/conf/machine/imx8mn-ddr4-evk.conf @@ -12,6 +12,8 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \ " UBOOT_CONFIG_BASENAME = "imx8mn_ddr4_evk" +UBOOT_CONFIG[nom] = "${UBOOT_CONFIG_BASENAME}_nom_defconfig" + DDR_FIRMWARE_VERSION = "201810" DDR_FIRMWARE_NAME = " \ ddr4_imem_1d_${DDR_FIRMWARE_VERSION}.bin \ -- cgit v1.2.3-54-g00ecf From dfa2e024e9289bccb6919d1d886c5a415b5c936e Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Mon, 2 May 2022 10:27:17 -0500 Subject: imx8mp-lpddr4-evk: Add uboot config ndm Signed-off-by: Tom Hochstein (cherry picked from commit 3dcc54c2ff7cd004b4f5dd3933c83506ae2c1866) --- conf/machine/imx8mp-lpddr4-evk.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/machine/imx8mp-lpddr4-evk.conf b/conf/machine/imx8mp-lpddr4-evk.conf index 0b7c6801..2c08790c 100644 --- a/conf/machine/imx8mp-lpddr4-evk.conf +++ b/conf/machine/imx8mp-lpddr4-evk.conf @@ -41,6 +41,7 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \ UBOOT_CONFIG_BASENAME = "imx8mp_evk" UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_defconfig" +UBOOT_CONFIG[ndm] = "${UBOOT_CONFIG_BASENAME}_ndm_defconfig" # Set DDR FIRMWARE DDR_FIRMWARE_VERSION = "202006" -- cgit v1.2.3-54-g00ecf