From 460c3f0fbdfaceeba5181f362bd8ed8a9dde9fc7 Mon Sep 17 00:00:00 2001 From: Drew Fustini Date: Sun, 3 Jul 2022 20:06:07 -0700 Subject: [PATCH] conf: am57xx-evm: avoid missing dtb files when ARAGO_BRAND=mainline For ARAGO_BRAND=mainline with the am57xx-evm MACHINE, avoid the inclusion of device tree files that do not exist upstream. Signed-off-by: Drew Fustini Signed-off-by: Ryan Eatmon --- conf/machine/am57xx-evm.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/machine/am57xx-evm.conf b/conf/machine/am57xx-evm.conf index afcfbb43..2fde75fe 100644 --- a/conf/machine/am57xx-evm.conf +++ b/conf/machine/am57xx-evm.conf @@ -13,9 +13,9 @@ KERNEL_DEVICETREE = " \ am57xx-beagle-x15-revb1.dtb \ am57xx-beagle-x15-revc.dtb \ am5729-beagleboneai.dtb \ - am57xx-evm.dtb \ + ${@oe.utils.conditional('ARAGO_BRAND', 'mainline', '', 'am57xx-evm.dtb', d)} \ ti/am57xx-evm-common.dtbo \ - am57xx-evm-reva3.dtb \ + ${@oe.utils.conditional('ARAGO_BRAND', 'mainline', '', 'am57xx-evm-reva3.dtb', d)} \ ti/am57xx-evm-reva3.dtbo \ am571x-idk.dtb \ ti/am571x-idk-touchscreen.dtbo \ @@ -25,7 +25,7 @@ KERNEL_DEVICETREE = " \ ti/am572x-idk-touchscreen.dtbo \ ti/lcd-osd101t2587.dtbo \ ti/lcd-osd101t2045.dtbo \ - ti/ov10635.dtbo \ + ${@oe.utils.conditional('ARAGO_BRAND', '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)}"