diff options
author | Tom Hochstein <tom.hochstein@nxp.com> | 2022-11-09 15:53:18 -0700 |
---|---|---|
committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-11-10 11:25:30 +0000 |
commit | d92d0bf2c25b97e21fc0e8b02f46c0764990cafc (patch) | |
tree | c3fdad355f2c94d2c3fbe801e02076a3ce78b036 /conf/machine | |
parent | ff7b8c5f55d01323b1d85878fe7a95b1d1c2ef1c (diff) | |
download | meta-freescale-d92d0bf2c25b97e21fc0e8b02f46c0764990cafc.tar.gz |
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 <tom.hochstein@nxp.com>
(cherry picked from commit 5522adcc8a5b2172a58a0850280b14ada955b2be)
Diffstat (limited to 'conf/machine')
-rw-r--r-- | conf/machine/imx8mn-lpddr4-evk.conf | 2 | ||||
-rw-r--r-- | 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 | |||
9 | # The device tree name is implicit for LPDDR4, so can't use MACHINE here | 9 | # The device tree name is implicit for LPDDR4, so can't use MACHINE here |
10 | KERNEL_DEVICETREE_BASENAME = "imx8mn-evk" | 10 | KERNEL_DEVICETREE_BASENAME = "imx8mn-evk" |
11 | KERNEL_DEVICETREE:append:use-nxp-bsp = " \ | 11 | KERNEL_DEVICETREE:append:use-nxp-bsp = " \ |
12 | freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \ | ||
13 | freescale/${KERNEL_DEVICETREE_BASENAME}-root.dtb \ | ||
12 | freescale/${KERNEL_DEVICETREE_BASENAME}-8mic-revE.dtb \ | 14 | freescale/${KERNEL_DEVICETREE_BASENAME}-8mic-revE.dtb \ |
13 | freescale/${KERNEL_DEVICETREE_BASENAME}-8mic-swpdm.dtb \ | 15 | freescale/${KERNEL_DEVICETREE_BASENAME}-8mic-swpdm.dtb \ |
14 | " | 16 | " |
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" | |||
20 | MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse bcm4359" | 20 | MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse bcm4359" |
21 | 21 | ||
22 | KERNEL_DEVICETREE = " \ | 22 | KERNEL_DEVICETREE = " \ |
23 | freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \ | 23 | freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \ |
24 | " | 24 | " |
25 | KERNEL_DEVICETREE:append:use-nxp-bsp = " \ | 25 | KERNEL_DEVICETREE:append:use-nxp-bsp = " \ |
26 | freescale/${KERNEL_DEVICETREE_BASENAME}-ak5558.dtb \ | 26 | freescale/${KERNEL_DEVICETREE_BASENAME}-ak5558.dtb \ |
27 | freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \ | 27 | freescale/${KERNEL_DEVICETREE_BASENAME}-rm67191.dtb \ |
28 | freescale/${KERNEL_DEVICETREE_BASENAME}-rm67191.dtb \ | 28 | freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \ |
29 | freescale/${KERNEL_DEVICETREE_BASENAME}-root.dtb \ | ||
30 | freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \ | ||
31 | " | 29 | " |
32 | UBOOT_DTB_NAME = "${KERNEL_DEVICETREE_BASENAME}.dtb" | 30 | UBOOT_DTB_NAME = "${KERNEL_DEVICETREE_BASENAME}.dtb" |
33 | 31 | ||