From a3f524959998b2aa91ded248474a3cfd475f7bc7 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Tue, 21 Dec 2021 13:03:48 +0100 Subject: [PATCH] hardknott: imx-seco: sync with meta-imx hardknott-5.10.72-2.2.0 branch Update to v3.8.4 Signed-off-by: Gabriel Valcazar --- ...001-Makefile-Fix-LIBDIR-for-multilib.patch | 1 + ...d-v2x_test-to-the-installed-binaries.patch | 32 +++++++++++++++++++ ...tall-to-clear-host-user-contaminated.patch | 4 +-- .../recipes-bsp/imx-seco/imx-seco-libs_git.bb | 10 +++--- .../recipes-bsp/imx-seco/imx-seco.inc | 10 ------ .../{imx-seco_3.7.5.bb => imx-seco_3.8.4.bb} | 16 +++++----- 6 files changed, 49 insertions(+), 24 deletions(-) create mode 100644 meta-digi-arm/recipes-bsp/imx-seco/imx-seco-libs/0001-add-v2x_test-to-the-installed-binaries.patch delete mode 100644 meta-digi-arm/recipes-bsp/imx-seco/imx-seco.inc rename meta-digi-arm/recipes-bsp/imx-seco/{imx-seco_3.7.5.bb => imx-seco_3.8.4.bb} (56%) diff --git a/meta-digi-arm/recipes-bsp/imx-seco/imx-seco-libs/0001-Makefile-Fix-LIBDIR-for-multilib.patch b/meta-digi-arm/recipes-bsp/imx-seco/imx-seco-libs/0001-Makefile-Fix-LIBDIR-for-multilib.patch index 772b6610b..8d9f62982 100644 --- a/meta-digi-arm/recipes-bsp/imx-seco/imx-seco-libs/0001-Makefile-Fix-LIBDIR-for-multilib.patch +++ b/meta-digi-arm/recipes-bsp/imx-seco/imx-seco-libs/0001-Makefile-Fix-LIBDIR-for-multilib.patch @@ -24,3 +24,4 @@ index b16cebf..492d700 100644 ifdef COVERAGE -- 2.7.4 + diff --git a/meta-digi-arm/recipes-bsp/imx-seco/imx-seco-libs/0001-add-v2x_test-to-the-installed-binaries.patch b/meta-digi-arm/recipes-bsp/imx-seco/imx-seco-libs/0001-add-v2x_test-to-the-installed-binaries.patch new file mode 100644 index 000000000..8aa893f4a --- /dev/null +++ b/meta-digi-arm/recipes-bsp/imx-seco/imx-seco-libs/0001-add-v2x_test-to-the-installed-binaries.patch @@ -0,0 +1,32 @@ +From b62f020ea723dc33f28e5e865d0ddd13219971c9 Mon Sep 17 00:00:00 2001 +From: Cristinel Panfir +Date: Mon, 29 Mar 2021 15:24:42 +0300 +Subject: [PATCH] Makefile: Add v2x test to the installed-binaries + +Signed-off-by: Cristinel Panfir +[regenerate the patch to be applied after meta-imx patches] +Signed-off-by: Fausto Chiatante + +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 25ad333..a397814 100644 +--- a/Makefile ++++ b/Makefile +@@ -61,9 +61,9 @@ hsm_doc: include/hsm/hsm_api.h + cp doc/latex/refman.pdf doc/hsm_api_document.pdf + rm -rf doc/latex/ + +-install: hsm_test she_test she_lib.a seco_nvm_manager.a hsm_lib.a ++install: hsm_test she_test v2x_test she_lib.a seco_nvm_manager.a hsm_lib.a + mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(INCLUDEDIR) + cp seco_nvm_manager.a hsm_lib.a she_lib.a $(DESTDIR)$(LIBDIR) +- cp hsm_test she_test $(DESTDIR)$(BINDIR) ++ cp hsm_test she_test v2x_test $(DESTDIR)$(BINDIR) + cp -a include/* $(DESTDIR)$(INCLUDEDIR) + +-- +2.25.1 + diff --git a/meta-digi-arm/recipes-bsp/imx-seco/imx-seco-libs/0002-Makefile-Fix-install-to-clear-host-user-contaminated.patch b/meta-digi-arm/recipes-bsp/imx-seco/imx-seco-libs/0002-Makefile-Fix-install-to-clear-host-user-contaminated.patch index 7988cdaea..67eec7164 100644 --- a/meta-digi-arm/recipes-bsp/imx-seco/imx-seco-libs/0002-Makefile-Fix-install-to-clear-host-user-contaminated.patch +++ b/meta-digi-arm/recipes-bsp/imx-seco/imx-seco-libs/0002-Makefile-Fix-install-to-clear-host-user-contaminated.patch @@ -1,6 +1,6 @@ -From 59608dcb0f0a6f6d8154b1d331c2403d7c1143eb Mon Sep 17 00:00:00 2001 +From 99249f0f199d95f4a5213561dc0ce33f70b1e717 Mon Sep 17 00:00:00 2001 From: Cristinel Panfir -Date: Fri, 5 Feb 2021 19:27:00 +0200 +Date: Mon, 29 Mar 2021 15:20:55 +0300 Subject: [PATCH] Makefile: Fix install to clear host-user-contaminated warnings [HSM-483] diff --git a/meta-digi-arm/recipes-bsp/imx-seco/imx-seco-libs_git.bb b/meta-digi-arm/recipes-bsp/imx-seco/imx-seco-libs_git.bb index 6091952f7..273990b66 100644 --- a/meta-digi-arm/recipes-bsp/imx-seco/imx-seco-libs_git.bb +++ b/meta-digi-arm/recipes-bsp/imx-seco/imx-seco-libs_git.bb @@ -1,20 +1,21 @@ -# Copyright 2019-20 NXP +# Copyright 2019-21 NXP SUMMARY = "NXP i.MX SECO library" DESCRIPTION = "NXP IMX SECO library" SECTION = "base" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://EULA.txt;md5=228c72f2a91452b8a03c4cab30f30ef9" +LIC_FILES_CHKSUM = "file://EULA.txt;md5=76871788f27c28af824e2ec1ca187832" DEPENDS = "zlib" -SRCBRANCH = "imx_5.4.70_2.3.1" +SRCBRANCH = "lf-5.10.72_2.2.0" SECO_LIB_SRC ?= "git://github.com/NXP/imx-seco-libs.git;protocol=https" SRC_URI = "${SECO_LIB_SRC};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 \ " -SRCREV = "79e5fb5d096c61b1c3163c9fa8e42719509d95a0" +SRCREV = "3e8ad6b168f23a8c6ecd75edabc18d2673403e24" S = "${WORKDIR}/git" @@ -22,6 +23,7 @@ TARGET_CC_ARCH += "${LDFLAGS}" do_install () { oe_runmake DESTDIR=${D} install + chown -R root:root "${D}" } COMPATIBLE_MACHINE = "(mx8)" diff --git a/meta-digi-arm/recipes-bsp/imx-seco/imx-seco.inc b/meta-digi-arm/recipes-bsp/imx-seco/imx-seco.inc deleted file mode 100644 index 0a1b821b1..000000000 --- a/meta-digi-arm/recipes-bsp/imx-seco/imx-seco.inc +++ /dev/null @@ -1,10 +0,0 @@ -SECO_FIRMWARE_NAME ?= "UNSUPPORTED" -SECO_FIRMWARE_NAME_mx8qm = "mx8qmb0-ahab-container.img" -SECO_FIRMWARE_NAME_mx8qxp = "mx8qxb0-ahab-container.img" -SECO_FIRMWARE_NAME_mx8qxpc0 = "mx8qxc0-ahab-container.img" -SECO_FIRMWARE_NAME_mx8phantomdxl = "mx8qxc0-ahab-container.img" -SECO_FIRMWARE_NAME_mx8dxl = "mx8dxla1-ahab-container.img" - -# For the ccimx8x, we generate images for both the B0 and the C0 revisions of -# the i.MX8X silicon, so deploy both versions of the firmware. -SECO_FIRMWARE_NAME_ccimx8x = "mx8qx*0-ahab-container.img" diff --git a/meta-digi-arm/recipes-bsp/imx-seco/imx-seco_3.7.5.bb b/meta-digi-arm/recipes-bsp/imx-seco/imx-seco_3.8.4.bb similarity index 56% rename from meta-digi-arm/recipes-bsp/imx-seco/imx-seco_3.7.5.bb rename to meta-digi-arm/recipes-bsp/imx-seco/imx-seco_3.8.4.bb index f6e9bad83..0b430ae15 100644 --- a/meta-digi-arm/recipes-bsp/imx-seco/imx-seco_3.7.5.bb +++ b/meta-digi-arm/recipes-bsp/imx-seco/imx-seco_3.8.4.bb @@ -1,22 +1,22 @@ -# Copyright 2019-2020 NXP +# Copyright 2019-2021 NXP SUMMARY = "NXP i.MX SECO firmware" DESCRIPTION = "NXP IMX SECO firmware" SECTION = "base" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=cf3f9b8d09bc3926b1004ea71f7a248a" -require imx-seco.inc -inherit fsl-eula-unpack deploy +LIC_FILES_CHKSUM = "file://COPYING;md5=03bcadc8dc0a788f66ca9e2b89f56c6f" + +inherit fsl-eula-unpack use-imx-security-controller-firmware deploy SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" -SRC_URI[md5sum] = "d4faca131abfc51a1dd0278d7d201159" -SRC_URI[sha256sum] = "08cf25a4be6841ca7264a50b29c311b386eae1c02fced8a3b55fd04213acb4bc" +SRC_URI[md5sum] = "38d298cda9ea91db945b266bd6774e07" +SRC_URI[sha256sum] = "ed65381fac7a17a7594099191952821ed3f3f54c944937926dc19f82ecd8fef5" do_compile[noexec] = "1" - -do_install[noexec] = "1" +do_install() { +} addtask deploy after do_install do_deploy () {