Skip to contentSkip to conversation

fix ARAGO_BRAND=mainline builds

PATCH New Drew Fustini 1 participant 4 messages Aug 13, 2022

lore
Share & tools
lore
#0 lore raw

v2 cover fix ARAGO_BRAND=mainline builds

Builds for ARAGO_BRAND=mainline are failing for the following machines:

- dra7xx-evm
- am57xx-evm
- am437x-evm

This is beause the above machine configurations include files in their KERNEL_DEVICETREE variable that do not exist upstream. Therefore the image creation task fails when it tries to copy device tree files that do not exist.

This series of patches use '@oe.utils.conditional' to avoid adding those device tree files to KERNEL_DEVICETREE when virtual/kernel is linux-ti-mainline. The image create task is then able to complete successfully regardless of which kernel recipe is being used.

v2 changes:
- Denys suggested switching the conditional test from ARAGO_BRAND to virtual/kernel

Drew Fustini (3):
conf: dra7xx-evm: avoid missing dtb files for linux-ti-mainline
conf: am57xx-evm: avoid missing dtb files for linux-ti-mainline
conf: am43: avoid missing dtb files for linux-ti-mainline

 conf/machine/am57xx-evm.conf   | 6 +++---
 conf/machine/dra7xx-evm.conf   | 2 +-
 conf/machine/include/ti43x.inc | 6 ++++--
 3 files changed, 8 insertions(+), 6 deletions(-)
Signature · 1 line
2.32.0
#1 lore raw

PATCH v2 1/3 conf: dra7xx-evm: avoid missing dtb files for linux-ti-mainline

Avoid the inclusion of device tree files that do not exist upstream when virtual/kernel is linux-ti-mainline for the dra7xx-evm MACHINE.

---
 conf/machine/dra7xx-evm.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
conf/machine/dra7xx-evm.conf +1 -1
index db4a5e1ca5fe..6ab7a18796c0 100644
@@ -12,7 +12,7 @@ KERNEL_DEVICETREE = " \
     dra7-evm.dtb \
     ti/dra7x-evm-osd-lcd-common.dtbo \
     dra71-evm.dtb \
-    dra71-evm-nand.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 \
Signature · 1 line
2.32.0
#2 lore raw

PATCH v2 2/3 conf: am57xx-evm: avoid missing dtb files for linux-ti-mainline

In reply to Drew Fustini

Avoid the inclusion of device tree files that do not exist upstream when virtual/kernel is linux-ti-mainline for the am57xx-evm MACHINE.

---
 conf/machine/am57xx-evm.conf | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
conf/machine/am57xx-evm.conf +3 -3
index afcfbb4318ad..e27dffd0c286 100644
@@ -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('PREFERRED_PROVIDER_virtual/kernel', 'linux-ti-mainline', '', 'am57xx-evm.dtb', d)} \
     ti/am57xx-evm-common.dtbo \
-    am57xx-evm-reva3.dtb \
+    ${@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 \
@@ -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('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)}"
Signature · 1 line
2.32.0
#3 lore raw

PATCH v2 3/3 conf: am43: avoid missing dtb files for linux-ti-mainline

In reply to Drew Fustini

Avoid the inclusion of device tree files that do not exist upstream when virtual/kernel is linux-ti-mainline for the am43xx machines.

---
 conf/machine/include/ti43x.inc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
conf/machine/include/ti43x.inc +4 -2
index fc9af94921c4..ace46b89046e 100644
@@ -27,9 +27,11 @@ PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
 KERNEL_IMAGETYPE = "zImage"
 
 KERNEL_DEVICETREE = " \
-    am437x-gp-evm.dtb am437x-gp-evm-hdmi.dtb \
+    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 \
-    am43x-epos-evm.dtb am43x-epos-evm-hdmi.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)}"
Signature · 1 line
2.32.0