From 104665851b41dd75b6a66b61f1ed5db43b285610 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 9 Nov 2022 14:59:41 -0700 Subject: imx8qxp-mek.conf: Drop invalid dtbs Remove dtbs dropped by linux-imx 5.15.52: - imx8qxp-mek-dom0.dtb - imx8qxp-mek-inmate.dtb - imx8qxp-mek-root.dtb Fixes: #1288 Signed-off-by: Tom Hochstein (cherry picked from commit 44c85e6a9c4673c22f9a174f4799ee9a35d56d29) --- conf/machine/imx8qxp-mek.conf | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/conf/machine/imx8qxp-mek.conf b/conf/machine/imx8qxp-mek.conf index 6a732893..de8208d3 100644 --- a/conf/machine/imx8qxp-mek.conf +++ b/conf/machine/imx8qxp-mek.conf @@ -10,18 +10,15 @@ require include/imx8x-mek.inc KERNEL_DEVICETREE_BASENAME = "${MACHINE}" KERNEL_DEVICETREE:append:use-nxp-bsp = " \ - freescale/${KERNEL_DEVICETREE_BASENAME}-a0.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-dom0.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-dpu-lcdif.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-dpu-lcdif-rpmsg.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-enet2.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-lcdif.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-lcdif-rpmsg.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-pcie-ep.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-root.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-sof-cs42888.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-sof-wm8960.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-a0.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-dpu-lcdif.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-dpu-lcdif-rpmsg.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-enet2.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-lcdif.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-lcdif-rpmsg.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-pcie-ep.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-sof-cs42888.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-sof-wm8960.dtb \ " UBOOT_CONFIG_BASENAME = "imx8qxp_mek" -- cgit v1.2.3-54-g00ecf From ac19a82fae51a64ee6dd9358e600e95ff9341789 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 9 Nov 2022 15:19:46 -0700 Subject: imx6sllevk.conf: Add dtbs for NXP BSP For linux-imx 5.15.52, add dtbs for NXP BSP: - imx6sll-evk-btwifi.dtb - imx6sll-evk-reva.dtb Signed-off-by: Tom Hochstein (cherry picked from commit c038a82f51ef54052687125a44da6f47458d29a0) --- conf/machine/imx6sllevk.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/machine/imx6sllevk.conf b/conf/machine/imx6sllevk.conf index 19df28a4..bd0fe73d 100644 --- a/conf/machine/imx6sllevk.conf +++ b/conf/machine/imx6sllevk.conf @@ -10,6 +10,9 @@ include conf/machine/include/imx-base.inc require conf/machine/include/arm/armv7a/tune-cortexa9.inc KERNEL_DEVICETREE = "imx6sll-evk.dtb" +KERNEL_DEVICETREE:append:use-nxp-bsp = " \ + imx6sll-evk-btwifi.dtb \ + imx6sll-evk-reva.dtb" UBOOT_MAKE_TARGET = "u-boot.imx" UBOOT_SUFFIX = "imx" -- cgit v1.2.3-54-g00ecf From 9b6b5347a108b884c67a3b005590a6f645db2eeb Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 9 Nov 2022 15:24:20 -0700 Subject: imx6ul*evk.conf: Add dtb to NXP BSP Add imx6ull-14x14-evk-btwifi-sdio3_0.dtb for linux-imx 5.15.52. Signed-off-by: Tom Hochstein (cherry picked from commit fc7997c2dd968b94e2dc155b891bceb8fb38bf97) --- conf/machine/imx6ulevk.conf | 15 ++++++++------- conf/machine/imx6ullevk.conf | 9 +++++---- conf/machine/imx6ulz-14x14-evk.conf | 1 + 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf index 216f47bd..e775b4b7 100644 --- a/conf/machine/imx6ulevk.conf +++ b/conf/machine/imx6ulevk.conf @@ -12,13 +12,14 @@ include conf/machine/include/arm/armv7a/tune-cortexa7.inc MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455" KERNEL_DEVICETREE = " \ - imx6ul-14x14-evk-btwifi.dtb \ - imx6ul-14x14-evk-csi.dtb \ - imx6ul-14x14-evk.dtb \ - imx6ul-14x14-evk-ecspi.dtb \ - imx6ul-14x14-evk-ecspi-slave.dtb \ - imx6ul-14x14-evk-emmc.dtb \ - imx6ul-14x14-evk-gpmi-weim.dtb \ + imx6ul-14x14-evk-btwifi.dtb \ + imx6ul-14x14-evk-btwifi-sdio3_0.dtb \ + imx6ul-14x14-evk-csi.dtb \ + imx6ul-14x14-evk.dtb \ + imx6ul-14x14-evk-ecspi.dtb \ + imx6ul-14x14-evk-ecspi-slave.dtb \ + imx6ul-14x14-evk-emmc.dtb \ + imx6ul-14x14-evk-gpmi-weim.dtb \ " KERNEL_DEVICETREE:use-mainline-bsp = "imx6ul-14x14-evk.dtb" diff --git a/conf/machine/imx6ullevk.conf b/conf/machine/imx6ullevk.conf index e5ea2ec2..05847a97 100644 --- a/conf/machine/imx6ullevk.conf +++ b/conf/machine/imx6ullevk.conf @@ -12,13 +12,14 @@ include conf/machine/include/arm/armv7a/tune-cortexa7.inc MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455" KERNEL_DEVICETREE = " \ - imx6ull-14x14-evk.dtb \ + imx6ull-14x14-evk.dtb \ " KERNEL_DEVICETREE:append:use-nxp-bsp = " \ - imx6ull-14x14-evk-btwifi.dtb \ - imx6ull-14x14-evk-emmc.dtb \ - imx6ull-14x14-evk-gpmi-weim.dtb \ + imx6ull-14x14-evk-btwifi.dtb \ + imx6ull-14x14-evk-btwifi-sdio3_0.dtb \ + imx6ull-14x14-evk-emmc.dtb \ + imx6ull-14x14-evk-gpmi-weim.dtb \ " UBOOT_MAKE_TARGET = "u-boot.imx" diff --git a/conf/machine/imx6ulz-14x14-evk.conf b/conf/machine/imx6ulz-14x14-evk.conf index 7775fde3..16d259a7 100644 --- a/conf/machine/imx6ulz-14x14-evk.conf +++ b/conf/machine/imx6ulz-14x14-evk.conf @@ -16,6 +16,7 @@ KERNEL_DEVICETREE = " \ " KERNEL_DEVICETREE:append:use-nxp-bsp = " \ imx6ulz-14x14-evk-btwifi.dtb \ + imx6ull-14x14-evk-btwifi-sdio3_0.dtb \ imx6ulz-14x14-evk-emmc.dtb \ imx6ulz-14x14-evk-gpmi-weim.dtb \ " -- cgit v1.2.3-54-g00ecf From 0ba43bd945b1d4c0185b40f210691506b79a4bf6 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 9 Nov 2022 15:26:46 -0700 Subject: imx7dsabresd.conf: Add dtb for NXP BSP Add the following dtb for linux-imx 5.15.52: - imx7d-sdb-mqs.dtb Signed-off-by: Tom Hochstein (cherry picked from commit d8b6b7f3a3bc98e2ee277d47c38875953d91569c) --- conf/machine/imx7dsabresd.conf | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/conf/machine/imx7dsabresd.conf b/conf/machine/imx7dsabresd.conf index 7183d6f9..267d3b38 100644 --- a/conf/machine/imx7dsabresd.conf +++ b/conf/machine/imx7dsabresd.conf @@ -13,15 +13,16 @@ MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455" KERNEL_DEVICETREE = "imx7d-sdb.dtb" KERNEL_DEVICETREE:append:use-nxp-bsp = " \ - imx7d-sdb-epdc.dtb \ - imx7d-sdb-gpmi-weim.dtb \ - imx7d-sdb-m4.dtb \ - imx7d-sdb-mipi-dsi.dtb \ - imx7d-sdb-pcie-ep.dtb \ - imx7d-sdb-qspi.dtb \ - imx7d-sdb-reva.dtb \ - imx7d-sdb-sht11.dtb \ - imx7d-sdb-usd-wifi.dtb \ + imx7d-sdb-epdc.dtb \ + imx7d-sdb-gpmi-weim.dtb \ + imx7d-sdb-m4.dtb \ + imx7d-sdb-mipi-dsi.dtb \ + imx7d-sdb-mqs.dtb \ + imx7d-sdb-pcie-ep.dtb \ + imx7d-sdb-qspi.dtb \ + imx7d-sdb-reva.dtb \ + imx7d-sdb-sht11.dtb \ + imx7d-sdb-usd-wifi.dtb \ " UBOOT_MAKE_TARGET = "u-boot.imx" -- cgit v1.2.3-54-g00ecf From cf5fdeb01e7ac0dcc594b754a5e9347aeaa36849 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 9 Nov 2022 15:28:46 -0700 Subject: imx8dxl-lpddr4-evk.conf: Drop dtbs from NXP BSP Drop dtbs no longer supported by linux-imx 5.15.52: - imx8dxl-evk-inmate.dtb - imx8dxl-evk-root.dtb Signed-off-by: Tom Hochstein (cherry picked from commit caf3db4bb50509227942906fce711dfe226d50fe) --- conf/machine/imx8dxl-lpddr4-evk.conf | 2 -- 1 file changed, 2 deletions(-) diff --git a/conf/machine/imx8dxl-lpddr4-evk.conf b/conf/machine/imx8dxl-lpddr4-evk.conf index 2710ea1a..915c3fa9 100644 --- a/conf/machine/imx8dxl-lpddr4-evk.conf +++ b/conf/machine/imx8dxl-lpddr4-evk.conf @@ -9,11 +9,9 @@ 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" -- cgit v1.2.3-54-g00ecf From 23b8844297e8f61b8dacfb62d9c5b2b611c094c8 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 9 Nov 2022 15:41:57 -0700 Subject: imx8mm-ddr4-evk.conf: Add dtbs for NXP BSP Add dtbs supported by linux-imx 5.15.52: - imx8mm-ddr4-evk-revb-rm67191-cmd-ram.dtb - imx8mm-ddr4-evk-revb-rm67199.dtb - imx8mm-ddr4-evk-revb-rm67199-cmd-ram.dtb Signed-off-by: Tom Hochstein (cherry picked from commit 823ef2dc09bb6e7bc13973d79396a99bc656a9af) --- conf/machine/imx8mm-ddr4-evk.conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/conf/machine/imx8mm-ddr4-evk.conf b/conf/machine/imx8mm-ddr4-evk.conf index bbfef2c2..467ca863 100644 --- a/conf/machine/imx8mm-ddr4-evk.conf +++ b/conf/machine/imx8mm-ddr4-evk.conf @@ -8,8 +8,11 @@ require include/imx8mm-evk.inc KERNEL_DEVICETREE_BASENAME = "${MACHINE}" KERNEL_DEVICETREE:append:use-nxp-bsp = " \ - freescale/${KERNEL_DEVICETREE_BASENAME}-revb-rm67191.dtb \ freescale/${KERNEL_DEVICETREE_BASENAME}-revb.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-revb-rm67191.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-revb-rm67191-cmd-ram.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-revb-rm67199.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-revb-rm67199-cmd-ram.dtb \ " UBOOT_CONFIG_BASENAME = "imx8mm_ddr4_evk" -- cgit v1.2.3-54-g00ecf From 0f56835cc82b2706f579568fe942a6dd13265349 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 9 Nov 2022 15:42:19 -0700 Subject: imx8mm-lpddr4-evk.conf: Add dtbs for NXP BSP Add dtbs supported by linux-imx 5.15.52: - imx8mm-evk-dpdk.dtb - imx8mm-evk-ecspi-slave.dtb - imx8mm-evk-lk.dtb - imx8mm-evk-rpmsg-wm8524.dtb - imx8mm-evk-rpmsg-wm8524-lpv.dtb Signed-off-by: Tom Hochstein (cherry picked from commit 955a3b5d920a53b7a4cca2af136e3e095bc214ef) --- conf/machine/imx8mm-lpddr4-evk.conf | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/conf/machine/imx8mm-lpddr4-evk.conf b/conf/machine/imx8mm-lpddr4-evk.conf index 0a85ed20..1387e594 100644 --- a/conf/machine/imx8mm-lpddr4-evk.conf +++ b/conf/machine/imx8mm-lpddr4-evk.conf @@ -9,17 +9,22 @@ require include/imx8mm-evk.inc # The device tree name is implicit for LPDDR4, so can't use MACHINE here KERNEL_DEVICETREE_BASENAME = "imx8mm-evk" KERNEL_DEVICETREE:append:use-nxp-bsp = " \ - freescale/${KERNEL_DEVICETREE_BASENAME}-8mic-revE.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-8mic-swpdm.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-ak4497.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-ak5558.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-audio-tdm.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-qca-wifi.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-revb-qca-wifi.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-root.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-usd-wifi.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-8mic-revE.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-8mic-swpdm.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-ak4497.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-ak5558.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-audio-tdm.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-dpdk.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-ecspi-slave.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-lk.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-qca-wifi.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-revb-qca-wifi.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-root.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg-wm8524.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg-wm8524-lpv.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-usd-wifi.dtb \ " @@ -27,10 +32,10 @@ UBOOT_CONFIG_BASENAME = "imx8mm_evk" UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_fspi_defconfig" DDR_FIRMWARE_NAME = " \ - lpddr4_pmu_train_1d_imem.bin \ - lpddr4_pmu_train_1d_dmem.bin \ - lpddr4_pmu_train_2d_imem.bin \ - lpddr4_pmu_train_2d_dmem.bin \ + lpddr4_pmu_train_1d_imem.bin \ + lpddr4_pmu_train_1d_dmem.bin \ + lpddr4_pmu_train_2d_imem.bin \ + lpddr4_pmu_train_2d_dmem.bin \ " IMXBOOT_TARGETS_BASENAME = "flash_evk" -- cgit v1.2.3-54-g00ecf From f826a05e9ac461d5776286dcc3ec5b721511d21a Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 9 Nov 2022 15:42:50 -0700 Subject: imx8mm-evk.inc: Add dtbs for NXP BSP For all i.MX 8MMini EVKs, add dtbs for linux-imx 5.15.52: - ${KERNEL_DEVICETREE_BASENAME}-rm67191-cmd-ram.dtb - ${KERNEL_DEVICETREE_BASENAME}-rm67199.dtb - ${KERNEL_DEVICETREE_BASENAME}-rm67199-cmd-ram.dtb Signed-off-by: Tom Hochstein (cherry picked from commit 21cb88a5a48566a5b234a71ce6551570f49827eb) --- conf/machine/include/imx8mm-evk.inc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/conf/machine/include/imx8mm-evk.inc b/conf/machine/include/imx8mm-evk.inc index 36d3bd9a..0130592f 100644 --- a/conf/machine/include/imx8mm-evk.inc +++ b/conf/machine/include/imx8mm-evk.inc @@ -26,8 +26,11 @@ KERNEL_DEVICETREE = " \ freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \ " KERNEL_DEVICETREE:append:use-nxp-bsp = " \ - freescale/${KERNEL_DEVICETREE_BASENAME}-pcie-ep.dtb \ - freescale/${KERNEL_DEVICETREE_BASENAME}-rm67191.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-pcie-ep.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-rm67191.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-rm67191-cmd-ram.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-rm67199.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-rm67199-cmd-ram.dtb \ " UBOOT_DTB_NAME = "${KERNEL_DEVICETREE_BASENAME}.dtb" -- cgit v1.2.3-54-g00ecf From ff7b8c5f55d01323b1d85878fe7a95b1d1c2ef1c Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 9 Nov 2022 15:47:33 -0700 Subject: imx8mn-lpddr4-evk: Add dtb for NXP BSP Add the following dtb for linux-imx 5.15.52: -imx8mn-evk-8mic-swpdm.dtb Signed-off-by: Tom Hochstein (cherry picked from commit ed6375315b3474d07003bca984d53c342c8c9ee6) --- conf/machine/imx8mn-lpddr4-evk.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/machine/imx8mn-lpddr4-evk.conf b/conf/machine/imx8mn-lpddr4-evk.conf index 51a79c38..df58856d 100644 --- a/conf/machine/imx8mn-lpddr4-evk.conf +++ b/conf/machine/imx8mn-lpddr4-evk.conf @@ -10,6 +10,7 @@ require include/imx8mn-evk.inc KERNEL_DEVICETREE_BASENAME = "imx8mn-evk" KERNEL_DEVICETREE:append:use-nxp-bsp = " \ freescale/${KERNEL_DEVICETREE_BASENAME}-8mic-revE.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-8mic-swpdm.dtb \ " UBOOT_CONFIG_BASENAME = "imx8mn_evk" DDR_FIRMWARE_NAME = " \ -- cgit v1.2.3-54-g00ecf From d92d0bf2c25b97e21fc0e8b02f46c0764990cafc Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 9 Nov 2022 15:53:18 -0700 Subject: imx8mn-ddr4-evk: Drop dtbs for NXP BSP Drop the following dtbs for linux-imx 5.15.52: - imx8mn-ddr4-evk-inmate.dtb - imx8mn-ddr4-evk-root.dtb Due to the include file, this is accomplished by moving the dtb definitions from imx8mn-evk.inc to imx8mn-lpddr4-evk.conf. Signed-off-by: Tom Hochstein (cherry picked from commit 5522adcc8a5b2172a58a0850280b14ada955b2be) --- conf/machine/imx8mn-lpddr4-evk.conf | 2 ++ conf/machine/include/imx8mn-evk.inc | 10 ++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conf/machine/imx8mn-lpddr4-evk.conf b/conf/machine/imx8mn-lpddr4-evk.conf index df58856d..aeccfdda 100644 --- a/conf/machine/imx8mn-lpddr4-evk.conf +++ b/conf/machine/imx8mn-lpddr4-evk.conf @@ -9,6 +9,8 @@ require include/imx8mn-evk.inc # The device tree name is implicit for LPDDR4, so can't use MACHINE here KERNEL_DEVICETREE_BASENAME = "imx8mn-evk" KERNEL_DEVICETREE:append:use-nxp-bsp = " \ + freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-root.dtb \ freescale/${KERNEL_DEVICETREE_BASENAME}-8mic-revE.dtb \ freescale/${KERNEL_DEVICETREE_BASENAME}-8mic-swpdm.dtb \ " diff --git a/conf/machine/include/imx8mn-evk.inc b/conf/machine/include/imx8mn-evk.inc index 4b3b3d22..bc8bddf9 100644 --- a/conf/machine/include/imx8mn-evk.inc +++ b/conf/machine/include/imx8mn-evk.inc @@ -20,14 +20,12 @@ MACHINE_FEATURES += "wifi bluetooth bcm43455 bcm4356" MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse bcm4359" KERNEL_DEVICETREE = " \ - freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \ + 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 \ + freescale/${KERNEL_DEVICETREE_BASENAME}-ak5558.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-rm67191.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \ " UBOOT_DTB_NAME = "${KERNEL_DEVICETREE_BASENAME}.dtb" -- cgit v1.2.3-54-g00ecf From c3b9e4c04e6c05561f2f069c62b5b62d6fd467a7 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 9 Nov 2022 15:57:58 -0700 Subject: imx8mn-evk.inc: Add dtbs for NXP BSP Add the following dtbs for linux-imx 5.15.52: - ${KERNEL_DEVICETREE_BASENAME}-lk.dtb - ${KERNEL_DEVICETREE_BASENAME}-rm67191-cmd-ram.dtb - ${KERNEL_DEVICETREE_BASENAME}-rm67199.dtb - ${KERNEL_DEVICETREE_BASENAME}-rm67199-cmd-ram.dtb Signed-off-by: Tom Hochstein (cherry picked from commit af6d7329ae130157e3f53c53674897b0395550be) --- conf/machine/include/imx8mn-evk.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/machine/include/imx8mn-evk.inc b/conf/machine/include/imx8mn-evk.inc index bc8bddf9..99dbe1e3 100644 --- a/conf/machine/include/imx8mn-evk.inc +++ b/conf/machine/include/imx8mn-evk.inc @@ -24,7 +24,11 @@ KERNEL_DEVICETREE = " \ " KERNEL_DEVICETREE:append:use-nxp-bsp = " \ freescale/${KERNEL_DEVICETREE_BASENAME}-ak5558.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-lk.dtb \ freescale/${KERNEL_DEVICETREE_BASENAME}-rm67191.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-rm67191-cmd-ram.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-rm67199.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-rm67199-cmd-ram.dtb \ freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \ " UBOOT_DTB_NAME = "${KERNEL_DEVICETREE_BASENAME}.dtb" -- cgit v1.2.3-54-g00ecf From 0be6940ba77666b04f6e7cf9e0021f1d35c67a2a Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 9 Nov 2022 16:01:13 -0700 Subject: imx8mp-lpddr4-evk.conf: Add dtbs for NXP BSP Add the following dtbs for linux-imx 5.15.52: - imx8mp-evk-dpdk.dtb - imx8mp-evk-dsp.dtb - imx8mp-evk-dual-os08a20.dtb - imx8mp-evk-os08a20.dtb - imx8mp-evk-os08a20-ov5640.dtb - imx8mp-evk-rpmsg-lpv.dtb - imx8mp-evk-8mic-swpdm.dtb Signed-off-by: Tom Hochstein (cherry picked from commit 558b02615bc4d6f072e5b80b1dd10e80e2e4fb43) --- conf/machine/imx8mp-lpddr4-evk.conf | 65 ++++++++++++++++++++----------------- 1 file changed, 36 insertions(+), 29 deletions(-) diff --git a/conf/machine/imx8mp-lpddr4-evk.conf b/conf/machine/imx8mp-lpddr4-evk.conf index c015963c..9ec19008 100644 --- a/conf/machine/imx8mp-lpddr4-evk.conf +++ b/conf/machine/imx8mp-lpddr4-evk.conf @@ -12,31 +12,38 @@ 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-ov2775.dtb \ - freescale/imx8mp-evk-basler-ov5640.dtb \ - freescale/imx8mp-evk-dual-basler.dtb \ - freescale/imx8mp-evk-dual-ov2775.dtb \ - freescale/imx8mp-evk-ecspi-slave.dtb \ - freescale/imx8mp-evk-flexcan2.dtb \ - freescale/imx8mp-evk-hifiberry-dacplus.dtb \ - freescale/imx8mp-evk-inmate.dtb \ - freescale/imx8mp-evk-iqaudio-dacplus.dtb \ - freescale/imx8mp-evk-iqaudio-dacpro.dtb \ - freescale/imx8mp-evk-it6263-lvds-dual-channel.dtb \ - freescale/imx8mp-evk-jdi-wuxga-lvds-panel.dtb \ - freescale/imx8mp-evk-ndm.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-rm67199.dtb \ - freescale/imx8mp-evk-root.dtb \ - freescale/imx8mp-evk-rpmsg.dtb \ - freescale/imx8mp-evk-sof-wm8960.dtb \ - freescale/imx8mp-evk-spdif-lb.dtb \ - freescale/imx8mp-evk-usdhc1-m2.dtb \ + freescale/imx8mp-ab2.dtb \ + freescale/imx8mp-evk-basler.dtb \ + freescale/imx8mp-evk-basler-ov2775.dtb \ + freescale/imx8mp-evk-basler-ov5640.dtb \ + freescale/imx8mp-evk-dpdk.dtb \ + freescale/imx8mp-evk-dsp.dtb \ + freescale/imx8mp-evk-dual-basler.dtb \ + freescale/imx8mp-evk-dual-os08a20.dtb \ + freescale/imx8mp-evk-dual-ov2775.dtb \ + freescale/imx8mp-evk-ecspi-slave.dtb \ + freescale/imx8mp-evk-flexcan2.dtb \ + freescale/imx8mp-evk-hifiberry-dacplus.dtb \ + freescale/imx8mp-evk-inmate.dtb \ + freescale/imx8mp-evk-iqaudio-dacplus.dtb \ + freescale/imx8mp-evk-iqaudio-dacpro.dtb \ + freescale/imx8mp-evk-it6263-lvds-dual-channel.dtb \ + freescale/imx8mp-evk-jdi-wuxga-lvds-panel.dtb \ + freescale/imx8mp-evk-ndm.dtb \ + freescale/imx8mp-evk-os08a20.dtb \ + freescale/imx8mp-evk-os08a20-ov5640.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-rm67199.dtb \ + freescale/imx8mp-evk-root.dtb \ + freescale/imx8mp-evk-rpmsg.dtb \ + freescale/imx8mp-evk-rpmsg-lpv.dtb \ + freescale/imx8mp-evk-sof-wm8960.dtb \ + freescale/imx8mp-evk-spdif-lb.dtb \ + freescale/imx8mp-evk-usdhc1-m2.dtb \ + freescale/imx8mp-evk-8mic-swpdm.dtb \ " UBOOT_CONFIG_BASENAME = "imx8mp_evk" @@ -46,10 +53,10 @@ UBOOT_CONFIG[ndm] = "${UBOOT_CONFIG_BASENAME}_ndm_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 \ + 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" -- cgit v1.2.3-54-g00ecf From f78c911177e539a55420afce34a46a416d023803 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 9 Nov 2022 16:05:20 -0700 Subject: imx8qm-mek.conf: Modify dtbs for NXP BSP Remove the following dtbs for linux-imx 5.15.52: - imx8qm-mek-dom0.dtb \ - imx8qm-mek-domu.dtb \ - imx8qm-mek-inmate.dtb \ - imx8qm-mek-root.dtb \ Add the following dtbs for linux-imx 5.15.52: - imx8qm-mek-hdmi-rx.dtb \ - imx8qm-mek-hdmi-rx-ov5640.dtb \ Signed-off-by: Tom Hochstein (cherry picked from commit f386e7b023271727192b1be6ea8b1613d1ec5778) --- conf/machine/imx8qm-mek.conf | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/conf/machine/imx8qm-mek.conf b/conf/machine/imx8qm-mek.conf index 58e7df79..ab5bdf9c 100644 --- a/conf/machine/imx8qm-mek.conf +++ b/conf/machine/imx8qm-mek.conf @@ -27,26 +27,24 @@ SERIAL_CONSOLES = "115200;ttyAMA0" USE_VT = "0" KERNEL_DEVICETREE = " \ - freescale/imx8qm-mek.dtb \ - freescale/imx8qm-mek-ca53.dtb \ - freescale/imx8qm-mek-ca72.dtb \ - freescale/imx8qm-mek-dom0.dtb \ - freescale/imx8qm-mek-domu.dtb \ - freescale/imx8qm-mek-dsi-rm67191.dtb \ - freescale/imx8qm-mek-enet2-tja1100.dtb \ - freescale/imx8qm-mek-esai.dtb \ - freescale/imx8qm-mek-hdmi.dtb \ - freescale/imx8qm-mek-inmate.dtb \ - freescale/imx8qm-mek-jdi-wuxga-lvds1-panel.dtb \ - freescale/imx8qm-mek-jdi-wuxga-lvds1-panel-rpmsg.dtb \ - freescale/imx8qm-mek-ov5640.dtb \ - freescale/imx8qm-mek-pcie-ep.dtb \ - freescale/imx8qm-mek-root.dtb \ - freescale/imx8qm-mek-rpmsg.dtb \ - freescale/imx8qm-mek-sof-cs42888.dtb \ - freescale/imx8qm-mek-sof-wm8960.dtb \ - freescale/imx8qm-mek-usd-wifi.dtb \ - freescale/imx8qm-mek-usdhc3-m2.dtb \ + freescale/imx8qm-mek.dtb \ + freescale/imx8qm-mek-ca53.dtb \ + freescale/imx8qm-mek-ca72.dtb \ + freescale/imx8qm-mek-dsi-rm67191.dtb \ + freescale/imx8qm-mek-enet2-tja1100.dtb \ + freescale/imx8qm-mek-esai.dtb \ + freescale/imx8qm-mek-hdmi.dtb \ + freescale/imx8qm-mek-hdmi-rx.dtb \ + freescale/imx8qm-mek-hdmi-rx-ov5640.dtb \ + freescale/imx8qm-mek-jdi-wuxga-lvds1-panel.dtb \ + freescale/imx8qm-mek-jdi-wuxga-lvds1-panel-rpmsg.dtb \ + freescale/imx8qm-mek-ov5640.dtb \ + freescale/imx8qm-mek-pcie-ep.dtb \ + freescale/imx8qm-mek-rpmsg.dtb \ + freescale/imx8qm-mek-sof-cs42888.dtb \ + freescale/imx8qm-mek-sof-wm8960.dtb \ + freescale/imx8qm-mek-usd-wifi.dtb \ + freescale/imx8qm-mek-usdhc3-m2.dtb \ " UBOOT_MAKE_TARGET = \ -- cgit v1.2.3-54-g00ecf From 6d4cee8cd6265f357745ed8fcb24e7f57dbb6096 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 9 Nov 2022 16:06:28 -0700 Subject: imx8dxl-ddr3l-evk.conf: Adjust kernel and u-boot names The memory type ddr3l encoded in the internal names for linux-imx 5.15.52 and u-boot-imx has been fixed. Signed-off-by: Tom Hochstein (cherry picked from commit 79234c20e1f87560f37f5174c4c3188acec5d9c3) --- conf/machine/imx8dxl-ddr3l-evk.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/machine/imx8dxl-ddr3l-evk.conf b/conf/machine/imx8dxl-ddr3l-evk.conf index b76c8060..7d46e2b4 100644 --- a/conf/machine/imx8dxl-ddr3l-evk.conf +++ b/conf/machine/imx8dxl-ddr3l-evk.conf @@ -5,8 +5,8 @@ #@MAINTAINER: Lauren Post require conf/machine/include/imx8dxl-evk.inc -KERNEL_DEVICETREE_BASENAME = "imx8dxl-ddr3-evk" -UBOOT_CONFIG_BASENAME = "imx8dxl_ddr3_evk" +KERNEL_DEVICETREE_BASENAME = "imx8dxl-ddr3l-evk" +UBOOT_CONFIG_BASENAME = "imx8dxl_ddr3l_evk" UBOOT_CONFIG[nand] = "${UBOOT_CONFIG_BASENAME}_nand_defconfig" BOARD_TYPE = "ddr3-evk" -- cgit v1.2.3-54-g00ecf