From aacaba30db61d9199a23513ef6838922d73dcad0 Mon Sep 17 00:00:00 2001 From: Ryan Eatmon Date: Fri, 17 Mar 2023 10:20:53 -0500 Subject: linux-ti-*: Add filtering for which dtb/dtbo to include We often carry more dtbs/dtbos in our kernel than we have upstreamed. The inclusion of all of the dtb/dtbo in the KERNEL_DEVICETREE has become problematic as we start testing the linux-next and 6.1 as part of our LTS migration. To address this issue we are adding in two step method for managing the KERNEL_DEVICETREE. Going forward we will only accept dtb/dtbo in KERNEL_DEVICETREE if it is available in upstream. This way we ensure that the variable is more accurate for whichever kernel you might be looking at. We have also added a new variable KERNEL_DEVICETREE_PREFIX which our kernel recipes will use to auto set KERNEL_DEVICETREE based on what files are in the kernel and not a fixed list in the conf files. Signed-off-by: Ryan Eatmon Signed-off-by: Andrew Davis Signed-off-by: Ryan Eatmon --- meta-ti-bsp/conf/machine/am57xx-evm.conf | 22 ++++++++++--------- meta-ti-bsp/conf/machine/am62axx-evm.conf | 20 +++++------------ meta-ti-bsp/conf/machine/am62xx-evm.conf | 10 ++------- meta-ti-bsp/conf/machine/am62xx-lp-evm.conf | 9 ++++---- meta-ti-bsp/conf/machine/beagle-x15.conf | 8 ++++++- meta-ti-bsp/conf/machine/beaglebone.conf | 13 +++++++++--- meta-ti-bsp/conf/machine/dra7xx-evm.conf | 14 ++++++------ meta-ti-bsp/conf/machine/include/am64xx.inc | 5 ++--- meta-ti-bsp/conf/machine/include/am65xx.inc | 12 ++--------- meta-ti-bsp/conf/machine/include/ti33x.inc | 15 +++++++++---- meta-ti-bsp/conf/machine/include/ti43x.inc | 10 ++++++--- meta-ti-bsp/conf/machine/j7200-evm.conf | 4 ++-- meta-ti-bsp/conf/machine/j721e-evm.conf | 29 +++++-------------------- meta-ti-bsp/conf/machine/j721s2-evm.conf | 32 +++++----------------------- meta-ti-bsp/conf/machine/j784s4-evm.conf | 33 +++++------------------------ meta-ti-bsp/conf/machine/omapl138-lcdk.conf | 7 +++++- 16 files changed, 92 insertions(+), 151 deletions(-) (limited to 'meta-ti-bsp/conf') diff --git a/meta-ti-bsp/conf/machine/am57xx-evm.conf b/meta-ti-bsp/conf/machine/am57xx-evm.conf index b3525a0b..9b12f383 100644 --- a/meta-ti-bsp/conf/machine/am57xx-evm.conf +++ b/meta-ti-bsp/conf/machine/am57xx-evm.conf @@ -8,24 +8,26 @@ MACHINE_FEATURES += "touchscreen" SERIAL_CONSOLES = "115200;ttyS2" +KERNEL_DEVICETREE_PREFIX = " \ + am57 \ + ti/am57 \ + ti/lcd \ + ti/ov10635 \ +" + +KERNEL_DEVICETREE_DTBMERGE = " \ + am57xx-evm.dtb \ + am57xx-evm-reva3.dtb \ +" + KERNEL_DEVICETREE = " \ am57xx-beagle-x15.dtb \ am57xx-beagle-x15-revb1.dtb \ am57xx-beagle-x15-revc.dtb \ am5729-beagleboneai.dtb \ - ${@oe.utils.conditional('PREFERRED_PROVIDER_virtual/kernel', 'linux-ti-mainline', '', 'am57xx-evm.dtb', d)} \ - ti/am57xx-evm-common.dtbo \ - ${@oe.utils.conditional('PREFERRED_PROVIDER_virtual/kernel', 'linux-ti-mainline', '', 'am57xx-evm-reva3.dtb', d)} \ - ti/am57xx-evm-reva3.dtbo \ am571x-idk.dtb \ - ti/am571x-idk-touchscreen.dtbo \ am572x-idk.dtb \ am574x-idk.dtb \ - ti/am57xx-idk-osd-lcd-common.dtbo \ - ti/am572x-idk-touchscreen.dtbo \ - ti/lcd-osd101t2587.dtbo \ - ti/lcd-osd101t2045.dtbo \ - ${@oe.utils.conditional('PREFERRED_PROVIDER_virtual/kernel', 'linux-ti-mainline', '', 'ti/ov10635.dtbo', d)} \ " KERNEL_DEVICETREE += "${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am574x-idk-pru-excl-uio.dtb am572x-idk-pru-excl-uio.dtb am571x-idk-pru-excl-uio.dtb', '', d)}" diff --git a/meta-ti-bsp/conf/machine/am62axx-evm.conf b/meta-ti-bsp/conf/machine/am62axx-evm.conf index 2fd91bd7..691a074b 100644 --- a/meta-ti-bsp/conf/machine/am62axx-evm.conf +++ b/meta-ti-bsp/conf/machine/am62axx-evm.conf @@ -4,23 +4,13 @@ require conf/machine/include/am62axx.inc +KERNEL_DEVICETREE_PREFIX = " \ + ti/k3-am62a7 \ + ti/k3-j721e-fpdlink \ +" + KERNEL_DEVICETREE = " \ ti/k3-am62a7-sk.dtb \ - ti/k3-am62a7-fpdlink-ov2312-0-0.dtbo \ - ti/k3-am62a7-fpdlink-ov2312-0-1.dtbo \ - ti/k3-am62a7-fpdlink-ov2312-0-2.dtbo \ - ti/k3-am62a7-fpdlink-ov2312-0-3.dtbo \ - ti/k3-am62a7-fpdlink-sk-fusion.dtbo \ - ti/k3-am62a7-sk-csi2-imx219.dtbo \ - ti/k3-am62a7-sk-ethernet-dc01.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-0-0.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-0-1.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-0-2.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-0-3.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-0-0.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-0-1.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-0-2.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-0-3.dtbo \ " UBOOT_MACHINE = "am62ax_evm_a53_defconfig" diff --git a/meta-ti-bsp/conf/machine/am62xx-evm.conf b/meta-ti-bsp/conf/machine/am62xx-evm.conf index 8892a05f..d54213d4 100644 --- a/meta-ti-bsp/conf/machine/am62xx-evm.conf +++ b/meta-ti-bsp/conf/machine/am62xx-evm.conf @@ -4,16 +4,10 @@ require conf/machine/include/am62xx.inc +KERNEL_DEVICETREE_PREFIX = "ti/k3-am625" + KERNEL_DEVICETREE = " \ ti/k3-am625-sk.dtb \ - ti/k3-am625-skeleton.dtb \ - ti/k3-am625-sk-lpmdemo.dtb \ - ti/k3-am625-sk-csi2-ov5640.dtbo \ - ti/k3-am625-sk-csi2-tevi-ov5640.dtbo \ - ti/k3-am625-sk-ecap-capture.dtbo \ - ti/k3-am625-sk-hdmi-audio.dtbo \ - ti/k3-am625-sk-mcan.dtbo \ - ti/k3-am625-sk-oldi-panel.dtbo \ " UBOOT_MACHINE = "am62x_evm_a53_defconfig" diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf index cba05c4b..ba1a12a7 100644 --- a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf @@ -4,12 +4,13 @@ require conf/machine/include/am62xx-lp.inc +KERNEL_DEVICETREE_PREFIX = " \ + ti/k3-am62x-lp \ + ti/k3-am625-sk \ +" + KERNEL_DEVICETREE = " \ ti/k3-am62x-lp-sk.dtb \ - ti/k3-am625-skeleton.dtb \ - ti/k3-am625-sk-lpmdemo.dtb \ - ti/k3-am625-sk-csi2-ov5640.dtbo \ - ti/k3-am62x-lp-sk-oldi-panel.dtbo \ " SPL_BINARY = "tispl.bin_HS" diff --git a/meta-ti-bsp/conf/machine/beagle-x15.conf b/meta-ti-bsp/conf/machine/beagle-x15.conf index b4279ae4..8efd6e60 100644 --- a/meta-ti-bsp/conf/machine/beagle-x15.conf +++ b/meta-ti-bsp/conf/machine/beagle-x15.conf @@ -4,7 +4,13 @@ require conf/machine/include/am57xx.inc -KERNEL_DEVICETREE = "am57xx-beagle-x15.dtb am57xx-beagle-x15-revb1.dtb am57xx-beagle-x15-revc.dtb" +KERNEL_DEVICETREE_PREFIX = "am57xx-beagle-x15" + +KERNEL_DEVICETREE = " \ + am57xx-beagle-x15.dtb \ + am57xx-beagle-x15-revb1.dtb \ + am57xx-beagle-x15-revc.dtb \ +" MACHINE_GUI_CLASS = "bigscreen" diff --git a/meta-ti-bsp/conf/machine/beaglebone.conf b/meta-ti-bsp/conf/machine/beaglebone.conf index 413a960d..2a8dc6d7 100644 --- a/meta-ti-bsp/conf/machine/beaglebone.conf +++ b/meta-ti-bsp/conf/machine/beaglebone.conf @@ -4,9 +4,16 @@ require conf/machine/include/ti33x.inc -KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblue.dtb \ - am335x-boneblack.dtb am335x-boneblack-wireless.dtb \ - am335x-bonegreen.dtb am335x-bonegreen-wireless.dtb" +KERNEL_DEVICETREE_PREFIX = "am335x-bone" + +KERNEL_DEVICETREE = " \ + am335x-bone.dtb \ + am335x-boneblue.dtb \ + am335x-boneblack.dtb \ + am335x-boneblack-wireless.dtb \ + am335x-bonegreen.dtb \ + am335x-bonegreen-wireless.dtb \ +" MACHINE_GUI_CLASS = "bigscreen" MACHINE_FEATURES += "screen" diff --git a/meta-ti-bsp/conf/machine/dra7xx-evm.conf b/meta-ti-bsp/conf/machine/dra7xx-evm.conf index 813e0e06..c47a1e80 100644 --- a/meta-ti-bsp/conf/machine/dra7xx-evm.conf +++ b/meta-ti-bsp/conf/machine/dra7xx-evm.conf @@ -8,20 +8,18 @@ MACHINE_FEATURES += "touchscreen" SERIAL_CONSOLES = "115200;ttyS0" +KERNEL_DEVICETREE_PREFIX = " \ + dra7 \ + ti/dra7 \ + ti/lcd \ +" + KERNEL_DEVICETREE = " \ dra7-evm.dtb \ - ti/dra7x-evm-osd-lcd-common.dtbo \ dra71-evm.dtb \ - ${@oe.utils.conditional('PREFERRED_PROVIDER_virtual/kernel', 'linux-ti-mainline', '', 'dra71-evm-nand.dtb', d)} \ - ti/dra71-evm-lcd-auo-g101evn01.0.dtbo \ dra72-evm.dtb \ dra72-evm-revc.dtb \ - ti/dra72-evm-touchscreen.dtbo \ - ti/dra74-evm-touchscreen.dtbo \ dra76-evm.dtb \ - ti/dra76-evm-tfp410.dtbo \ - ti/lcd-osd101t2045.dtbo \ - ti/lcd-osd101t2587.dtbo \ " UBOOT_MACHINE = "dra7xx_evm_config" diff --git a/meta-ti-bsp/conf/machine/include/am64xx.inc b/meta-ti-bsp/conf/machine/include/am64xx.inc index a2e5d673..157bf5d5 100644 --- a/meta-ti-bsp/conf/machine/include/am64xx.inc +++ b/meta-ti-bsp/conf/machine/include/am64xx.inc @@ -4,12 +4,11 @@ SOC_FAMILY:append = ":am64xx" SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" +KERNEL_DEVICETREE_PREFIX = "ti/k3-am642" + KERNEL_DEVICETREE = " \ ti/k3-am642-evm.dtb \ ti/k3-am642-sk.dtb \ - ti/k3-am642-evm-icssg1-dualemac.dtbo \ - ti/k3-am642-evm-icssg1-dualemac-mii.dtbo \ - ti/k3-am642-evm-nand.dtbo \ " # Default tiboot3.bin on AM64x is for SR2.0 HS-FS diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc index 0ae00761..564d61b0 100644 --- a/meta-ti-bsp/conf/machine/include/am65xx.inc +++ b/meta-ti-bsp/conf/machine/include/am65xx.inc @@ -8,18 +8,10 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" PREFERRED_PROVIDER_virtual/gpudriver ?= "" +KERNEL_DEVICETREE_PREFIX = "ti/k3-am654" + KERNEL_DEVICETREE = " \ ti/k3-am654-base-board.dtb \ - ti/k3-am654-base-board-sr1.dtbo \ - ti/k3-am654-gp.dtbo \ - ti/k3-am654-idk.dtbo \ - ti/k3-am654-idk-sr1.dtbo \ - ti/k3-am654-sr1.dtbo \ - ti/k3-am654-pcie-usb2.dtbo \ - ti/k3-am654-pcie-usb3.dtbo \ - ti/k3-am654-evm-tc358876.dtbo \ - ti/k3-am654-evm-oldi-lcd1evm.dtbo \ - ti/k3-am654-evm-ov5640.dtbo \ " # On AM65x the file tiboot3.bin comes from the bootloader not ti-sci-fw diff --git a/meta-ti-bsp/conf/machine/include/ti33x.inc b/meta-ti-bsp/conf/machine/include/ti33x.inc index 95499552..4f6d90bf 100644 --- a/meta-ti-bsp/conf/machine/include/ti33x.inc +++ b/meta-ti-bsp/conf/machine/include/ti33x.inc @@ -18,12 +18,19 @@ PVR_DISPLAY_CONTROLLER_ALIAS ?= "tilcdc" KERNEL_IMAGETYPE = "zImage" +KERNEL_DEVICETREE_PREFIX = "am335x" + KERNEL_DEVICETREE = " \ - am335x-evm.dtb am335x-evmsk.dtb \ + am335x-evm.dtb \ + am335x-evmsk.dtb \ am335x-icev2.dtb \ - am335x-pocketbeagle.dtb am335x-bone.dtb am335x-boneblue.dtb \ - am335x-bonegreen.dtb am335x-bonegreen-wireless.dtb \ - am335x-boneblack.dtb am335x-boneblack-wireless.dtb \ + am335x-pocketbeagle.dtb \ + am335x-bone.dtb \ + am335x-boneblue.dtb \ + am335x-bonegreen.dtb \ + am335x-bonegreen-wireless.dtb \ + am335x-boneblack.dtb \ + am335x-boneblack-wireless.dtb \ am335x-sancloud-bbe.dtb \ " diff --git a/meta-ti-bsp/conf/machine/include/ti43x.inc b/meta-ti-bsp/conf/machine/include/ti43x.inc index ec6d9c07..5b40925e 100644 --- a/meta-ti-bsp/conf/machine/include/ti43x.inc +++ b/meta-ti-bsp/conf/machine/include/ti43x.inc @@ -18,12 +18,16 @@ PVR_DISPLAY_CONTROLLER_ALIAS ?= "omapdrm" KERNEL_IMAGETYPE = "zImage" +KERNEL_DEVICETREE_PREFIX = " \ + am437x \ + am43x \ +" + KERNEL_DEVICETREE = " \ am437x-gp-evm.dtb \ - ${@oe.utils.conditional('PREFERRED_PROVIDER_virtual/kernel', 'linux-ti-mainline', '', 'am437x-gp-evm-hdmi.dtb', d)} \ - am437x-sk-evm.dtb am437x-idk-evm.dtb \ + am437x-sk-evm.dtb \ + am437x-idk-evm.dtb \ am43x-epos-evm.dtb \ - ${@oe.utils.conditional('PREFERRED_PROVIDER_virtual/kernel', 'linux-ti-mainline', '', 'am43x-epos-evm-hdmi.dtb', d)} \ " KERNEL_DEVICETREE += "${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am437x-idk-pru-excl-uio.dtb', '', d)}" diff --git a/meta-ti-bsp/conf/machine/j7200-evm.conf b/meta-ti-bsp/conf/machine/j7200-evm.conf index c01b318b..b17b65b7 100644 --- a/meta-ti-bsp/conf/machine/j7200-evm.conf +++ b/meta-ti-bsp/conf/machine/j7200-evm.conf @@ -7,10 +7,10 @@ require conf/machine/include/j7200.inc SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" +KERNEL_DEVICETREE_PREFIX = "ti/k3-j7200" + KERNEL_DEVICETREE = " \ ti/k3-j7200-common-proc-board.dtb \ - ti/k3-j7200-mcspi-loopback.dtbo \ - ti/k3-j7200-common-proc-board-uarts.dtbo \ " UBOOT_MACHINE = "j7200_evm_a72_config" diff --git a/meta-ti-bsp/conf/machine/j721e-evm.conf b/meta-ti-bsp/conf/machine/j721e-evm.conf index 029b1fe7..f602a77b 100644 --- a/meta-ti-bsp/conf/machine/j721e-evm.conf +++ b/meta-ti-bsp/conf/machine/j721e-evm.conf @@ -7,33 +7,14 @@ require conf/machine/include/j721e.inc SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" +KERNEL_DEVICETREE_PREFIX = " \ + ti/k3-j721e \ + ti/k3-j7200-mcspi-loopback \ +" + KERNEL_DEVICETREE = " \ ti/k3-j721e-common-proc-board.dtb \ - ti/k3-j721e-common-proc-board-infotainment.dtbo \ - ti/k3-j721e-cpb-csi2-ov5640.dtbo \ - ti/k3-j721e-fpdlink-cpb-fusion.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-0-0.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-0-1.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-0-2.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-0-3.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-1-0.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-1-1.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-1-2.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-1-3.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-0-0.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-0-1.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-0-2.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-0-3.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-1-0.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-1-1.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-1-2.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-1-3.dtbo \ ti/k3-j721e-sk.dtb \ - ti/k3-j721e-fpdlink-sk-fusion.dtbo \ - ti/k3-j721e-sk-csi2-ov5640.dtbo \ - ti/k3-j721e-sk-rpi-cam-imx219.dtbo \ - ti/k3-j721e-common-proc-board-uarts.dtbo \ - ti/k3-j7200-mcspi-loopback.dtbo \ " UBOOT_MACHINE = "j721e_evm_a72_config" diff --git a/meta-ti-bsp/conf/machine/j721s2-evm.conf b/meta-ti-bsp/conf/machine/j721s2-evm.conf index 5a32e1b3..1f54c7b1 100644 --- a/meta-ti-bsp/conf/machine/j721s2-evm.conf +++ b/meta-ti-bsp/conf/machine/j721s2-evm.conf @@ -9,35 +9,13 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" TFA_K3_USART = "0x8" OPTEE_K3_USART = "0x8" +KERNEL_DEVICETREE_PREFIX = " \ + ti/k3-j721s2 \ + ti/k3-j7200-mcspi-loopback \ +" + KERNEL_DEVICETREE = " \ - ti/k3-am68-sk-base-board.dtb \ - ti/k3-am68-sk-bb-csi2-ov5640.dtbo \ - ti/k3-am68-sk-bb-rpi-cam-imx219.dtbo \ - ti/k3-am68-sk-fpdlink-fusion.dtbo \ - ti/k3-am68-sk-rpi-hdr-ehrpwm.dtbo \ - ti/k3-am68-sk-som-ddr_mem_carveout.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-0-0.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-0-1.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-0-2.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-0-3.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-1-0.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-1-1.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-1-2.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-1-3.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-0-0.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-0-1.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-0-2.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-0-3.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-1-0.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-1-1.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-1-2.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-1-3.dtbo \ ti/k3-j721s2-common-proc-board.dtb \ - ti/k3-j721s2-cpb-csi2-ov5640.dtbo \ - ti/k3-j721s2-fpdlink-cpb-fusion.dtbo \ - ti/k3-j721s2-gesi-exp-board.dtbo \ - ti/k3-j721s2-common-proc-board-uarts.dtbo \ - ti/k3-j7200-mcspi-loopback.dtbo \ " UBOOT_MACHINE = "j721s2_evm_a72_defconfig" diff --git a/meta-ti-bsp/conf/machine/j784s4-evm.conf b/meta-ti-bsp/conf/machine/j784s4-evm.conf index 84fd4996..53bb4e4f 100644 --- a/meta-ti-bsp/conf/machine/j784s4-evm.conf +++ b/meta-ti-bsp/conf/machine/j784s4-evm.conf @@ -9,36 +9,13 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" TFA_K3_USART = "0x8" OPTEE_K3_USART = "0x8" -KERNEL_DEVICETREE = " \ - ti/k3-am69-sk.dtb \ - ti/k3-am69-sk-csi2-ov5640.dtbo \ - ti/k3-am69-sk-ddr-mem-carveout.dtbo \ - ti/k3-am69-sk-fpdlink-fusion.dtbo \ - ti/k3-am69-sk-rpi-hdr-ehrpwm.dtbo \ - ti/k3-am69-sk-rpi-cam-imx219.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-0-0.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-0-1.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-0-2.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-0-3.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-1-0.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-1-1.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-1-2.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-1-3.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-0-0.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-0-1.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-0-2.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-0-3.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-1-0.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-1-1.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-1-2.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-1-3.dtbo \ - ti/k3-j784s4-evm.dtb \ - ti/k3-j784s4-evm-csi2-ov5640.dtbo \ - ti/k3-j784s4-fpdlink-fusion.dtbo \ - ti/k3-j784s4-evm-uarts.dtbo \ - ti/k3-j7200-mcspi-loopback.dtbo \ +KERNEL_DEVICETREE_PREFIX = " \ + ti/k3-j784s4 \ + ti/k3-j7200-mcspi-loopback \ " +KERNEL_DEVICETREE = "" + UBOOT_MACHINE = "j784s4_evm_a72_defconfig" # Default tiboot3.bin on J784S4 is for GP diff --git a/meta-ti-bsp/conf/machine/omapl138-lcdk.conf b/meta-ti-bsp/conf/machine/omapl138-lcdk.conf index b318f82d..a8b08964 100644 --- a/meta-ti-bsp/conf/machine/omapl138-lcdk.conf +++ b/meta-ti-bsp/conf/machine/omapl138-lcdk.conf @@ -15,4 +15,9 @@ IMAGE_FSTYPES += "tar.xz" SERIAL_CONSOLES = "115200;ttyS2" -KERNEL_DEVICETREE = "da850-evm.dtb da850-lcdk.dtb" +KERNEL_DEVICETREE_PREFIX = "da850" + +KERNEL_DEVICETREE = " \ + da850-evm.dtb \ + da850-lcdk.dtb \ +" -- cgit v1.2.3-54-g00ecf