diff --git a/meta-adi-adsp-sc5xx/classes/adsp-fit-generation.bbclass b/meta-adi-adsp-sc5xx/classes/adsp-fit-generation.bbclass index c6cd418..16151f2 100644 --- a/meta-adi-adsp-sc5xx/classes/adsp-fit-generation.bbclass +++ b/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 } diff --git a/meta-adi-adsp-sc5xx/conf/layer.conf b/meta-adi-adsp-sc5xx/conf/layer.conf index 6fcbd93..626f1a4 100644 --- a/meta-adi-adsp-sc5xx/conf/layer.conf +++ b/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" diff --git a/meta-adi-adsp-sc5xx/recipes-adi/crypto-tests/crc-tests.bb b/meta-adi-adsp-sc5xx/recipes-adi/crypto-tests/crc-tests.bb index 3c5426b..3d0d499 100644 --- a/meta-adi-adsp-sc5xx/recipes-adi/crypto-tests/crc-tests.bb +++ b/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 \ -" \ No newline at end of file +" diff --git a/meta-adi-adsp-sc5xx/recipes-adi/crypto-tests/crypto-tests.bb b/meta-adi-adsp-sc5xx/recipes-adi/crypto-tests/crypto-tests.bb index 3bd9378..d381458 100644 --- a/meta-adi-adsp-sc5xx/recipes-adi/crypto-tests/crypto-tests.bb +++ b/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 \ -" \ No newline at end of file +" diff --git a/meta-adi-adsp-sc5xx/recipes-adi/crypto-tests/cryptodev-linux/0001-Add-in-CRC32_HMAC-for-ADI-driver.patch b/meta-adi-adsp-sc5xx/recipes-adi/crypto-tests/cryptodev-linux/0001-Add-in-CRC32_HMAC-for-ADI-driver.patch index 79bdf1c..93bd069 100644 --- a/meta-adi-adsp-sc5xx/recipes-adi/crypto-tests/cryptodev-linux/0001-Add-in-CRC32_HMAC-for-ADI-driver.patch +++ b/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 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 +++ diff --git a/meta-adi-adsp-sc5xx/recipes-adi/crypto-tests/cryptodev-linux_%.bbappend b/meta-adi-adsp-sc5xx/recipes-adi/crypto-tests/cryptodev-linux_%.bbappend index 140af15..3c227e9 100644 --- a/meta-adi-adsp-sc5xx/recipes-adi/crypto-tests/cryptodev-linux_%.bbappend +++ b/meta-adi-adsp-sc5xx/recipes-adi/crypto-tests/cryptodev-linux_%.bbappend @@ -1 +1,3 @@ -require cryptodev.inc \ No newline at end of file +require cryptodev.inc + + diff --git a/meta-adi-adsp-sc5xx/recipes-adi/crypto-tests/cryptodev.inc b/meta-adi-adsp-sc5xx/recipes-adi/crypto-tests/cryptodev.inc index 8a41572..d9c040d 100644 --- a/meta-adi-adsp-sc5xx/recipes-adi/crypto-tests/cryptodev.inc +++ b/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 \ " diff --git a/meta-adi-adsp-sc5xx/recipes-adi/images/adsp-sc5xx-full.bb b/meta-adi-adsp-sc5xx/recipes-adi/images/adsp-sc5xx-full.bb index 1942cad..528c884 100644 --- a/meta-adi-adsp-sc5xx/recipes-adi/images/adsp-sc5xx-full.bb +++ b/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} \ diff --git a/meta-adi-adsp-sc5xx/recipes-adi/tests/linuxptp-test/0001-Add-linuxptp-adi-patch-for-testptp.patch b/meta-adi-adsp-sc5xx/recipes-adi/tests/linuxptp-test/0001-Add-linuxptp-adi-patch-for-testptp.patch index 4e2e72f..6258f88 100644 --- a/meta-adi-adsp-sc5xx/recipes-adi/tests/linuxptp-test/0001-Add-linuxptp-adi-patch-for-testptp.patch +++ b/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 -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 +Date: Thu, 4 Apr 2024 10:54:27 +0100 +Upstream-Status: Pending -Signed-off-by: huanhuan feng +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,7 +26,7 @@ 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; @@ -34,15 +34,17 @@ index 63ec206..a448ca3 100644 + 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 + diff --git a/meta-adi-adsp-sc5xx/recipes-connectivity/openssl/openssl_3.0.12.bbappend b/meta-adi-adsp-sc5xx/recipes-connectivity/openssl/openssl_3.0.12.bbappend deleted file mode 100644 index dd1b9aa..0000000 --- a/meta-adi-adsp-sc5xx/recipes-connectivity/openssl/openssl_3.0.12.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -PACKAGECONFIG[cryptodev-linux] = "enable-devcryptoeng,disable-devcryptoeng,cryptodev-linux" -PACKAGECONFIG:append = " cryptodev-linux" - -#Pull in proper cryptodev.h header -DEPENDS += "cryptodev-linux" \ No newline at end of file diff --git a/meta-adi-adsp-sc5xx/recipes-core/busybox/busybox-watchdog-init.bb b/meta-adi-adsp-sc5xx/recipes-core/busybox/busybox-watchdog-init.bb index 786d163..0971011 100644 --- a/meta-adi-adsp-sc5xx/recipes-core/busybox/busybox-watchdog-init.bb +++ b/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} \ -" \ No newline at end of file +" diff --git a/meta-adi-adsp-sc5xx/recipes-core/busybox/busybox/defconfig b/meta-adi-adsp-sc5xx/recipes-core/busybox/busybox/defconfig index d5999ef..adeeb3c 100644 --- a/meta-adi-adsp-sc5xx/recipes-core/busybox/busybox/defconfig +++ b/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 diff --git a/meta-adi-adsp-sc5xx/recipes-core/busybox/busybox/watchdog.sh b/meta-adi-adsp-sc5xx/recipes-core/busybox/busybox/watchdog.sh index 3d3b2b6..54ff31d 100644 --- a/meta-adi-adsp-sc5xx/recipes-core/busybox/busybox/watchdog.sh +++ b/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 diff --git a/meta-adi-adsp-sc5xx/recipes-core/systemd/systemd_250.5.bbappend b/meta-adi-adsp-sc5xx/recipes-core/systemd/systemd_255.4.bbappend similarity index 100% rename from meta-adi-adsp-sc5xx/recipes-core/systemd/systemd_250.5.bbappend rename to meta-adi-adsp-sc5xx/recipes-core/systemd/systemd_255.4.bbappend diff --git a/meta-adi-adsp-sc5xx/recipes-devtools/python/python3_%.bbappend b/meta-adi-adsp-sc5xx/recipes-devtools/python/python3_%.bbappend index 282fd54..989ca0d 100644 --- a/meta-adi-adsp-sc5xx/recipes-devtools/python/python3_%.bbappend +++ b/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 \ +#" diff --git a/meta-adi-adsp-sc5xx/recipes-extended/liburcu/liburcu/0001-test_uatomic-currently-fails-to-compile-skip-for-now.patch b/meta-adi-adsp-sc5xx/recipes-extended/liburcu/liburcu/0001-test_uatomic-currently-fails-to-compile-skip-for-now.patch deleted file mode 100644 index b2d6def..0000000 --- a/meta-adi-adsp-sc5xx/recipes-extended/liburcu/liburcu/0001-test_uatomic-currently-fails-to-compile-skip-for-now.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 05a01fa8ccffdd876df1e712a14e195d3e6482a0 Mon Sep 17 00:00:00 2001 -From: Nathan Barrett Morrison -Date: Thu, 19 Aug 2021 14:59:34 -0400 -Subject: [PATCH] test_uatomic currently fails to compile - skip for now - ---- - tests/unit/test_uatomic.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/tests/unit/test_uatomic.c b/tests/unit/test_uatomic.c -index fe2a6c1..e79cc75 100644 ---- a/tests/unit/test_uatomic.c -+++ b/tests/unit/test_uatomic.c -@@ -93,6 +93,7 @@ do { \ - - int main(int argc, char **argv) - { -+/* - int nr_run = 2; - #ifdef UATOMIC_HAS_ATOMIC_BYTE - nr_run += 1; -@@ -116,4 +117,5 @@ int main(int argc, char **argv) - do_test(&vals.l); - - return exit_status(); -+*/ - } --- -2.30.2 - diff --git a/meta-adi-adsp-sc5xx/recipes-extended/liburcu/liburcu_%.bbappend b/meta-adi-adsp-sc5xx/recipes-extended/liburcu/liburcu_%.bbappend deleted file mode 100644 index 09e77a4..0000000 --- a/meta-adi-adsp-sc5xx/recipes-extended/liburcu/liburcu_%.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/liburcu:" - -SRC_URI += " \ - file://0001-test_uatomic-currently-fails-to-compile-skip-for-now.patch \ -" diff --git a/meta-adi-adsp-sc5xx/recipes-extended/rng-tools/files/0001-Disable-RNDR-as-this-is-not-available-on-our-ARMv8.2.patch b/meta-adi-adsp-sc5xx/recipes-extended/rng-tools/files/0001-Disable-RNDR-as-this-is-not-available-on-our-ARMv8.2.patch index d0d0f3a..650721a 100644 --- a/meta-adi-adsp-sc5xx/recipes-extended/rng-tools/files/0001-Disable-RNDR-as-this-is-not-available-on-our-ARMv8.2.patch +++ b/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 -Date: Fri, 5 May 2023 11:52:50 -0400 +From 2a734ceb55f35e7c7f6471b0b66dbab244383e5a Mon Sep 17 00:00:00 2001 +From: UtsavAgarwalADI +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 --- 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 + diff --git a/meta-adi-adsp-sc5xx/recipes-icc/rpmsg-echo-example/rpmsg-echo-example_1.0.bb b/meta-adi-adsp-sc5xx/recipes-icc/rpmsg-echo-example/rpmsg-echo-example_1.0.bb index 0ddb4f4..bf07d4d 100644 --- a/meta-adi-adsp-sc5xx/recipes-icc/rpmsg-echo-example/rpmsg-echo-example_1.0.bb +++ b/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 \ " diff --git a/meta-adi-adsp-sc5xx/recipes-icc/sharc-audio/hybrid-audio_1.0.bb b/meta-adi-adsp-sc5xx/recipes-icc/sharc-audio/hybrid-audio_1.0.bb index 30199c9..5232757 100644 --- a/meta-adi-adsp-sc5xx/recipes-icc/sharc-audio/hybrid-audio_1.0.bb +++ b/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 \ " diff --git a/meta-adi-adsp-sc5xx/recipes-icc/sharc-audio/sharc-audio_1.0.bb b/meta-adi-adsp-sc5xx/recipes-icc/sharc-audio/sharc-audio_1.0.bb index 5004dc3..7fcc88b 100644 --- a/meta-adi-adsp-sc5xx/recipes-icc/sharc-audio/sharc-audio_1.0.bb +++ b/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 \ " diff --git a/meta-adi-adsp-sc5xx/recipes-kernel/linux-firmware/linux-firmware_%.bbappend b/meta-adi-adsp-sc5xx/recipes-kernel/linux-firmware/linux-firmware_%.bbappend index b5d4c1a..90cf967 100644 --- a/meta-adi-adsp-sc5xx/recipes-kernel/linux-firmware/linux-firmware_%.bbappend +++ b/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 \ " diff --git a/meta-adi-adsp-sc5xx/recipes-kernel/linux/linux-adi.inc b/meta-adi-adsp-sc5xx/recipes-kernel/linux/linux-adi.inc index 050276e..18a8a8d 100644 --- a/meta-adi-adsp-sc5xx/recipes-kernel/linux/linux-adi.inc +++ b/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} \ " diff --git a/meta-adi-adsp-sc5xx/recipes-kernel/linux/linux-adi_5.15.bb b/meta-adi-adsp-sc5xx/recipes-kernel/linux/linux-adi_5.15.bb index 1cc693b..7606a83 100644 --- a/meta-adi-adsp-sc5xx/recipes-kernel/linux/linux-adi_5.15.bb +++ b/meta-adi-adsp-sc5xx/recipes-kernel/linux/linux-adi_5.15.bb @@ -1,23 +1,15 @@ -USB_AUDIO = " \ +USB_AUDIO="\ ${@bb.utils.contains('DISTRO_FEATURES', 'adi_usb_gadget_audio', 'adi_usb_gadget_audio.inc', '', d)} \ " - require linux-adi.inc sharc_audio.inc ${USB_AUDIO} -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" +LICENSE="GPL-2.0-only" +LIC_FILES_CHKSUM="file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "u-boot-mkimage-native dtc-native" -PV = "5.15.148" - -LINUX_VERSION = "${PV}" - -KERNEL_BRANCH ?= "main" -SRCREV = "c4403f406eff867723e10acf414afdfe8132102f" - # Include kernel configuration fragments -SRC_URI:append = " \ +SRC_URI:append="\ file://feature/cfg/nfs.cfg \ file://feature/cfg/wireless.cfg \ file://feature/cfg/cpufreq.cfg \ @@ -25,16 +17,34 @@ SRC_URI:append = " \ file://feature/cfg/tracepoints.cfg \ " +python () { + if ((d.getVar('ADSP_KERNEL_TYPE') == 'upstream') and ("adsp-sc598" in d.getVar('MACHINE'))): + print("Building with upstream kernel") + d.setVar("PV","upstream") + d.setVar("KERNEL_VERSION_SANITY_SKIP","1") + d.setVar("KERNEL_BRANCH","adsp-main") + d.setVar("SRCREV","${AUTOREV}") + else: + d.setVar("PV","5.15.148") + d.setVar("KERNEL_BRANCH","main") + d.setVar("SRCREV","c4403f406eff867723e10acf414afdfe8132102f") + + d.setVar("LINUX_VERSION",d.getVar("PV")) +} + + SRC_URI:append:adsp-sc594-som-ezkit = " file://feature/cfg/snd_ezkit.scc" SRC_URI:append:adsp-sc589-ezkit = " file://feature/cfg/snd_ezkit.scc" SRC_URI:append:adsp-sc584-ezkit = " file://feature/cfg/snd_ezkit.scc" SRC_URI:append:adsp-sc573-ezkit = " file://feature/cfg/snd_ezkit.scc" SRC_URI:append:adsp-sc589-mini = " file://feature/cfg/snd_mini.scc" -SRC_URI:append:adsp-sc598-som-ezkit = "${@' file://0001-sc598-som-enable-SDcard.patch' if bb.utils.to_boolean(d.getVar('ADSP_SC598_SDCARD')) else ''}" +# Only SC598 can trigger upstream builds + +SRC_URI:append:adsp-sc598-som-ezkit = "${@' file://0001-sc598-som-enable-SDcard.patch' if (bb.utils.to_boolean(d.getVar('ADSP_SC598_SDCARD')) and (d.getVar('ADSP_KERNEL_TYPE') != 'upstream')) else ''}" -SRC_URI:append:adsp-sc598-som-ezkit = " file://0001-SC598-fix-stmmac-dma-split-header-crash.patch" +SRC_URI:append:adsp-sc598-som-ezkit = ' file://0001-SC598-fix-stmmac-dma-split-header-crash.patch' do_install:append(){ - rm -rf ${D}/lib/modules/5.15.148-yocto-standard/modules.builtin.modinfo + rm -rf ${D}/lib/modules/*-yocto-standard/modules.builtin.modinfo } diff --git a/meta-adi-adsp-sc5xx/recipes-multimedia/alsa/alsa-lib/alsa-lib-01-adi-audio-codec-config.patch b/meta-adi-adsp-sc5xx/recipes-multimedia/alsa/alsa-lib/alsa-lib-01-adi-audio-codec-config.patch index b95fa7d..8b0634d 100644 --- a/meta-adi-adsp-sc5xx/recipes-multimedia/alsa/alsa-lib/alsa-lib-01-adi-audio-codec-config.patch +++ b/meta-adi-adsp-sc5xx/recipes-multimedia/alsa/alsa-lib/alsa-lib-01-adi-audio-codec-config.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending +--- Index: alsa-lib/src/conf/cards/AD1980-no-mmap.conf =================================================================== --- alsa-lib/src/conf/cards/AD1980-no-mmap.conf (revision 0) diff --git a/meta-adi-adsp-sc5xx/recipes-multimedia/alsa/alsa-lib/alsa-lib-02-pcm-ucm.patch b/meta-adi-adsp-sc5xx/recipes-multimedia/alsa/alsa-lib/alsa-lib-02-pcm-ucm.patch index af08e7c..fc9baea 100644 --- a/meta-adi-adsp-sc5xx/recipes-multimedia/alsa/alsa-lib/alsa-lib-02-pcm-ucm.patch +++ b/meta-adi-adsp-sc5xx/recipes-multimedia/alsa/alsa-lib/alsa-lib-02-pcm-ucm.patch @@ -1,18 +1,18 @@ -Index: alsa-lib/src/pcm/pcm_ladspa.c -=================================================================== ---- alsa-lib/src/pcm/pcm_ladspa.c (revision 10341) -+++ alsa-lib/src/pcm/pcm_ladspa.c (revision 10342) -@@ -34,7 +34,9 @@ - - #include - #include -+#ifndef HAVE_SOFT_FLOAT - #include -+#endif - #include "pcm_local.h" - #include "pcm_plugin.h" - -@@ -513,36 +515,39 @@ +From 930f94d3ddc67031ca21e08843e79fd0526eb0a7 Mon Sep 17 00:00:00 2001 +From: UtsavAgarwalADI +Date: Wed, 3 Apr 2024 13:18:29 +0100 +Subject: [PATCH] ADSP: pcm patch for yocto +Upstream-Status: Pending +Signed-off-by: UtsavAgarwalADI +--- + src/pcm/pcm_ladspa.c | 21 ++++++++++++--------- + 1 file changed, 12 insertions(+), 9 deletions(-) + +diff --git a/src/pcm/pcm_ladspa.c b/src/pcm/pcm_ladspa.c +index 25eac76f..50dd6479 100644 +--- a/src/pcm/pcm_ladspa.c ++++ b/src/pcm/pcm_ladspa.c +@@ -513,36 +513,39 @@ static void snd_pcm_ladspa_get_default_cvalue(const LADSPA_Descriptor * desc, un *val = desc->PortRangeHints[port].LowerBound; break; case LADSPA_HINT_DEFAULT_LOW: @@ -24,7 +24,7 @@ Index: alsa-lib/src/pcm/pcm_ladspa.c + log(desc->PortRangeHints[port].UpperBound) * 0.25); - } else { -+ else ++ else +#endif *val = (desc->PortRangeHints[port].LowerBound * 0.75) + (desc->PortRangeHints[port].UpperBound * 0.25); @@ -61,3 +61,6 @@ Index: alsa-lib/src/pcm/pcm_ladspa.c break; case LADSPA_HINT_DEFAULT_MAXIMUM: *val = desc->PortRangeHints[port].UpperBound; +-- +2.25.1 + diff --git a/meta-adi-adsp-sc5xx/recipes-multimedia/alsa/alsa-lib/alsa-lib-03-fix-compile-warning.patch b/meta-adi-adsp-sc5xx/recipes-multimedia/alsa/alsa-lib/alsa-lib-03-fix-compile-warning.patch index 08b77cc..39bc29b 100644 --- a/meta-adi-adsp-sc5xx/recipes-multimedia/alsa/alsa-lib/alsa-lib-03-fix-compile-warning.patch +++ b/meta-adi-adsp-sc5xx/recipes-multimedia/alsa/alsa-lib/alsa-lib-03-fix-compile-warning.patch @@ -1,8 +1,8 @@ From 2144a3491aae90de9e70bde613fc3f8754f83fc8 Mon Sep 17 00:00:00 2001 From: Nathan Barrett Morrison Date: Mon, 3 Jun 2019 13:09:23 -0400 +Upstream-Status: Pending Subject: [PATCH] alsa-lib-03-fix-compile-warning.patch - --- src/ucm/parser.c | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-adi-adsp-sc5xx/recipes-multimedia/alsa/alsa-lib/alsa-lib-04-change-cards-config-file-name.patch b/meta-adi-adsp-sc5xx/recipes-multimedia/alsa/alsa-lib/alsa-lib-04-change-cards-config-file-name.patch index aa9e7ba..0dd9997 100644 --- a/meta-adi-adsp-sc5xx/recipes-multimedia/alsa/alsa-lib/alsa-lib-04-change-cards-config-file-name.patch +++ b/meta-adi-adsp-sc5xx/recipes-multimedia/alsa/alsa-lib/alsa-lib-04-change-cards-config-file-name.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending +--- Index: alsa-lib/src/conf/cards/SSM2602.conf =================================================================== --- alsa-lib/src/conf/cards/SSM2602.conf (revision 10418) diff --git a/meta-adi-adsp-sc5xx/recipes-multimedia/alsa/alsa-lib/alsa-lib-05-add-adi-audio-codec-configs-to-cfg_files.patch b/meta-adi-adsp-sc5xx/recipes-multimedia/alsa/alsa-lib/alsa-lib-05-add-adi-audio-codec-configs-to-cfg_files.patch index 6e657bc..bc2d450 100644 --- a/meta-adi-adsp-sc5xx/recipes-multimedia/alsa/alsa-lib/alsa-lib-05-add-adi-audio-codec-configs-to-cfg_files.patch +++ b/meta-adi-adsp-sc5xx/recipes-multimedia/alsa/alsa-lib/alsa-lib-05-add-adi-audio-codec-configs-to-cfg_files.patch @@ -1,6 +1,7 @@ From c85acca5bc7926c01bfaa3c3afa8b6cef37dcb07 Mon Sep 17 00:00:00 2001 From: Nathan Barrett Morrison Date: Mon, 3 Jun 2019 13:11:07 -0400 +Upstream-Status: Pending Subject: [PATCH] alsa-lib-05-add-adi-audio-codec-configs-to-cfg_files.patch --- diff --git a/meta-adi-adsp-sc5xx/recipes-multimedia/alsa/alsa-lib/alsa-lib-06-add-sc58x-codec.patch b/meta-adi-adsp-sc5xx/recipes-multimedia/alsa/alsa-lib/alsa-lib-06-add-sc58x-codec.patch index 1ec2e01..75c945b 100644 --- a/meta-adi-adsp-sc5xx/recipes-multimedia/alsa/alsa-lib/alsa-lib-06-add-sc58x-codec.patch +++ b/meta-adi-adsp-sc5xx/recipes-multimedia/alsa/alsa-lib/alsa-lib-06-add-sc58x-codec.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending +--- --- alsa-lib-1.0.28/src/conf/cards/Makefile.am.org 2015-07-29 14:40:39.292994116 +0800 +++ alsa-lib-1.0.28/src/conf/cards/Makefile.am 2015-07-29 14:41:14.536993014 +0800 @@ -36,6 +36,7 @@ diff --git a/meta-adi-adsp-sc5xx/wic/adsp-sc5xx.wks.in b/meta-adi-adsp-sc5xx/wic/adsp-sc5xx.wks.in index 100b671..185a597 100644 --- a/meta-adi-adsp-sc5xx/wic/adsp-sc5xx.wks.in +++ b/meta-adi-adsp-sc5xx/wic/adsp-sc5xx.wks.in @@ -11,6 +11,6 @@ part bootloader --source rawcopy --sourceparams="file=${BOARD}.dtb" --ondisk mmc part bootloader --source rawcopy --sourceparams="file=${KERNEL_IMAGETYPE}" --ondisk mmcblk --no-table --align 2048 # (32M) - RFS -part / --source rawcopy --sourceparams="file=${IMGDEPLOYDIR}/${IMAGE_BASENAME}-${MACHINE}.ext4" --ondisk mmcblk --fstype=ext4 --align 32768 +part / --source rawcopy --sourceparams="file=${IMGDEPLOYDIR}/${IMAGE_BASENAME}-${MACHINE}.rootfs.ext4" --ondisk mmcblk --fstype=ext4 --align 32768 bootloader --ptable msdos