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