From 9d0f293b68e5d7bbfa925ecace5068e41855a4ac Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 7 Jan 2023 22:01:06 -0800 Subject: imx-seco-libs: Fix build with clang Signed-off-by: Khem Raj --- .../0001-Fix-return-value-of-void-functions.patch | 57 ++++++++++++++++++++++ recipes-bsp/imx-seco/imx-seco-libs_git.bb | 3 +- 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 recipes-bsp/imx-seco/imx-seco-libs/0001-Fix-return-value-of-void-functions.patch diff --git a/recipes-bsp/imx-seco/imx-seco-libs/0001-Fix-return-value-of-void-functions.patch b/recipes-bsp/imx-seco/imx-seco-libs/0001-Fix-return-value-of-void-functions.patch new file mode 100644 index 000000000..656469c2e --- /dev/null +++ b/recipes-bsp/imx-seco/imx-seco-libs/0001-Fix-return-value-of-void-functions.patch @@ -0,0 +1,57 @@ +From 2eff97fe2345d8255869224404322d23193f1115 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 7 Jan 2023 21:59:15 -0800 +Subject: [PATCH] Fix return value of void* functions + +This is found with clang + +Fixes +error: non-void function does not return a value [-Werror,-Wreturn-type] + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + test/hsm/hsm_test.c | 1 + + test/she/src/she_test_storage_manager.c | 1 + + test/v2x/v2x_test.c | 1 + + 3 files changed, 3 insertions(+) + +diff --git a/test/hsm/hsm_test.c b/test/hsm/hsm_test.c +index 9f29ca9..01820b8 100644 +--- a/test/hsm/hsm_test.c ++++ b/test/hsm/hsm_test.c +@@ -391,6 +391,7 @@ static uint32_t nvm_status; + static void *hsm_storage_thread(void *arg) + { + seco_nvm_manager(NVM_FLAGS_HSM, &nvm_status); ++ return 0; + } + + +diff --git a/test/she/src/she_test_storage_manager.c b/test/she/src/she_test_storage_manager.c +index 32a4cb9..68cdba7 100644 +--- a/test/she/src/she_test_storage_manager.c ++++ b/test/she/src/she_test_storage_manager.c +@@ -28,6 +28,7 @@ static uint32_t nvm_status; + static void *she_storage_thread(void *arg) + { + seco_nvm_manager(NVM_FLAGS_SHE, &nvm_status); ++ return 0; + } + + +diff --git a/test/v2x/v2x_test.c b/test/v2x/v2x_test.c +index aeb3d2a..5f02354 100644 +--- a/test/v2x/v2x_test.c ++++ b/test/v2x/v2x_test.c +@@ -181,6 +181,7 @@ static uint32_t nvm_status; + static void *v2x_hsm_storage_thread(void *arg) + { + seco_nvm_manager(NVM_FLAGS_V2X | NVM_FLAGS_HSM, &nvm_status); ++ return 0; + } + + +-- +2.39.0 + diff --git a/recipes-bsp/imx-seco/imx-seco-libs_git.bb b/recipes-bsp/imx-seco/imx-seco-libs_git.bb index 625834b7b..9b2509759 100644 --- a/recipes-bsp/imx-seco/imx-seco-libs_git.bb +++ b/recipes-bsp/imx-seco/imx-seco-libs_git.bb @@ -12,7 +12,8 @@ SRCBRANCH = "imx_5.4.70_2.3.9" SRC_URI = "git://github.com/NXP/imx-seco-libs.git;protocol=https;branch=${SRCBRANCH} \ file://0001-Makefile-Fix-LIBDIR-for-multilib.patch \ file://0002-Makefile-Fix-install-to-clear-host-user-contaminated.patch \ - file://0001-add-v2x_test-to-the-installed-binaries.patch" + file://0001-add-v2x_test-to-the-installed-binaries.patch \ + file://0001-Fix-return-value-of-void-functions.patch" SRCREV = "b2550476388e1d1453bddbf356844301467c7bfa" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf From b24ea69e457571d1f924c8a801de456f9680b1ff Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 7 Jan 2023 22:18:00 -0800 Subject: imx-seco-libs: Fix installs with usrmerge distro feature Fixes QA errors like ERROR: imx-seco-libs-git-r0 do_package: QA Issue: imx-seco-libs: Files/directories were installed but not shipped in any package: /usr/usr /usr/usr/lib /usr/usr/lib/hsm_lib.a /usr/usr/lib/she_lib.a /usr/usr/lib/seco_nvm_manager.a Signed-off-by: Khem Raj --- recipes-bsp/imx-seco/imx-seco-libs_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-bsp/imx-seco/imx-seco-libs_git.bb b/recipes-bsp/imx-seco/imx-seco-libs_git.bb index 9b2509759..3d38a2688 100644 --- a/recipes-bsp/imx-seco/imx-seco-libs_git.bb +++ b/recipes-bsp/imx-seco/imx-seco-libs_git.bb @@ -21,7 +21,7 @@ S = "${WORKDIR}/git" TARGET_CC_ARCH += "${LDFLAGS}" do_install () { - oe_runmake DESTDIR=${D} install + oe_runmake DESTDIR=${D} BINDIR=${bindir} LIBDIR=${libdir} install } COMPATIBLE_MACHINE = "(mx8qm-nxp-bsp|mx8qxp-nxp-bsp|mx8dxl-nxp-bsp|mx8dx-nxp-bsp)" -- cgit v1.2.3-54-g00ecf From 25cdb79d853fd6c90bf0d3538bbcaea83919259f Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Thu, 5 Jan 2023 16:53:01 +0200 Subject: imx-seco-libs: Update lf-5.15.52-2.1.0 to lf-5.15.71-2.2.0 No commits. Change branch to imx_5.4.70_2.3.11 which is used in NXP BSP 5.15.71-2.2.0. Signed-off-by: Oleksandr Suvorov --- recipes-bsp/imx-seco/imx-seco-libs_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-bsp/imx-seco/imx-seco-libs_git.bb b/recipes-bsp/imx-seco/imx-seco-libs_git.bb index 3d38a2688..b0296e977 100644 --- a/recipes-bsp/imx-seco/imx-seco-libs_git.bb +++ b/recipes-bsp/imx-seco/imx-seco-libs_git.bb @@ -8,13 +8,13 @@ LIC_FILES_CHKSUM = "file://EULA.txt;md5=d3c315c6eaa43e07d8c130dc3a04a011" DEPENDS = "zlib" -SRCBRANCH = "imx_5.4.70_2.3.9" +SRCBRANCH = "imx_5.4.70_2.3.11" SRC_URI = "git://github.com/NXP/imx-seco-libs.git;protocol=https;branch=${SRCBRANCH} \ file://0001-Makefile-Fix-LIBDIR-for-multilib.patch \ file://0002-Makefile-Fix-install-to-clear-host-user-contaminated.patch \ file://0001-add-v2x_test-to-the-installed-binaries.patch \ file://0001-Fix-return-value-of-void-functions.patch" -SRCREV = "b2550476388e1d1453bddbf356844301467c7bfa" +SRCREV = "aa8d62900c41cc779c11fe4e6f58b40c3c9f82f0" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf From 4f209b9383c3b556d37e2370d483b9233cf6abc6 Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Thu, 5 Jan 2023 17:04:48 +0200 Subject: imx-seco: Upgrade 5.8.7.1 to 5.9 Update to the version used in lf-5.15.71_2.2.0. License was updated to NXP EULA v39 August 2022. Signed-off-by: Oleksandr Suvorov --- recipes-bsp/imx-seco/imx-seco_5.8.7.1.bb | 27 --------------------------- recipes-bsp/imx-seco/imx-seco_5.9.0.bb | 27 +++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 27 deletions(-) delete mode 100644 recipes-bsp/imx-seco/imx-seco_5.8.7.1.bb create mode 100644 recipes-bsp/imx-seco/imx-seco_5.9.0.bb diff --git a/recipes-bsp/imx-seco/imx-seco_5.8.7.1.bb b/recipes-bsp/imx-seco/imx-seco_5.8.7.1.bb deleted file mode 100644 index d37c1c98c..000000000 --- a/recipes-bsp/imx-seco/imx-seco_5.8.7.1.bb +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2019-2022 NXP - -SUMMARY = "NXP i.MX SECO firmware" -DESCRIPTION = "Firmware for i.MX Security Controller Subsystem" -SECTION = "base" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=d3c315c6eaa43e07d8c130dc3a04a011" - -inherit fsl-eula-unpack use-imx-security-controller-firmware deploy - -SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" - -SRC_URI[md5sum] = "f5c6737b42275e513d4e0cc2efa91d6a" -SRC_URI[sha256sum] = "03fa16ebc0633505bd02dae1c58602e278a8a28c8205c758fa3936477d51d0e0" - - -do_compile[noexec] = "1" - -do_install[noexec] = "1" - -addtask deploy after do_install -do_deploy () { - # Deploy i.MX8 SECO firmware files - install -m 0644 ${S}/firmware/seco/${SECO_FIRMWARE_NAME} ${DEPLOYDIR} -} - -COMPATIBLE_MACHINE = "(mx8qm-nxp-bsp|mx8qxp-nxp-bsp|mx8dxl-nxp-bsp|mx8dx-nxp-bsp)" diff --git a/recipes-bsp/imx-seco/imx-seco_5.9.0.bb b/recipes-bsp/imx-seco/imx-seco_5.9.0.bb new file mode 100644 index 000000000..712be23ab --- /dev/null +++ b/recipes-bsp/imx-seco/imx-seco_5.9.0.bb @@ -0,0 +1,27 @@ +# Copyright 2019-2022 NXP + +SUMMARY = "NXP i.MX SECO firmware" +DESCRIPTION = "Firmware for i.MX Security Controller Subsystem" +SECTION = "base" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe" + +inherit fsl-eula-unpack use-imx-security-controller-firmware deploy + +SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" + +SRC_URI[md5sum] = "b722a534c4d3cc90270e05eaa812514d" +SRC_URI[sha256sum] = "c3bd761f457e939035b01a0ab36e79064a2a1bc6c3cdb3cd847f7f38df0964df" + + +do_compile[noexec] = "1" + +do_install[noexec] = "1" + +addtask deploy after do_install +do_deploy () { + # Deploy i.MX8 SECO firmware files + install -m 0644 ${S}/firmware/seco/${SECO_FIRMWARE_NAME} ${DEPLOYDIR} +} + +COMPATIBLE_MACHINE = "(mx8qm-nxp-bsp|mx8qxp-nxp-bsp|mx8dxl-nxp-bsp|mx8dx-nxp-bsp)" -- cgit v1.2.3-54-g00ecf