Update isar and isar-cip-core layers

Lifts isar to the new release 0.10. Also isar-cip-core is updated significantly from 1.2 to the latest post-1.3 revision. These updates require to some tuning of the ti-pruss-firmware recipe to prevent unwanted and failing strip attempts on the binaries. We also need to rework swupdate configuration, adding SWU_HW_COMPAT support. For that, we can reuse isar-cip-core's swupdate-config recipe, reducing own work. Signed-off-by: Jan Kiszka <[email protected]>
siemens · May 24, 2024 · afa89f5 · afa89f5
1 parent 9ece8fd
commit afa89f5
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 13 deletions.
diff --git a/kas/iot2050.yml b/kas/iot2050.yml
@@ -27,13 +27,13 @@ repos:
 
   isar:
     url: https://github.com/ilbers/isar
-    commit: 30471bb3f787fb0aa822d15e141ecce2f3b99860
+    commit: 9dc362cd7115074c0f60843e687ed89db5c9339a
     layers:
       meta:
 
   cip-core:
     url: https://gitlab.com/cip-project/cip-core/isar-cip-core.git
-    commit: 04ea9de0181e72961491f28c294172178efe474a
+    commit: 704353612238cb2ac1c16f29db6f314b60cd83b0
 
 local_conf_header:
   standard: |

diff --git a/recipes-bsp/ti-pruss-firmware/ti-pruss-firmware_09.00.00.005.bb b/recipes-bsp/ti-pruss-firmware/ti-pruss-firmware_09.00.00.005.bb
@@ -30,6 +30,8 @@ SRC_URI = " \
     ${@get_prueth_fw(d, 'am65x-sr2-txpru1-prueth-fw.elf', '7d1bcde936bdf9606c1810c3316439e79d6d8b6f2751919d1d654abeb1545613')} \
     "
 
+DEB_BUILD_OPTIONS = "nostrip"
+
 do_install() {
     install -v -d ${D}/lib/firmware/ti-pruss
     install -v -m 644 ${WORKDIR}/am65x-*.elf ${D}/lib/firmware/ti-pruss

diff --git a/recipes-core/images/iot2050-image-swu-example.bb b/recipes-core/images/iot2050-image-swu-example.bb
@@ -23,6 +23,8 @@ WKS_FILE:secureboot = "iot2050-swu-secure.wks.in"
 IMAGE_FSTYPES += "swu"
 SWU_ROOTFS_TYPE:secureboot = "verity"
 
+SWU_HW_COMPAT = "IOT2050"
+
 # watchdog is managed by U-Boot - disable
 WDOG_TIMEOUT = "0"
 
@@ -38,7 +40,7 @@ IMAGE_INSTALL:remove:secureboot = "expand-on-first-boot"
 # EFI Boot Guard is used instead
 IMAGE_INSTALL:remove = "u-boot-script"
 
-IMAGE_INSTALL += "customizations-swupdate"
+IMAGE_INSTALL += "swupdate-config"
 IMAGE_INSTALL += "swupdate-handler-roundrobin"
 IMAGE_INSTALL += "swupdate-complete-update-helper"
 IMAGE_INSTALL += "${@ 'iot2050-watchdog' if d.getVar('QEMU_IMAGE') != '1' else '' }"

diff --git a/...ustomizations-swupdate/files/swupdate.cfg → ...s-core/swupdate-config/files/swupdate.cfg b/...ustomizations-swupdate/files/swupdate.cfg → ...s-core/swupdate-config/files/swupdate.cfg
diff --git a/...omizations-swupdate_0.1-iot2050-debian.bb → ...wupdate-config/swupdate-config_%.bbappend b/...omizations-swupdate_0.1-iot2050-debian.bb → ...wupdate-config/swupdate-config_%.bbappend
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Siemens AG, 2023
+# Copyright (c) Siemens AG, 2023-2024
 #
 # Authors:
 #  Jan Kiszka <[email protected]>
@@ -8,15 +8,8 @@
 # COPYING.MIT file in the top-level directory.
 #
 
-inherit dpkg-raw
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
 DESCRIPTION = "IOT2050 swupdate image customizations"
 
-DEBIAN_DEPENDS = "swupdate"
-
-SRC_URI = "file://swupdate.cfg"
-
-do_install() {
-    install -v -d ${D}/etc/
-    install -v -m 644 ${WORKDIR}/swupdate.cfg ${D}/etc/
-}
+MACHINE_HW_VERSION = "IOT2050"