Merge pull request #491 from balena-os/coral_fixes

Coral fixes
balena-os · Sep 7, 2024 · 7865833 · 7865833
2 parents 5592829 + 3a96b7e
commit 7865833
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/layers/meta-balena-coral/recipes-bsp/u-boot/u-boot-coral_%.bbappend b/layers/meta-balena-coral/recipes-bsp/u-boot/u-boot-coral_%.bbappend
@@ -11,6 +11,9 @@ inherit resin-u-boot
 
 SRCBRANCH = "release-day"
 SRCREV = "8523a101cd4dda7ca62d3f99c4bd1b3718cca953"
+SRC_URI = " \
+    git://coral.googlesource.com/uboot-imx;protocol=https;branch=${SRCBRANCH} \
+"
 
 BUILD_CPPFLAGS += " -static"
 
@@ -20,13 +23,13 @@ SRC_URI:asus-tinker-edge-t = "\
     file://0001-tools-allow-to-override-python.patch \
     file://0002-ext4-cache-extent-blocks-during-file-reads.patch \
     file://0003-u-boot-Run-crc32-checks.patch \
-    file://0004-scripts-Fix-dtc-version-check.patch \
-    file://0005-scripts-Makefile.lib-remove-overridden-target-obj-he.patch \
 "
 
 SRC_URI:append = " \
     file://u-boot-Integrate-with-BalenaOS-load-kernel-from-root.patch \
     file://0001-Change-fdt_addr-to-fix-haning-on-Starting-kernel.patch \
+    file://0004-scripts-Fix-dtc-version-check.patch \
+    file://0005-scripts-Makefile.lib-remove-overridden-target-obj-he.patch \
 "
 
 UBOOT_CONFIG[sd] = "mx8mq_phanbell_defconfig,sdcard"

diff --git a/layers/meta-balena-coral/recipes-kernel/linux/linux-imx_4.14.98.bb b/layers/meta-balena-coral/recipes-kernel/linux/linux-imx_4.14.98.bb
@@ -25,6 +25,7 @@ SRC_URI:coral-dev = "\
     file://defconfig \
     file://0001-compiler-attributes-add-support-for-copy-gcc-9.patch \
     file://0002-include-linux-module.h-copy-init-exit-attrs-to-.patch \
+    file://0005-scripts-dtc-Remove-redundant-YYLLOC-global-declarati.patch \
 "
 
 SUMMARY:asus-tinker-edge-t = "Linux Kernel provided and supported by ASUS for ASUS Tinker Edge T"