Yocto 5 Upgrade

meta-adi-adsp-sc5xx/classes/adsp-fit-generation.bbclass

@@ -58,7 +58,7 @@ emit_its() {
 
 		ramdisk-3 {
 			description = "Initial Ram File System";
-			data = /incbin/("adsp-sc5xx-ramdisk-${MACHINE}.cpio.gz");
+			data = /incbin/("adsp-sc5xx-ramdisk-${MACHINE}.rootfs.cpio.gz");
 			type = "ramdisk";
 			arch = "${ARCH}";
 			os = "linux";
@@ -95,6 +95,7 @@ EOF
 
 do_assemble_fitimage() {
 	cd ${DEPLOY_DIR_IMAGE}
+        echo "currently in ${DEPLOY_DIR_IMAGE}"
 	emit_its;
 	uboot-mkimage -D "${UBOOT_MKIMAGE_DTCOPTS}" -f fit-image.its fitImage
 }

meta-adi-adsp-sc5xx/conf/layer.conf

@@ -11,4 +11,4 @@ BBFILE_COLLECTIONS += "adsp-sc5xx"
 BBFILE_PATTERN_adsp-sc5xx = "^${LAYERDIR}/"
 BBFILE_PRIORITY_adsp-sc5xx = "6"
 
-LAYERSERIES_COMPAT_adsp-sc5xx = "kirkstone"
+LAYERSERIES_COMPAT_adsp-sc5xx = "scarthgap"

meta-adi-adsp-sc5xx/recipes-adi/crypto-tests/crc-tests.bb

@@ -26,4 +26,4 @@ do_install(){
 FILES:${PN} += " \
 	/crypto/adi-crc \
 	/crypto/adi-crc.sh \
-"
+"

meta-adi-adsp-sc5xx/recipes-adi/crypto-tests/crypto-tests.bb

@@ -27,4 +27,4 @@ FILES:${PN} += " \
 	/crypto/adi-hash \
 	/crypto/adi-hash.sh \
 	/crypto/adi-skcipher.sh \
-"
+"

meta-adi-adsp-sc5xx/recipes-adi/crypto-tests/cryptodev-linux/0001-Add-in-CRC32_HMAC-for-ADI-driver.patch

@@ -1,8 +1,8 @@
 From 5af19fcbd44ed69b11f221cffd86f04ed866d06a Mon Sep 17 00:00:00 2001
 From: Nathan Barrett-Morrison <[email protected]>
 Date: Wed, 9 Mar 2022 09:05:16 -0500
+Upstream-Status: Pending
 Subject: [PATCH] Add in CRC32_HMAC for ADI driver
-
 ---
  crypto/cryptodev.h | 1 +
  ioctl.c            | 3 +++

meta-adi-adsp-sc5xx/recipes-adi/crypto-tests/cryptodev-linux_%.bbappend

@@ -1 +1,3 @@
-require cryptodev.inc
+require cryptodev.inc
+
+

meta-adi-adsp-sc5xx/recipes-adi/crypto-tests/cryptodev.inc

@@ -1,5 +1,13 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/cryptodev-linux:"
 
+
+SCARTHGAP_SRCREV = "bb8bc7cf60d2c0b097c8b3b0e807f805b577a53f"
+UPSTREAM_SRCREV = "157a624d7a892ea5fb2df4bbd4e71c008adbecb7"
+
+UPSTREAM_COMPAT = "${@ True if ('adsp-sc598-som' in d.getVar('MACHINE')) else False}"
+UPSTREAM = "${@bb.utils.contains('ADSP_KERNEL_TYPE','upstream', d.getVar('UPSTREAM_COMPAT'), False ,d)}"
+SRCREV = "${@ d.getVar('UPSTREAM_SRCREV') if bb.utils.to_boolean(d.getVar('UPSTREAM')) else d.getVar('SCARTHGAP_SRCREV')}"
+
 SRC_URI += " \
-	file://0001-Add-in-CRC32_HMAC-for-ADI-driver.patch \
+    file://0001-Add-in-CRC32_HMAC-for-ADI-driver.patch \
 "

meta-adi-adsp-sc5xx/recipes-adi/images/adsp-sc5xx-full.bb

@@ -26,7 +26,6 @@ SOUND = " \
 
 UTILS = " \
     iperf3 \
-    perf \
     netperf \
     cpufrequtils \
     uftrace \
@@ -35,6 +34,8 @@ UTILS = " \
     bonnie++ \
 "
 
+UTILS += "${@'' if (bb.utils.to_boolean(d.getVar('ADSP_KERNEL_TYPE') == 'upstream')) else ' perf '}"
+
 IMAGE_INSTALL += " \
     ${UTILS} \
    	${FILE_SYSTEM_TOOLS} \

meta-adi-adsp-sc5xx/recipes-adi/tests/linuxptp-test/0001-Add-linuxptp-adi-patch-for-testptp.patch

@@ -1,21 +1,21 @@
-From 5e7e1e11dc9f3404d2fface245e56049ea694346 Mon Sep 17 00:00:00 2001
-From: huanhuan feng <huanhuan.feng@analog.com>
-Date: Fri, 10 Jul 2020 23:25:08 +0800
-Subject: [PATCH] Add linuxptp-adi patch for ptptest
+From d905c5b6e0f445ed3a519b435fc0106ff5f3b13b Mon Sep 17 00:00:00 2001
+From: UtsavAgarwalADI <utsav.agarwal@analog.com>
+Date: Thu, 4 Apr 2024 10:54:27 +0100
+Upstream-Status: Pending
 
-Signed-off-by: huanhuan feng <[email protected]>
+Subject: [PATCH] Add linuxptp-adi patch for ptptest
 
 ---
- sk.c      |   8 +
- testptp.c | 519 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 527 insertions(+)
- create mode 100755 testptp.c
+ sk.c      |   9 +
+ testptp.c | 520 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 529 insertions(+)
+ create mode 100644 testptp.c
 
 diff --git a/sk.c b/sk.c
-index 63ec206..a448ca3 100644
+index 19395c9..faac4ab 100644
 --- a/sk.c
 +++ b/sk.c
-@@ -245,6 +245,10 @@ int sk_receive(int fd, void *buf, int buflen,
+@@ -435,6 +435,10 @@ int sk_receive(int fd, void *buf, int buflen,
  	msg.msg_control = control;
  	msg.msg_controllen = sizeof(control);
 
@@ -26,23 +26,25 @@ index 63ec206..a448ca3 100644
  	if (flags == MSG_ERRQUEUE) {
  		struct pollfd pfd = { fd, sk_events, 0 };
  		res = poll(&pfd, 1, sk_tx_timeout);
-@@ -288,6 +292,10 @@ int sk_receive(int fd, void *buf, int buflen,
+@@ -485,6 +489,11 @@ int sk_receive(int fd, void *buf, int buflen,
  	if (addr)
  		addr->len = msg.msg_namelen;
 
 +#ifdef __NOMMU__
 +	if (flags == MSG_ERRQUEUE && cm == NULL)
 +		goto retry;
 +#endif
++
  	if (!ts) {
  		memset(&hwts->ts, 0, sizeof(hwts->ts));
- 		return cnt;
+ 		return cnt < 0 ? -errno : cnt;
 diff --git a/testptp.c b/testptp.c
-new file mode 100755
-index 0000000..2bc8abc
+new file mode 100644
+index 0000000..ee50569
 --- /dev/null
 +++ b/testptp.c
-@@ -0,0 +1,519 @@
+@@ -0,0 +1,520 @@
++
 +/*
 + * PTP 1588 clock support - User space test program
 + *
@@ -562,3 +564,6 @@ index 0000000..2bc8abc
 +	close(fd);
 +	return 0;
 +}
+-- 
+2.25.1
+

meta-adi-adsp-sc5xx/recipes-core/busybox/busybox-watchdog-init.bb

@@ -27,7 +27,7 @@ do_install(){
         install -m 0644 ${WORKDIR}/watchdog.service ${D}${systemd_system_unitdir}/watchdog.service
 
         install -d ${D}/etc/systemd/system/multi-user.target.wants/
-        ln -s ${systemd_system_unitdir}/watchdog.service} ${D}/etc/systemd/system/multi-user.target.wants/watchdog.service
+        ln -s ${systemd_system_unitdir}/watchdog.service ${D}/etc/systemd/system/multi-user.target.wants/watchdog.service
     else
         install -d ${D}/${INIT_D_DIR}
         install -m 0755 ${WORKDIR}/${INITSCRIPT_NAME} ${D}/${INIT_D_DIR}/${INITSCRIPT_NAME}
@@ -42,4 +42,4 @@ FILES:${PN} += " \
     ${SYSTEMD_INITSCRIPT_NAME_FILES} \
     ${SYSTEMD_SERVICE_NAME_FILES} \
     ${SYSVINIT_FILES} \
-"
+"

meta-adi-adsp-sc5xx/recipes-core/busybox/busybox/defconfig

@@ -667,7 +667,7 @@ CONFIG_RENICE=y
 # CONFIG_RTCWAKE is not set
 # CONFIG_SCRIPT is not set
 # CONFIG_SCRIPTREPLAY is not set
-CONFIG_SETARCH=y
+CONFIG_SETARCH=n
 CONFIG_LINUX32=y
 CONFIG_LINUX64=y
 CONFIG_SETPRIV=y

meta-adi-adsp-sc5xx/recipes-core/busybox/busybox/watchdog.sh

@@ -15,7 +15,7 @@ case "$1" in
 	/sbin/watchdog -t 1 /dev/watchdog
 	;;
   *)
-	echo $"Usage: $0 {start|stop|restart}"
+	echo "Usage: $0 {start|stop|restart}"
 	exit 1
 esac
 

meta-adi-adsp-sc5xx/recipes-devtools/python/python3_%.bbappend

@@ -1,5 +1,5 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/python3:"
 
-SRC_URI += " \
-	file://0001-The-NIS-module-does-not-build-properly.-Disabling-fo.patch \
-"
+#SRC_URI += " \
+#	file://0001-The-NIS-module-does-not-build-properly.-Disabling-fo.patch \
+#"

meta-adi-adsp-sc5xx/recipes-extended/rng-tools/files/0001-Disable-RNDR-as-this-is-not-available-on-our-ARMv8.2.patch

@@ -1,19 +1,21 @@
-From a4fae0e2dc955b587a601673ddcedd1a95068faf Mon Sep 17 00:00:00 2001
-From: Nathan Barrett-Morrison <[email protected]>
-Date: Fri, 5 May 2023 11:52:50 -0400
+From 2a734ceb55f35e7c7f6471b0b66dbab244383e5a Mon Sep 17 00:00:00 2001
+From: UtsavAgarwalADI <[email protected]>
+Date: Thu, 4 Apr 2024 10:43:54 +0100
+Upstream-Status: Pending
 Subject: [PATCH] Disable RNDR as this is not available on our ARMv8.2 platform
 
+Signed-off-by: UtsavAgarwalADI <[email protected]>
 ---
  Makefile.am  | 4 ----
  configure.ac | 2 --
  2 files changed, 6 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index c303b11..6f938bc 100644
+index 8001ecc..648dd07 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -23,10 +23,6 @@ if DARN
- rngd_SOURCES	+= rngd_darn.c
+@@ -20,10 +20,6 @@ if RDRAND
+ rngd_SOURCES	+= rngd_rdrand.c rdrand_asm.S
  endif
 
 -if RNDR
@@ -24,17 +26,18 @@ index c303b11..6f938bc 100644
  rngd_SOURCES	+= rngd_jitter.c
  endif
 diff --git a/configure.ac b/configure.ac
-index 40008ca..6c74402 100644
+index 91775cf..1457e3b 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -75,8 +75,6 @@ AS_IF([test $host_cpu = x86_64 || test $host_cpu = i686], [AC_DEFINE([HAVE_RDRAN
- AM_CONDITIONAL([DARN], [test $host_cpu = powerpc64le])
- AS_IF([test $host_cpu = powerpc64le], [AC_DEFINE([HAVE_DARN],1,[Enable DARN])],[])
+@@ -85,8 +85,6 @@ AS_IF([test $host_cpu = x86_64 || test $host_cpu = i686], [AC_DEFINE([HAVE_RDRAN
+ AM_CONDITIONAL([DARN], [test $host_cpu = powerpc64le -a "$ac_cv_header_sys_auxv_h" = "yes"])
+ AS_IF([test $host_cpu = powerpc64le -a "$ac_cv_header_sys_auxv_h" = "yes"], [AC_DEFINE([HAVE_DARN],1,[Enable DARN])],[])
 
--AM_CONDITIONAL([RNDR], [test $host_cpu = aarch64])
--AS_IF([test $host_cpu = aarch64], [AC_DEFINE([HAVE_RNDR],1,[Enable RNDR])],[])
+-AM_CONDITIONAL([RNDR], [test $host_cpu = aarch64 -a "$ac_cv_header_sys_auxv_h" = "yes"])
+-AS_IF([test $host_cpu = aarch64 -a "$ac_cv_header_sys_auxv_h" = "yes"], [AC_DEFINE([HAVE_RNDR],1,[Enable RNDR])],[])
  AM_CONDITIONAL([JITTER], [false])
 
  AC_ARG_ENABLE(jitterentropy,
 -- 
-2.30.2
+2.25.1
+

meta-adi-adsp-sc5xx/recipes-icc/rpmsg-echo-example/rpmsg-echo-example_1.0.bb

@@ -8,15 +8,15 @@ SRC_URI += " \
 "
 
 do_install() {
-	install -m 0755 -d ${D}/lib/firmware
+	install -m 0755 -d ${D}/usr/lib/firmware
 	install -m 0755 -d ${D}/usr/bin
-	install -m 0755 ${WORKDIR}/echo_core1-${MACHINE}.ldr ${D}/lib/firmware/adi_adsp_core1_fw.ldr
-	install -m 0755 ${WORKDIR}/echo_core2-${MACHINE}.ldr ${D}/lib/firmware/adi_adsp_core2_fw.ldr
+	install -m 0755 ${WORKDIR}/echo_core1-${MACHINE}.ldr ${D}/usr/lib/firmware/adi_adsp_core1_fw.ldr
+	install -m 0755 ${WORKDIR}/echo_core2-${MACHINE}.ldr ${D}/usr/lib/firmware/adi_adsp_core2_fw.ldr
 	install -m 0755 ${WORKDIR}/test_rpmsg_echo.sh ${D}/usr/bin
 }
 
 FILES:${PN} += " \
-	/lib/firmware/adi_adsp_core1_fw.ldr \
-	/lib/firmware/adi_adsp_core2_fw.ldr \
+	/usr/lib/firmware/adi_adsp_core1_fw.ldr \
+	/usr/lib/firmware/adi_adsp_core2_fw.ldr \
 	/usr/bin/test_rpmsg_echo.sh \
 "

meta-adi-adsp-sc5xx/recipes-icc/sharc-audio/hybrid-audio_1.0.bb

@@ -6,10 +6,10 @@ SRC_URI += " \
 "
 
 do_install() {
-	install -m 0755 -d ${D}/lib/firmware
-	install -m 0755 ${WORKDIR}/icap-device-example_Core1.ldr ${D}/lib/firmware/adi_adsp_core1_fw.ldr
+	install -m 0755 -d ${D}/usr/lib/firmware
+	install -m 0755 ${WORKDIR}/icap-device-example_Core1.ldr ${D}/usr/lib/firmware/adi_adsp_core1_fw.ldr
 }
 
 FILES:${PN} = " \
-	/lib/firmware/adi_adsp_core1_fw.ldr \
+	/usr/lib/firmware/adi_adsp_core1_fw.ldr \
 "

meta-adi-adsp-sc5xx/recipes-icc/sharc-audio/sharc-audio_1.0.bb

@@ -7,12 +7,12 @@ SRC_URI += " \
 "
 
 do_install() {
-	install -m 0755 -d ${D}/lib/firmware
-	install -m 0755 ${WORKDIR}/icap-sharc-alsa_Core1.ldr ${D}/lib/firmware/adi_adsp_core1_fw.ldr
-	install -m 0755 ${WORKDIR}/icap-sharc-alsa_Core2.ldr ${D}/lib/firmware/adi_adsp_core2_fw.ldr	
+	install -m 0755 -d ${D}/usr/lib/firmware
+	install -m 0755 ${WORKDIR}/icap-sharc-alsa_Core1.ldr ${D}/usr/lib/firmware/adi_adsp_core1_fw.ldr
+	install -m 0755 ${WORKDIR}/icap-sharc-alsa_Core2.ldr ${D}/usr/lib/firmware/adi_adsp_core2_fw.ldr	
 }
 
 FILES:${PN} = " \
-	/lib/firmware/adi_adsp_core1_fw.ldr \
-	/lib/firmware/adi_adsp_core2_fw.ldr \
+	/usr/lib/firmware/adi_adsp_core1_fw.ldr \
+	/usr/lib/firmware/adi_adsp_core2_fw.ldr \
 "

meta-adi-adsp-sc5xx/recipes-kernel/linux-firmware/linux-firmware_%.bbappend

@@ -15,10 +15,10 @@ SRC_URI[LICENSE.adau1761.md5sum] = "dff5777c9526c7f6db0a0571f066e818"
 SRC_URI[LICENSE.md.md5sum] = "e2bfd7246b6d241634f71dfdbfef3d41"
 
 
-FILEPATH = "/lib/firmware"
+FILEPATH = "/usr/lib/firmware"
 
 do_install:append() {
-	install -m 0644 ${WORKDIR}/LICENSE.adau1761 ${D}${FILEPATH}
+        install -m 0644 ${WORKDIR}/LICENSE.adau1761 ${D}${FILEPATH}
 	install -m 0644 ${WORKDIR}/adau1761.bin ${D}${FILEPATH}
 	install -m 0644 ${WORKDIR}/sharc-alsa/LICENSE.md ${D}${FILEPATH}
 	install -m 0644 ${WORKDIR}/sharc-alsa/icap-device-example.ldr ${D}${FILEPATH}
@@ -28,10 +28,12 @@ do_install:append() {
 	install -m 0644 ${WORKDIR}/sharc-alsa/2Ch_L440_R200_48kHz_16bit_6s.wav ${D}/usr/share/sounds/alsa/
 }
 
+FILES:${PN} = "${FILEPATH}"
+
 PACKAGES =+ "${PN}-adau1761"
 
 FILES:${PN}-adau1761 = " \
-		${FILEPATH}/LICENSE.adau1761 \
+                ${FILEPATH}/LICENSE.adau1761 \
 		${FILEPATH}/adau1761.bin \
 		"
 

meta-adi-adsp-sc5xx/recipes-kernel/linux/linux-adi.inc

@@ -5,9 +5,8 @@ inherit adsp-sc5xx-compatible
 
 require recipes-kernel/linux/linux-yocto.inc
 
-KERNEL_GIT_URI ?= "git://github.com/analogdevicesinc/lnxdsp-linux.git"
+KERNEL_GIT_URI ?= "${@bb.utils.contains('PV', 'upstream', 'git://github.com/analogdevicesinc/linux.git' ,'git://github.com/analogdevicesinc/lnxdsp-linux.git', d)}"
 KERNEL_GIT_PROTOCOL ?= "https"
-
 SRC_URI += " \
 	${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${KERNEL_BRANCH} \
 "