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