public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
* [PATCH v5 0/4] U-boot Refactor and update to 2022.01
@ 2022-02-01 11:57 Vijai Kumar K
  2022-02-01 11:57 ` [PATCH v5 1/4] u-boot: Switch to use DEB_BUILD_PROFILES Vijai Kumar K
                   ` (3 more replies)
  0 siblings, 4 replies; 7+ messages in thread
From: Vijai Kumar K @ 2022-02-01 11:57 UTC (permalink / raw)
  To: isar-users, jan.kiszka; +Cc: Vijai Kumar K

This was a bit lost in the thread. Updating to a newer version and resending again.

Changes since v4:
 - update u-boot to 2022.01

Changes since v3:
 - Move meta-isar changes to a separate patch(P3)

Changes since v2:
 - Add entry in RECIPE-API-CHANGELOG
 - Provide backward compatibitlity with U_BOOT_*_PACKAGE variable
 - Issue a deprecation notice to use if the old variables are used

CI Job running at
http://ci.isar-build.org:8080/job/isar_vkk_devel/99/console

Changes since v1:
 - Fix PROVIDES variable
 - Enable dev by default

CI Job running at
http://ci.isar-build.org:8080/job/isar_vkk_devel/98/console

Vijai Kumar K (4):
  u-boot: Switch to use DEB_BUILD_PROFILES
  meta-isar: u-boot: Migrate to U_BOOT_BUILD_PROFILES
  meta: u-boot: Prepare for newer versions
  meta-isar: u-boot: Update to 2022.01

 RECIPE-API-CHANGELOG.md                       |  11 ++
 ...y-add-property-no-map-to-created-res.patch | 151 ------------------
 ...rty-no-map-to-secure-reserved-memory.patch |  33 ----
 ...{u-boot-2020.10.inc => u-boot-2022.01.inc} |   4 +-
 ...0.10.bb => u-boot-de0-nano-soc_2022.01.bb} |   4 +-
 .../u-boot/u-boot-stm32mp15x_2020.10.bb       |  10 --
 .../u-boot/u-boot-stm32mp15x_2022.01.bb       |   6 +
 .../u-boot/files/debian/control.tmpl          |  13 ++
 meta/recipes-bsp/u-boot/files/debian/rules    |   9 +-
 meta/recipes-bsp/u-boot/u-boot-custom.inc     |  55 ++++---
 10 files changed, 71 insertions(+), 225 deletions(-)
 delete mode 100644 meta-isar/recipes-bsp/u-boot/files/0001-fdtdec-optionally-add-property-no-map-to-created-res.patch
 delete mode 100644 meta-isar/recipes-bsp/u-boot/files/0002-optee-add-property-no-map-to-secure-reserved-memory.patch
 rename meta-isar/recipes-bsp/u-boot/{u-boot-2020.10.inc => u-boot-2022.01.inc} (60%)
 rename meta-isar/recipes-bsp/u-boot/{u-boot-de0-nano-soc_2020.10.bb => u-boot-de0-nano-soc_2022.01.bb} (64%)
 delete mode 100644 meta-isar/recipes-bsp/u-boot/u-boot-stm32mp15x_2020.10.bb
 create mode 100644 meta-isar/recipes-bsp/u-boot/u-boot-stm32mp15x_2022.01.bb

-- 
2.25.1


^ permalink raw reply	[flat|nested] 7+ messages in thread
* [PATCH v5 1/4] u-boot: Switch to use DEB_BUILD_PROFILES
  2022-02-01 11:57 [PATCH v5 0/4] U-boot Refactor and update to 2022.01 Vijai Kumar K
@ 2022-02-01 11:57 ` Vijai Kumar K
  2022-02-01 12:54   ` Moessbauer, Felix
  2022-02-01 11:57 ` [PATCH v5 2/4] meta-isar: u-boot: Migrate to U_BOOT_BUILD_PROFILES Vijai Kumar K
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 7+ messages in thread
From: Vijai Kumar K @ 2022-02-01 11:57 UTC (permalink / raw)
  To: isar-users, jan.kiszka; +Cc: Vijai Kumar K

Use DEB_BUILD_PROFILES to select packages to build.

This patch drops the U_BOOT_TOOLS_PACKAGE and U_BOOT_CONFIG_PACKAGE
variables and introduces U_BOOT_BUILD_PROFILES through which we can
enable particular packages like u-boot-tools, u-boot-dev and
u-boot-config.

Also, provide backward compatibility with U_BOOT_*_PACKAGES
variable and prompt a deprecation warning to user.

Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
---
 RECIPE-API-CHANGELOG.md                       | 11 ++++
 .../u-boot/files/debian/control.tmpl          | 13 +++++
 meta/recipes-bsp/u-boot/files/debian/rules    |  9 +++-
 meta/recipes-bsp/u-boot/u-boot-custom.inc     | 52 ++++++++++---------
 4 files changed, 59 insertions(+), 26 deletions(-)

diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md
index ce0a6da..118b328 100644
--- a/RECIPE-API-CHANGELOG.md
+++ b/RECIPE-API-CHANGELOG.md
@@ -335,3 +335,14 @@ names for kernel/headers.
 Changes in next
 ---------------
 
+### Deprecate U_BOOT_TOOLS_PACKAGE and U_BOOT_CONFIG_PACKAGE
+
+Use U_BOOT_BUILD_PROFILES instead of U_BOOT_TOOLS_PACKAGE and U_BOOT_CONFIG_PACKAGE
+
+U_BOOT_TOOLS_PACKAGE = "1" is achieved by U_BOOT_BUILD_PROFILES += "tools"
+U_BOOT_CONFIG_PACKAGE = "1" is achieved by U_BOOT_BUILD_PROFILES += "config"
+
+u-boot-${MACHINE}-dev package build can also be controlled now. Enabled by default
+in u-boot-custom.inc. To remove use the below code in your recipe.
+
+U_BOOT_BUILD_PROFILES_remove = "dev"
diff --git a/meta/recipes-bsp/u-boot/files/debian/control.tmpl b/meta/recipes-bsp/u-boot/files/debian/control.tmpl
index 9379be7..7ac11ad 100644
--- a/meta/recipes-bsp/u-boot/files/debian/control.tmpl
+++ b/meta/recipes-bsp/u-boot/files/debian/control.tmpl
@@ -11,4 +11,17 @@ Description: ${DESCRIPTION}, bootloader binaries
 
 Package: u-boot-${MACHINE}-dev
 Architecture: ${DISTRO_ARCH}
+Build-Profiles: <dev>
 Description: ${DESCRIPTION}, bootloader libraries
+
+Package: u-boot-tools
+Architecture: linux-any
+Build-Profiles: <tools>
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: ${DESCRIPTION}, companion tools
+
+Package: u-boot-${MACHINE}-config
+Build-Profiles: <config>
+Provides: u-boot-config
+Architecture: ${DISTRO_ARCH}
+Description: ${DESCRIPTION}, environment configuration
diff --git a/meta/recipes-bsp/u-boot/files/debian/rules b/meta/recipes-bsp/u-boot/files/debian/rules
index 3d66762..121b00e 100755
--- a/meta/recipes-bsp/u-boot/files/debian/rules
+++ b/meta/recipes-bsp/u-boot/files/debian/rules
@@ -20,10 +20,17 @@ override_dh_auto_build:
 	else \
 		./scripts/get_default_envs.sh >u-boot-initial-env; \
 	fi
-	$(MAKE) $(PARALLEL_MAKE) $(SET_CROSS_BUILD_TOOLS) NO_SDL=1 tools-only envtools
+ifneq (,$(filter dev,$(DEB_BUILD_PROFILES)))
+	$(MAKE) $(PARALLEL_MAKE) $(SET_CROSS_BUILD_TOOLS) NO_SDL=1 envtools
+endif
+ifneq (,$(filter tools,$(DEB_BUILD_PROFILES)))
+	$(MAKE) $(PARALLEL_MAKE) $(SET_CROSS_BUILD_TOOLS) NO_SDL=1 tools-only
+endif
 
 override_dh_auto_install:
+ifneq (,$(filter dev,$(DEB_BUILD_PROFILES)))
 	mv tools/env/lib.a tools/env/libubootenv.a
+endif
 
 override_dh_auto_test:
 
diff --git a/meta/recipes-bsp/u-boot/u-boot-custom.inc b/meta/recipes-bsp/u-boot/u-boot-custom.inc
index 9984d8c..5198809 100644
--- a/meta/recipes-bsp/u-boot/u-boot-custom.inc
+++ b/meta/recipes-bsp/u-boot/u-boot-custom.inc
@@ -9,10 +9,13 @@ FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/files:"
 
 DESCRIPTION ?= "Custom U-Boot"
 
-PROVIDES += "u-boot-${MACHINE} u-boot-${MACHINE}-dev"
-PROVIDES += "${@'u-boot-tools' if d.getVar('U_BOOT_TOOLS_PACKAGE') == '1' else ''}"
+PROVIDES += "u-boot-${MACHINE}"
+PROVIDES += "${@'u-boot-tools' \
+	if bb.utils.contains('U_BOOT_BUILD_PROFILES', 'tools', 1, 0, d) else ''}"
 PROVIDES += "${@('u-boot-config u-boot-' + d.getVar('MACHINE') + '-config') \
-    if d.getVar('U_BOOT_CONFIG_PACKAGE') == '1' else ''}"
+	if bb.utils.contains('U_BOOT_BUILD_PROFILES', 'config', 1, 0, d) else ''}"
+PROVIDES += "${@('u-boot-' + d.getVar('MACHINE') + '-dev') \
+	if bb.utils.contains('U_BOOT_BUILD_PROFILES', 'dev', 1, 0, d) else ''}"
 
 inherit dpkg
 
@@ -22,6 +25,20 @@ python() {
     if d.getVar('BUILD_DEPENDS'):
         bb.warn("u-boot-custom: Deprecated use of BUILD_DEPENDS, please switch to DEBIAN_BUILD_DEPENDS")
         d.setVar('DEBIAN_BUILD_DEPENDS', d.getVar('BUILD_DEPENDS'))
+
+    if d.getVar('U_BOOT_TOOLS_PACKAGE') is not None:
+        bb.warn("u-boot-custom: Deprecated use of U_BOOT_TOOLS_PACKAGE, please switch to U_BOOT_BUILD_PROFILES")
+        if d.getVar('U_BOOT_TOOLS_PACKAGE') == "1":
+            d.appendVar('U_BOOT_BUILD_PROFILES', " tools")
+        else:
+            d.setVar('U_BOOT_BUILD_PROFILES_remove', "tools")
+
+    if d.getVar('U_BOOT_CONFIG_PACKAGE') is not None:
+        bb.warn("u-boot-custom: Deprecated use of U_BOOT_CONFIG_PACKAGE, please switch to U_BOOT_BUILD_PROFILES")
+        if d.getVar('U_BOOT_CONFIG_PACKAGE') == "1":
+            d.appendVar('U_BOOT_BUILD_PROFILES', " config")
+        else:
+            d.setVar('U_BOOT_BUILD_PROFILES_remove', "config")
 }
 
 DEBIAN_BUILD_DEPENDS ?= "bc, bison, flex, device-tree-compiler, git"
@@ -29,8 +46,8 @@ DEBIAN_BUILD_DEPENDS ?= "bc, bison, flex, device-tree-compiler, git"
 TEMPLATE_FILES = "debian/control.tmpl"
 TEMPLATE_VARS += "MACHINE DEBIAN_BUILD_DEPENDS"
 
-U_BOOT_TOOLS_PACKAGE ?= "0"
-U_BOOT_CONFIG_PACKAGE ?= "0"
+
+U_BOOT_BUILD_PROFILES ?= "dev"
 
 do_prepare_build() {
     cp -r ${WORKDIR}/debian ${S}/
@@ -40,31 +57,15 @@ do_prepare_build() {
     echo "${U_BOOT_BIN} /usr/lib/u-boot/${MACHINE}" > \
         ${S}/debian/u-boot-${MACHINE}.install
 
-    echo "tools/env/libubootenv.a usr/lib" > \
-        ${S}/debian/u-boot-${MACHINE}-dev.install
-
-    if [ "${U_BOOT_TOOLS_PACKAGE}" = "1" ]; then
-        cat <<EOF >>${S}/debian/control
-
-Package: u-boot-tools
-Architecture: linux-any
-Depends: \${shlibs:Depends}, \${misc:Depends}
-Description: ${DESCRIPTION}, companion tools
-EOF
+    if [ "${@bb.utils.contains('U_BOOT_BUILD_PROFILES', 'dev', 'yes', 'no', d)}" = "yes" ];then
+        echo "tools/env/libubootenv.a usr/lib" > \
+            ${S}/debian/u-boot-${MACHINE}-dev.install
     fi
 
-    if [ "${U_BOOT_CONFIG_PACKAGE}" = "1" ]; then
+    if [ "${@bb.utils.contains('U_BOOT_BUILD_PROFILES', 'config', 'yes', 'no', d)}" = "yes" ];then
         cp ${WORKDIR}/fw_env.config ${S}/ || \
             die "U_BOOT_CONFIG_PACKAGE requires a fw_env.config in SRC_URI"
 
-        cat <<EOF >>${S}/debian/control
-
-Package: u-boot-${MACHINE}-config
-Provides: u-boot-config
-Architecture: ${DISTRO_ARCH}
-Description: ${DESCRIPTION}, environment configuration
-EOF
-
         cat <<EOF >>${S}/debian/u-boot-${MACHINE}-config.install
 u-boot-initial-env /etc
 fw_env.config      /etc
@@ -75,4 +76,5 @@ EOF
 dpkg_runbuild_prepend() {
     export U_BOOT_CONFIG="${U_BOOT_CONFIG}"
     export U_BOOT_BIN="${U_BOOT_BIN}"
+    export DEB_BUILD_PROFILES="${U_BOOT_BUILD_PROFILES}"
 }
-- 
2.25.1


^ permalink raw reply	[flat|nested] 7+ messages in thread
* [PATCH v5 2/4] meta-isar: u-boot: Migrate to U_BOOT_BUILD_PROFILES
  2022-02-01 11:57 [PATCH v5 0/4] U-boot Refactor and update to 2022.01 Vijai Kumar K
  2022-02-01 11:57 ` [PATCH v5 1/4] u-boot: Switch to use DEB_BUILD_PROFILES Vijai Kumar K
@ 2022-02-01 11:57 ` Vijai Kumar K
  2022-02-01 11:57 ` [PATCH v5 3/4] meta: u-boot: Prepare for newer versions Vijai Kumar K
  2022-02-01 11:57 ` [PATCH v5 4/4] meta-isar: u-boot: Update to 2022.01 Vijai Kumar K
  3 siblings, 0 replies; 7+ messages in thread
From: Vijai Kumar K @ 2022-02-01 11:57 UTC (permalink / raw)
  To: isar-users, jan.kiszka; +Cc: Vijai Kumar K

Migrate u-boot recipe to use U_BOOT_BUILD_PROFILES instead of
U_BOOT_TOOLS_PACKAGE variable

Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
---
 meta-isar/recipes-bsp/u-boot/u-boot-de0-nano-soc_2020.10.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-isar/recipes-bsp/u-boot/u-boot-de0-nano-soc_2020.10.bb b/meta-isar/recipes-bsp/u-boot/u-boot-de0-nano-soc_2020.10.bb
index dcb76c5..640b7ea 100644
--- a/meta-isar/recipes-bsp/u-boot/u-boot-de0-nano-soc_2020.10.bb
+++ b/meta-isar/recipes-bsp/u-boot/u-boot-de0-nano-soc_2020.10.bb
@@ -6,4 +6,4 @@
 require u-boot-${PV}.inc
 
 # Just for testing purposes, distro package would be recent enough
-U_BOOT_TOOLS_PACKAGE = "1"
+U_BOOT_BUILD_PROFILES += "tools"
-- 
2.25.1


^ permalink raw reply	[flat|nested] 7+ messages in thread
* [PATCH v5 3/4] meta: u-boot: Prepare for newer versions
  2022-02-01 11:57 [PATCH v5 0/4] U-boot Refactor and update to 2022.01 Vijai Kumar K
  2022-02-01 11:57 ` [PATCH v5 1/4] u-boot: Switch to use DEB_BUILD_PROFILES Vijai Kumar K
  2022-02-01 11:57 ` [PATCH v5 2/4] meta-isar: u-boot: Migrate to U_BOOT_BUILD_PROFILES Vijai Kumar K
@ 2022-02-01 11:57 ` Vijai Kumar K
  2022-02-01 11:57 ` [PATCH v5 4/4] meta-isar: u-boot: Update to 2022.01 Vijai Kumar K
  3 siblings, 0 replies; 7+ messages in thread
From: Vijai Kumar K @ 2022-02-01 11:57 UTC (permalink / raw)
  To: isar-users, jan.kiszka; +Cc: Vijai Kumar K

Newer versions of u-boot require libssl-dev:native for compilation.
It also needs libssl-dev of the host architecture for cross compilation
of tools.

Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
---
 meta/recipes-bsp/u-boot/u-boot-custom.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-bsp/u-boot/u-boot-custom.inc b/meta/recipes-bsp/u-boot/u-boot-custom.inc
index 5198809..dd69c00 100644
--- a/meta/recipes-bsp/u-boot/u-boot-custom.inc
+++ b/meta/recipes-bsp/u-boot/u-boot-custom.inc
@@ -41,7 +41,8 @@ python() {
             d.setVar('U_BOOT_BUILD_PROFILES_remove', "config")
 }
 
-DEBIAN_BUILD_DEPENDS ?= "bc, bison, flex, device-tree-compiler, git"
+DEBIAN_BUILD_DEPENDS ?= "bc, bison, flex, device-tree-compiler, git, \
+	libssl-dev:native, libssl-dev <tools>"
 
 TEMPLATE_FILES = "debian/control.tmpl"
 TEMPLATE_VARS += "MACHINE DEBIAN_BUILD_DEPENDS"
-- 
2.25.1


^ permalink raw reply	[flat|nested] 7+ messages in thread
* [PATCH v5 4/4] meta-isar: u-boot: Update to 2022.01
  2022-02-01 11:57 [PATCH v5 0/4] U-boot Refactor and update to 2022.01 Vijai Kumar K
                   ` (2 preceding siblings ...)
  2022-02-01 11:57 ` [PATCH v5 3/4] meta: u-boot: Prepare for newer versions Vijai Kumar K
@ 2022-02-01 11:57 ` Vijai Kumar K
  3 siblings, 0 replies; 7+ messages in thread
From: Vijai Kumar K @ 2022-02-01 11:57 UTC (permalink / raw)
  To: isar-users, jan.kiszka; +Cc: Vijai Kumar K

Update to the latest u-boot.

Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
---
 ...y-add-property-no-map-to-created-res.patch | 151 ------------------
 ...rty-no-map-to-secure-reserved-memory.patch |  33 ----
 ...{u-boot-2020.10.inc => u-boot-2022.01.inc} |   4 +-
 ...0.10.bb => u-boot-de0-nano-soc_2022.01.bb} |   2 +-
 .../u-boot/u-boot-stm32mp15x_2020.10.bb       |  10 --
 .../u-boot/u-boot-stm32mp15x_2022.01.bb       |   6 +
 6 files changed, 9 insertions(+), 197 deletions(-)
 delete mode 100644 meta-isar/recipes-bsp/u-boot/files/0001-fdtdec-optionally-add-property-no-map-to-created-res.patch
 delete mode 100644 meta-isar/recipes-bsp/u-boot/files/0002-optee-add-property-no-map-to-secure-reserved-memory.patch
 rename meta-isar/recipes-bsp/u-boot/{u-boot-2020.10.inc => u-boot-2022.01.inc} (60%)
 rename meta-isar/recipes-bsp/u-boot/{u-boot-de0-nano-soc_2020.10.bb => u-boot-de0-nano-soc_2022.01.bb} (81%)
 delete mode 100644 meta-isar/recipes-bsp/u-boot/u-boot-stm32mp15x_2020.10.bb
 create mode 100644 meta-isar/recipes-bsp/u-boot/u-boot-stm32mp15x_2022.01.bb

diff --git a/meta-isar/recipes-bsp/u-boot/files/0001-fdtdec-optionally-add-property-no-map-to-created-res.patch b/meta-isar/recipes-bsp/u-boot/files/0001-fdtdec-optionally-add-property-no-map-to-created-res.patch
deleted file mode 100644
index 8a32fc1..0000000
--- a/meta-isar/recipes-bsp/u-boot/files/0001-fdtdec-optionally-add-property-no-map-to-created-res.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-From ccaa5747bdeae4261199dd7e80771e4de1c550ca Mon Sep 17 00:00:00 2001
-From: Etienne Carriere <etienne.carriere@st.com>
-Date: Thu, 10 Sep 2020 10:49:59 +0200
-Subject: [PATCH] fdtdec: optionally add property no-map to created reserved
- memory node
-
-Add boolean input argument @no_map to helper function
-fdtdec_add_reserved_memory() to add or not "no-map" property
-for an added reserved memory node.
-
-Property no-map is used by the Linux kernel to not not map memory
-in its static memory mapping. It is needed for example for the|
-consistency of system non-cached memory and to prevent speculative
-accesses to some firewalled memory.
-
-No functional change. A later change will update to OPTEE library to
-add no-map property to OP-TEE reserved memory nodes.
-
-Signed-off-by: Etienne Carriere <etienne.carriere@st.com>
-Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
-Reviewed-by: Simon Glass <sjg@chromium.org>
----
- arch/riscv/lib/fdt_fixup.c |  2 +-
- include/fdtdec.h           |  5 +++--
- lib/fdtdec.c               | 10 ++++++++--
- lib/optee/optee.c          |  2 +-
- test/dm/fdtdec.c           |  6 +++---
- 5 files changed, 16 insertions(+), 9 deletions(-)
-
-diff --git a/arch/riscv/lib/fdt_fixup.c b/arch/riscv/lib/fdt_fixup.c
-index 5b2420243f..d02062fd5b 100644
---- a/arch/riscv/lib/fdt_fixup.c
-+++ b/arch/riscv/lib/fdt_fixup.c
-@@ -75,7 +75,7 @@ int riscv_fdt_copy_resv_mem_node(const void *src, void *dst)
- 		pmp_mem.start = addr;
- 		pmp_mem.end = addr + size - 1;
- 		err = fdtdec_add_reserved_memory(dst, basename, &pmp_mem,
--						 &phandle);
-+						 &phandle, false);
- 		if (err < 0 && err != -FDT_ERR_EXISTS) {
- 			log_err("failed to add reserved memory: %d\n", err);
- 			return err;
-diff --git a/include/fdtdec.h b/include/fdtdec.h
-index 152eb07b9e..62d1660973 100644
---- a/include/fdtdec.h
-+++ b/include/fdtdec.h
-@@ -1029,7 +1029,7 @@ static inline int fdtdec_set_phandle(void *blob, int node, uint32_t phandle)
-  *     };
-  *     uint32_t phandle;
-  *
-- *     fdtdec_add_reserved_memory(fdt, "framebuffer", &fb, &phandle);
-+ *     fdtdec_add_reserved_memory(fdt, "framebuffer", &fb, &phandle, false);
-  *
-  * This results in the following subnode being added to the top-level
-  * /reserved-memory node:
-@@ -1056,11 +1056,12 @@ static inline int fdtdec_set_phandle(void *blob, int node, uint32_t phandle)
-  * @param carveout	information about the carveout region
-  * @param phandlep	return location for the phandle of the carveout region
-  *			can be NULL if no phandle should be added
-+ * @param no_map	add "no-map" property if true
-  * @return 0 on success or a negative error code on failure
-  */
- int fdtdec_add_reserved_memory(void *blob, const char *basename,
- 			       const struct fdt_memory *carveout,
--			       uint32_t *phandlep);
-+			       uint32_t *phandlep, bool no_map);
- 
- /**
-  * fdtdec_get_carveout() - reads a carveout from an FDT
-diff --git a/lib/fdtdec.c b/lib/fdtdec.c
-index 56bf9fcc79..b8fc5e2bff 100644
---- a/lib/fdtdec.c
-+++ b/lib/fdtdec.c
-@@ -1316,7 +1316,7 @@ static int fdtdec_init_reserved_memory(void *blob)
- 
- int fdtdec_add_reserved_memory(void *blob, const char *basename,
- 			       const struct fdt_memory *carveout,
--			       uint32_t *phandlep)
-+			       uint32_t *phandlep, bool no_map)
- {
- 	fdt32_t cells[4] = {}, *ptr = cells;
- 	uint32_t upper, lower, phandle;
-@@ -1416,6 +1416,12 @@ int fdtdec_add_reserved_memory(void *blob, const char *basename,
- 	if (err < 0)
- 		return err;
- 
-+	if (no_map) {
-+		err = fdt_setprop(blob, node, "no-map", NULL, 0);
-+		if (err < 0)
-+			return err;
-+	}
-+
- 	/* return the phandle for the new node for the caller to use */
- 	if (phandlep)
- 		*phandlep = phandle;
-@@ -1481,7 +1487,7 @@ int fdtdec_set_carveout(void *blob, const char *node, const char *prop_name,
- 	fdt32_t value;
- 	void *prop;
- 
--	err = fdtdec_add_reserved_memory(blob, name, carveout, &phandle);
-+	err = fdtdec_add_reserved_memory(blob, name, carveout, &phandle, false);
- 	if (err < 0) {
- 		debug("failed to add reserved memory: %d\n", err);
- 		return err;
-diff --git a/lib/optee/optee.c b/lib/optee/optee.c
-index 457d4cca8a..963c2ff430 100644
---- a/lib/optee/optee.c
-+++ b/lib/optee/optee.c
-@@ -192,7 +192,7 @@ int optee_copy_fdt_nodes(const void *old_blob, void *new_blob)
- 				ret = fdtdec_add_reserved_memory(new_blob,
- 								 nodename,
- 								 &carveout,
--								 NULL);
-+								 NULL, false);
- 				free(oldname);
- 
- 				if (ret < 0)
-diff --git a/test/dm/fdtdec.c b/test/dm/fdtdec.c
-index 716993f706..4119003041 100644
---- a/test/dm/fdtdec.c
-+++ b/test/dm/fdtdec.c
-@@ -80,7 +80,7 @@ static int dm_test_fdtdec_add_reserved_memory(struct unit_test_state *uts)
- 	resv.start = 0x1000;
- 	resv.end = 0x1fff;
- 	ut_assertok(fdtdec_add_reserved_memory(blob, "rsvd_region",
--					       &resv, &phandle));
-+					       &resv, &phandle, false));
- 
- 	/* Test /reserve-memory and its subnode should exist */
- 	parent = fdt_path_offset(blob, "/reserved-memory");
-@@ -101,7 +101,7 @@ static int dm_test_fdtdec_add_reserved_memory(struct unit_test_state *uts)
- 	resv.start = 0x2000;
- 	resv.end = 0x2fff;
- 	ut_assertok(fdtdec_add_reserved_memory(blob, "rsvd_region1",
--					       &resv, &phandle1));
-+					       &resv, &phandle1, false));
- 	subnode = fdt_path_offset(blob, "/reserved-memory/rsvd_region1");
- 	ut_assert(subnode > 0);
- 
-@@ -115,7 +115,7 @@ static int dm_test_fdtdec_add_reserved_memory(struct unit_test_state *uts)
- 	resv.start = 0x1000;
- 	resv.end = 0x1fff;
- 	ut_assertok(fdtdec_add_reserved_memory(blob, "rsvd_region2",
--					       &resv, &phandle1));
-+					       &resv, &phandle1, false));
- 	subnode = fdt_path_offset(blob, "/reserved-memory/rsvd_region2");
- 	ut_assert(subnode < 0);
- 
--- 
-2.26.2
-
diff --git a/meta-isar/recipes-bsp/u-boot/files/0002-optee-add-property-no-map-to-secure-reserved-memory.patch b/meta-isar/recipes-bsp/u-boot/files/0002-optee-add-property-no-map-to-secure-reserved-memory.patch
deleted file mode 100644
index 6a39968..0000000
--- a/meta-isar/recipes-bsp/u-boot/files/0002-optee-add-property-no-map-to-secure-reserved-memory.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 3e15c315f97401f394ae83ed17fbef72b765222a Mon Sep 17 00:00:00 2001
-From: Etienne Carriere <etienne.carriere@st.com>
-Date: Thu, 10 Sep 2020 10:50:01 +0200
-Subject: [PATCH] optee: add property no-map to secure reserved memory
-
-OP-TEE reserved memory node must set property "no-map" to prevent
-Linux kernel from mapping secure memory unless what non-secure world
-speculative accesses of the CPU can violate the memory firmware
-configuration.
-
-Fixes: 6ccb05eae01b ("image: fdt: copy possible optee nodes to a loaded devicetree")
-Signed-off-by: Etienne Carriere <etienne.carriere@st.com>
-Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
----
- lib/optee/optee.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/optee/optee.c b/lib/optee/optee.c
-index 963c2ff430..9e6606568f 100644
---- a/lib/optee/optee.c
-+++ b/lib/optee/optee.c
-@@ -192,7 +192,7 @@ int optee_copy_fdt_nodes(const void *old_blob, void *new_blob)
- 				ret = fdtdec_add_reserved_memory(new_blob,
- 								 nodename,
- 								 &carveout,
--								 NULL, false);
-+								 NULL, true);
- 				free(oldname);
- 
- 				if (ret < 0)
--- 
-2.26.2
-
diff --git a/meta-isar/recipes-bsp/u-boot/u-boot-2020.10.inc b/meta-isar/recipes-bsp/u-boot/u-boot-2022.01.inc
similarity index 60%
rename from meta-isar/recipes-bsp/u-boot/u-boot-2020.10.inc
rename to meta-isar/recipes-bsp/u-boot/u-boot-2022.01.inc
index 604776a..84ee0d1 100644
--- a/meta-isar/recipes-bsp/u-boot/u-boot-2020.10.inc
+++ b/meta-isar/recipes-bsp/u-boot/u-boot-2022.01.inc
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Siemens AG, 2018-2020
+# Copyright (c) Siemens AG, 2018-2022
 #
 # SPDX-License-Identifier: MIT
 
@@ -8,6 +8,6 @@ require recipes-bsp/u-boot/u-boot-custom.inc
 SRC_URI += " \
     https://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \
     "
-SRC_URI[sha256sum] = "0d481bbdc05c0ee74908ec2f56a6daa53166cc6a78a0e4fac2ac5d025770a622"
+SRC_URI[sha256sum] = "81b4543227db228c03f8a1bf5ddbc813b0bb8f6555ce46064ef721a6fc680413"
 
 S = "${WORKDIR}/u-boot-${PV}"
diff --git a/meta-isar/recipes-bsp/u-boot/u-boot-de0-nano-soc_2020.10.bb b/meta-isar/recipes-bsp/u-boot/u-boot-de0-nano-soc_2022.01.bb
similarity index 81%
rename from meta-isar/recipes-bsp/u-boot/u-boot-de0-nano-soc_2020.10.bb
rename to meta-isar/recipes-bsp/u-boot/u-boot-de0-nano-soc_2022.01.bb
index 640b7ea..467609e 100644
--- a/meta-isar/recipes-bsp/u-boot/u-boot-de0-nano-soc_2020.10.bb
+++ b/meta-isar/recipes-bsp/u-boot/u-boot-de0-nano-soc_2022.01.bb
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Siemens AG, 2018-2020
+# Copyright (c) Siemens AG, 2018-2022
 #
 # SPDX-License-Identifier: MIT
 
diff --git a/meta-isar/recipes-bsp/u-boot/u-boot-stm32mp15x_2020.10.bb b/meta-isar/recipes-bsp/u-boot/u-boot-stm32mp15x_2020.10.bb
deleted file mode 100644
index 39fceb2..0000000
--- a/meta-isar/recipes-bsp/u-boot/u-boot-stm32mp15x_2020.10.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Copyright (c) Siemens AG, 2020
-#
-# SPDX-License-Identifier: MIT
-
-require u-boot-${PV}.inc
-
-SRC_URI += " \
-    file://0001-fdtdec-optionally-add-property-no-map-to-created-res.patch \
-    file://0002-optee-add-property-no-map-to-secure-reserved-memory.patch"
diff --git a/meta-isar/recipes-bsp/u-boot/u-boot-stm32mp15x_2022.01.bb b/meta-isar/recipes-bsp/u-boot/u-boot-stm32mp15x_2022.01.bb
new file mode 100644
index 0000000..28b7847
--- /dev/null
+++ b/meta-isar/recipes-bsp/u-boot/u-boot-stm32mp15x_2022.01.bb
@@ -0,0 +1,6 @@
+#
+# Copyright (c) Siemens AG, 2022
+#
+# SPDX-License-Identifier: MIT
+
+require u-boot-${PV}.inc
-- 
2.25.1


^ permalink raw reply	[flat|nested] 7+ messages in thread
* RE: [PATCH v5 1/4] u-boot: Switch to use DEB_BUILD_PROFILES
  2022-02-01 11:57 ` [PATCH v5 1/4] u-boot: Switch to use DEB_BUILD_PROFILES Vijai Kumar K
@ 2022-02-01 12:54   ` Moessbauer, Felix
  2022-02-01 19:03     ` vijai kumar
  0 siblings, 1 reply; 7+ messages in thread
From: Moessbauer, Felix @ 2022-02-01 12:54 UTC (permalink / raw)
  To: Vijai Kumar K, isar-users; +Cc: jan.kiszka

Hi Vijai,

> -----Original Message-----
> From: isar-users@googlegroups.com <isar-users@googlegroups.com> On
> Behalf Of Vijai Kumar K
> Sent: Tuesday, February 1, 2022 12:57 PM
> To: isar-users@googlegroups.com; Kiszka, Jan (T CED)
> <jan.kiszka@siemens.com>
> Cc: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
> Subject: [PATCH v5 1/4] u-boot: Switch to use DEB_BUILD_PROFILES
> 
> Use DEB_BUILD_PROFILES to select packages to build.
> 
> This patch drops the U_BOOT_TOOLS_PACKAGE and
> U_BOOT_CONFIG_PACKAGE variables and introduces
> U_BOOT_BUILD_PROFILES through which we can enable particular packages
> like u-boot-tools, u-boot-dev and u-boot-config.
> 
> Also, provide backward compatibility with U_BOOT_*_PACKAGES variable and
> prompt a deprecation warning to user.
> 
> Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
> ---
>  RECIPE-API-CHANGELOG.md                       | 11 ++++
>  .../u-boot/files/debian/control.tmpl          | 13 +++++
>  meta/recipes-bsp/u-boot/files/debian/rules    |  9 +++-
>  meta/recipes-bsp/u-boot/u-boot-custom.inc     | 52 ++++++++++---------
>  4 files changed, 59 insertions(+), 26 deletions(-)
> 
> diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md index
> ce0a6da..118b328 100644
> --- a/RECIPE-API-CHANGELOG.md
> +++ b/RECIPE-API-CHANGELOG.md
> @@ -335,3 +335,14 @@ names for kernel/headers.
>  Changes in next
>  ---------------
> 
> +### Deprecate U_BOOT_TOOLS_PACKAGE and U_BOOT_CONFIG_PACKAGE
> +
> +Use U_BOOT_BUILD_PROFILES instead of U_BOOT_TOOLS_PACKAGE and
> +U_BOOT_CONFIG_PACKAGE
> +
> +U_BOOT_TOOLS_PACKAGE = "1" is achieved by U_BOOT_BUILD_PROFILES +=
> "tools"
> +U_BOOT_CONFIG_PACKAGE = "1" is achieved by U_BOOT_BUILD_PROFILES +=
> "config"
> +
> +u-boot-${MACHINE}-dev package build can also be controlled now. Enabled
> +by default in u-boot-custom.inc. To remove use the below code in your recipe.
> +
> +U_BOOT_BUILD_PROFILES_remove = "dev"
> diff --git a/meta/recipes-bsp/u-boot/files/debian/control.tmpl b/meta/recipes-
> bsp/u-boot/files/debian/control.tmpl
> index 9379be7..7ac11ad 100644
> --- a/meta/recipes-bsp/u-boot/files/debian/control.tmpl
> +++ b/meta/recipes-bsp/u-boot/files/debian/control.tmpl
> @@ -11,4 +11,17 @@ Description: ${DESCRIPTION}, bootloader binaries
> 
>  Package: u-boot-${MACHINE}-dev
>  Architecture: ${DISTRO_ARCH}
> +Build-Profiles: <dev>
>  Description: ${DESCRIPTION}, bootloader libraries
> +
> +Package: u-boot-tools
> +Architecture: linux-any
> +Build-Profiles: <tools>
> +Depends: ${shlibs:Depends}, ${misc:Depends}
> +Description: ${DESCRIPTION}, companion tools
> +
> +Package: u-boot-${MACHINE}-config
> +Build-Profiles: <config>
> +Provides: u-boot-config
> +Architecture: ${DISTRO_ARCH}
> +Description: ${DESCRIPTION}, environment configuration
> diff --git a/meta/recipes-bsp/u-boot/files/debian/rules b/meta/recipes-bsp/u-
> boot/files/debian/rules
> index 3d66762..121b00e 100755
> --- a/meta/recipes-bsp/u-boot/files/debian/rules
> +++ b/meta/recipes-bsp/u-boot/files/debian/rules
> @@ -20,10 +20,17 @@ override_dh_auto_build:
>  	else \
>  		./scripts/get_default_envs.sh >u-boot-initial-env; \
>  	fi
> -	$(MAKE) $(PARALLEL_MAKE) $(SET_CROSS_BUILD_TOOLS) NO_SDL=1
> tools-only envtools
> +ifneq (,$(filter dev,$(DEB_BUILD_PROFILES)))
> +	$(MAKE) $(PARALLEL_MAKE) $(SET_CROSS_BUILD_TOOLS) NO_SDL=1
> envtools
> +endif ifneq (,$(filter tools,$(DEB_BUILD_PROFILES)))
> +	$(MAKE) $(PARALLEL_MAKE) $(SET_CROSS_BUILD_TOOLS) NO_SDL=1
> tools-only
> +endif
> 
>  override_dh_auto_install:
> +ifneq (,$(filter dev,$(DEB_BUILD_PROFILES)))
>  	mv tools/env/lib.a tools/env/libubootenv.a
> +endif
> 
>  override_dh_auto_test:
> 
> diff --git a/meta/recipes-bsp/u-boot/u-boot-custom.inc b/meta/recipes-bsp/u-
> boot/u-boot-custom.inc
> index 9984d8c..5198809 100644
> --- a/meta/recipes-bsp/u-boot/u-boot-custom.inc
> +++ b/meta/recipes-bsp/u-boot/u-boot-custom.inc
> @@ -9,10 +9,13 @@ FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/files:"
> 
>  DESCRIPTION ?= "Custom U-Boot"
> 
> -PROVIDES += "u-boot-${MACHINE} u-boot-${MACHINE}-dev"
> -PROVIDES += "${@'u-boot-tools' if d.getVar('U_BOOT_TOOLS_PACKAGE') == '1'
> else ''}"
> +PROVIDES += "u-boot-${MACHINE}"
> +PROVIDES += "${@'u-boot-tools' \
> +	if bb.utils.contains('U_BOOT_BUILD_PROFILES', 'tools', 1, 0, d) else ''}"
>  PROVIDES += "${@('u-boot-config u-boot-' + d.getVar('MACHINE') + '-config') \
> -    if d.getVar('U_BOOT_CONFIG_PACKAGE') == '1' else ''}"
> +	if bb.utils.contains('U_BOOT_BUILD_PROFILES', 'config', 1, 0, d) else ''}"
> +PROVIDES += "${@('u-boot-' + d.getVar('MACHINE') + '-dev') \
> +	if bb.utils.contains('U_BOOT_BUILD_PROFILES', 'dev', 1, 0, d) else ''}"
> 
>  inherit dpkg
> 
> @@ -22,6 +25,20 @@ python() {
>      if d.getVar('BUILD_DEPENDS'):
>          bb.warn("u-boot-custom: Deprecated use of BUILD_DEPENDS, please
> switch to DEBIAN_BUILD_DEPENDS")
>          d.setVar('DEBIAN_BUILD_DEPENDS', d.getVar('BUILD_DEPENDS'))
> +
> +    if d.getVar('U_BOOT_TOOLS_PACKAGE') is not None:
> +        bb.warn("u-boot-custom: Deprecated use of U_BOOT_TOOLS_PACKAGE,
> please switch to U_BOOT_BUILD_PROFILES")
> +        if d.getVar('U_BOOT_TOOLS_PACKAGE') == "1":
> +            d.appendVar('U_BOOT_BUILD_PROFILES', " tools")
> +        else:
> +            d.setVar('U_BOOT_BUILD_PROFILES_remove', "tools")
> +
> +    if d.getVar('U_BOOT_CONFIG_PACKAGE') is not None:
> +        bb.warn("u-boot-custom: Deprecated use of U_BOOT_CONFIG_PACKAGE,
> please switch to U_BOOT_BUILD_PROFILES")
> +        if d.getVar('U_BOOT_CONFIG_PACKAGE') == "1":
> +            d.appendVar('U_BOOT_BUILD_PROFILES', " config")
> +        else:
> +            d.setVar('U_BOOT_BUILD_PROFILES_remove', "config")
>  }
> 
>  DEBIAN_BUILD_DEPENDS ?= "bc, bison, flex, device-tree-compiler, git"
> @@ -29,8 +46,8 @@ DEBIAN_BUILD_DEPENDS ?= "bc, bison, flex, device-tree-
> compiler, git"
>  TEMPLATE_FILES = "debian/control.tmpl"
>  TEMPLATE_VARS += "MACHINE DEBIAN_BUILD_DEPENDS"
> 
> -U_BOOT_TOOLS_PACKAGE ?= "0"
> -U_BOOT_CONFIG_PACKAGE ?= "0"
> +
> +U_BOOT_BUILD_PROFILES ?= "dev"
> 
>  do_prepare_build() {
>      cp -r ${WORKDIR}/debian ${S}/
> @@ -40,31 +57,15 @@ do_prepare_build() {
>      echo "${U_BOOT_BIN} /usr/lib/u-boot/${MACHINE}" > \
>          ${S}/debian/u-boot-${MACHINE}.install
> 
> -    echo "tools/env/libubootenv.a usr/lib" > \
> -        ${S}/debian/u-boot-${MACHINE}-dev.install
> -
> -    if [ "${U_BOOT_TOOLS_PACKAGE}" = "1" ]; then
> -        cat <<EOF >>${S}/debian/control
> -
> -Package: u-boot-tools
> -Architecture: linux-any
> -Depends: \${shlibs:Depends}, \${misc:Depends}
> -Description: ${DESCRIPTION}, companion tools -EOF
> +    if [ "${@bb.utils.contains('U_BOOT_BUILD_PROFILES', 'dev', 'yes', 'no', d)}" =
> "yes" ];then
> +        echo "tools/env/libubootenv.a usr/lib" > \
> +            ${S}/debian/u-boot-${MACHINE}-dev.install
>      fi
> 
> -    if [ "${U_BOOT_CONFIG_PACKAGE}" = "1" ]; then
> +    if [ "${@bb.utils.contains('U_BOOT_BUILD_PROFILES', 'config',
> + 'yes', 'no', d)}" = "yes" ];then
>          cp ${WORKDIR}/fw_env.config ${S}/ || \
>              die "U_BOOT_CONFIG_PACKAGE requires a fw_env.config in SRC_URI"
> 
> -        cat <<EOF >>${S}/debian/control
> -
> -Package: u-boot-${MACHINE}-config
> -Provides: u-boot-config
> -Architecture: ${DISTRO_ARCH}
> -Description: ${DESCRIPTION}, environment configuration -EOF
> -
>          cat <<EOF >>${S}/debian/u-boot-${MACHINE}-config.install
>  u-boot-initial-env /etc
>  fw_env.config      /etc
> @@ -75,4 +76,5 @@ EOF
>  dpkg_runbuild_prepend() {
>      export U_BOOT_CONFIG="${U_BOOT_CONFIG}"
>      export U_BOOT_BIN="${U_BOOT_BIN}"
> +    export DEB_BUILD_PROFILES="${U_BOOT_BUILD_PROFILES}"

Can we wait with this until the DEB_BUILD_PROFILES patch series is merged.
Then, you can simply define via bitbake: DEB_BUILD_PROFILES="${U_BOOT_BUILD_PROFILES}"
Manually exporting will break either on the sbuilder series or the DEB_BUILD_PROFILES series as both have API changes.

Best regards,
Felix

>  }
> --
> 2.25.1
> 
> --
> You received this message because you are subscribed to the Google Groups
> "isar-users" group.
> To unsubscribe from this group and stop receiving emails from it, send an email
> to isar-users+unsubscribe@googlegroups.com.
> To view this discussion on the web visit
> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgroups.g
> oogle.com%2Fd%2Fmsgid%2Fisar-users%2F20220201115713.3062835-2-
> Vijaikumar_Kanagarajan%2540mentor.com&amp;data=04%7C01%7Cfelix.moes
> sbauer%40siemens.com%7C7c8fc33935e249cbc16e08d9e57a0b6d%7C38ae3bc
> d95794fd4addab42e1495d55a%7C1%7C0%7C637793135659965600%7CUnkno
> wn%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1ha
> WwiLCJXVCI6Mn0%3D%7C3000&amp;sdata=s%2FUtf%2FS8cSwq4Pi%2Bqjbs%2
> F49aeewXBhaA7b3m38cWxgo%3D&amp;reserved=0.

^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [PATCH v5 1/4] u-boot: Switch to use DEB_BUILD_PROFILES
  2022-02-01 12:54   ` Moessbauer, Felix
@ 2022-02-01 19:03     ` vijai kumar
  0 siblings, 0 replies; 7+ messages in thread
From: vijai kumar @ 2022-02-01 19:03 UTC (permalink / raw)
  To: Moessbauer, Felix; +Cc: Vijai Kumar K, isar-users, jan.kiszka

On Tue, Feb 1, 2022 at 6:24 PM Moessbauer, Felix
<felix.moessbauer@siemens.com> wrote:
>
> Hi Vijai,
>
> > -----Original Message-----
> > From: isar-users@googlegroups.com <isar-users@googlegroups.com> On
> > Behalf Of Vijai Kumar K
> > Sent: Tuesday, February 1, 2022 12:57 PM
> > To: isar-users@googlegroups.com; Kiszka, Jan (T CED)
> > <jan.kiszka@siemens.com>
> > Cc: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
> > Subject: [PATCH v5 1/4] u-boot: Switch to use DEB_BUILD_PROFILES
> >
> > Use DEB_BUILD_PROFILES to select packages to build.
> >
> > This patch drops the U_BOOT_TOOLS_PACKAGE and
> > U_BOOT_CONFIG_PACKAGE variables and introduces
> > U_BOOT_BUILD_PROFILES through which we can enable particular packages
> > like u-boot-tools, u-boot-dev and u-boot-config.
> >
> > Also, provide backward compatibility with U_BOOT_*_PACKAGES variable and
> > prompt a deprecation warning to user.
> >
> > Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
> > ---
> >  RECIPE-API-CHANGELOG.md                       | 11 ++++
> >  .../u-boot/files/debian/control.tmpl          | 13 +++++
> >  meta/recipes-bsp/u-boot/files/debian/rules    |  9 +++-
> >  meta/recipes-bsp/u-boot/u-boot-custom.inc     | 52 ++++++++++---------
> >  4 files changed, 59 insertions(+), 26 deletions(-)
> >
> > diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md index
> > ce0a6da..118b328 100644
> > --- a/RECIPE-API-CHANGELOG.md
> > +++ b/RECIPE-API-CHANGELOG.md
> > @@ -335,3 +335,14 @@ names for kernel/headers.
> >  Changes in next
> >  ---------------
> >
> > +### Deprecate U_BOOT_TOOLS_PACKAGE and U_BOOT_CONFIG_PACKAGE
> > +
> > +Use U_BOOT_BUILD_PROFILES instead of U_BOOT_TOOLS_PACKAGE and
> > +U_BOOT_CONFIG_PACKAGE
> > +
> > +U_BOOT_TOOLS_PACKAGE = "1" is achieved by U_BOOT_BUILD_PROFILES +=
> > "tools"
> > +U_BOOT_CONFIG_PACKAGE = "1" is achieved by U_BOOT_BUILD_PROFILES +=
> > "config"
> > +
> > +u-boot-${MACHINE}-dev package build can also be controlled now. Enabled
> > +by default in u-boot-custom.inc. To remove use the below code in your recipe.
> > +
> > +U_BOOT_BUILD_PROFILES_remove = "dev"
> > diff --git a/meta/recipes-bsp/u-boot/files/debian/control.tmpl b/meta/recipes-
> > bsp/u-boot/files/debian/control.tmpl
> > index 9379be7..7ac11ad 100644
> > --- a/meta/recipes-bsp/u-boot/files/debian/control.tmpl
> > +++ b/meta/recipes-bsp/u-boot/files/debian/control.tmpl
> > @@ -11,4 +11,17 @@ Description: ${DESCRIPTION}, bootloader binaries
> >
> >  Package: u-boot-${MACHINE}-dev
> >  Architecture: ${DISTRO_ARCH}
> > +Build-Profiles: <dev>
> >  Description: ${DESCRIPTION}, bootloader libraries
> > +
> > +Package: u-boot-tools
> > +Architecture: linux-any
> > +Build-Profiles: <tools>
> > +Depends: ${shlibs:Depends}, ${misc:Depends}
> > +Description: ${DESCRIPTION}, companion tools
> > +
> > +Package: u-boot-${MACHINE}-config
> > +Build-Profiles: <config>
> > +Provides: u-boot-config
> > +Architecture: ${DISTRO_ARCH}
> > +Description: ${DESCRIPTION}, environment configuration
> > diff --git a/meta/recipes-bsp/u-boot/files/debian/rules b/meta/recipes-bsp/u-
> > boot/files/debian/rules
> > index 3d66762..121b00e 100755
> > --- a/meta/recipes-bsp/u-boot/files/debian/rules
> > +++ b/meta/recipes-bsp/u-boot/files/debian/rules
> > @@ -20,10 +20,17 @@ override_dh_auto_build:
> >       else \
> >               ./scripts/get_default_envs.sh >u-boot-initial-env; \
> >       fi
> > -     $(MAKE) $(PARALLEL_MAKE) $(SET_CROSS_BUILD_TOOLS) NO_SDL=1
> > tools-only envtools
> > +ifneq (,$(filter dev,$(DEB_BUILD_PROFILES)))
> > +     $(MAKE) $(PARALLEL_MAKE) $(SET_CROSS_BUILD_TOOLS) NO_SDL=1
> > envtools
> > +endif ifneq (,$(filter tools,$(DEB_BUILD_PROFILES)))
> > +     $(MAKE) $(PARALLEL_MAKE) $(SET_CROSS_BUILD_TOOLS) NO_SDL=1
> > tools-only
> > +endif
> >
> >  override_dh_auto_install:
> > +ifneq (,$(filter dev,$(DEB_BUILD_PROFILES)))
> >       mv tools/env/lib.a tools/env/libubootenv.a
> > +endif
> >
> >  override_dh_auto_test:
> >
> > diff --git a/meta/recipes-bsp/u-boot/u-boot-custom.inc b/meta/recipes-bsp/u-
> > boot/u-boot-custom.inc
> > index 9984d8c..5198809 100644
> > --- a/meta/recipes-bsp/u-boot/u-boot-custom.inc
> > +++ b/meta/recipes-bsp/u-boot/u-boot-custom.inc
> > @@ -9,10 +9,13 @@ FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/files:"
> >
> >  DESCRIPTION ?= "Custom U-Boot"
> >
> > -PROVIDES += "u-boot-${MACHINE} u-boot-${MACHINE}-dev"
> > -PROVIDES += "${@'u-boot-tools' if d.getVar('U_BOOT_TOOLS_PACKAGE') == '1'
> > else ''}"
> > +PROVIDES += "u-boot-${MACHINE}"
> > +PROVIDES += "${@'u-boot-tools' \
> > +     if bb.utils.contains('U_BOOT_BUILD_PROFILES', 'tools', 1, 0, d) else ''}"
> >  PROVIDES += "${@('u-boot-config u-boot-' + d.getVar('MACHINE') + '-config') \
> > -    if d.getVar('U_BOOT_CONFIG_PACKAGE') == '1' else ''}"
> > +     if bb.utils.contains('U_BOOT_BUILD_PROFILES', 'config', 1, 0, d) else ''}"
> > +PROVIDES += "${@('u-boot-' + d.getVar('MACHINE') + '-dev') \
> > +     if bb.utils.contains('U_BOOT_BUILD_PROFILES', 'dev', 1, 0, d) else ''}"
> >
> >  inherit dpkg
> >
> > @@ -22,6 +25,20 @@ python() {
> >      if d.getVar('BUILD_DEPENDS'):
> >          bb.warn("u-boot-custom: Deprecated use of BUILD_DEPENDS, please
> > switch to DEBIAN_BUILD_DEPENDS")
> >          d.setVar('DEBIAN_BUILD_DEPENDS', d.getVar('BUILD_DEPENDS'))
> > +
> > +    if d.getVar('U_BOOT_TOOLS_PACKAGE') is not None:
> > +        bb.warn("u-boot-custom: Deprecated use of U_BOOT_TOOLS_PACKAGE,
> > please switch to U_BOOT_BUILD_PROFILES")
> > +        if d.getVar('U_BOOT_TOOLS_PACKAGE') == "1":
> > +            d.appendVar('U_BOOT_BUILD_PROFILES', " tools")
> > +        else:
> > +            d.setVar('U_BOOT_BUILD_PROFILES_remove', "tools")
> > +
> > +    if d.getVar('U_BOOT_CONFIG_PACKAGE') is not None:
> > +        bb.warn("u-boot-custom: Deprecated use of U_BOOT_CONFIG_PACKAGE,
> > please switch to U_BOOT_BUILD_PROFILES")
> > +        if d.getVar('U_BOOT_CONFIG_PACKAGE') == "1":
> > +            d.appendVar('U_BOOT_BUILD_PROFILES', " config")
> > +        else:
> > +            d.setVar('U_BOOT_BUILD_PROFILES_remove', "config")
> >  }
> >
> >  DEBIAN_BUILD_DEPENDS ?= "bc, bison, flex, device-tree-compiler, git"
> > @@ -29,8 +46,8 @@ DEBIAN_BUILD_DEPENDS ?= "bc, bison, flex, device-tree-
> > compiler, git"
> >  TEMPLATE_FILES = "debian/control.tmpl"
> >  TEMPLATE_VARS += "MACHINE DEBIAN_BUILD_DEPENDS"
> >
> > -U_BOOT_TOOLS_PACKAGE ?= "0"
> > -U_BOOT_CONFIG_PACKAGE ?= "0"
> > +
> > +U_BOOT_BUILD_PROFILES ?= "dev"
> >
> >  do_prepare_build() {
> >      cp -r ${WORKDIR}/debian ${S}/
> > @@ -40,31 +57,15 @@ do_prepare_build() {
> >      echo "${U_BOOT_BIN} /usr/lib/u-boot/${MACHINE}" > \
> >          ${S}/debian/u-boot-${MACHINE}.install
> >
> > -    echo "tools/env/libubootenv.a usr/lib" > \
> > -        ${S}/debian/u-boot-${MACHINE}-dev.install
> > -
> > -    if [ "${U_BOOT_TOOLS_PACKAGE}" = "1" ]; then
> > -        cat <<EOF >>${S}/debian/control
> > -
> > -Package: u-boot-tools
> > -Architecture: linux-any
> > -Depends: \${shlibs:Depends}, \${misc:Depends}
> > -Description: ${DESCRIPTION}, companion tools -EOF
> > +    if [ "${@bb.utils.contains('U_BOOT_BUILD_PROFILES', 'dev', 'yes', 'no', d)}" =
> > "yes" ];then
> > +        echo "tools/env/libubootenv.a usr/lib" > \
> > +            ${S}/debian/u-boot-${MACHINE}-dev.install
> >      fi
> >
> > -    if [ "${U_BOOT_CONFIG_PACKAGE}" = "1" ]; then
> > +    if [ "${@bb.utils.contains('U_BOOT_BUILD_PROFILES', 'config',
> > + 'yes', 'no', d)}" = "yes" ];then
> >          cp ${WORKDIR}/fw_env.config ${S}/ || \
> >              die "U_BOOT_CONFIG_PACKAGE requires a fw_env.config in SRC_URI"
> >
> > -        cat <<EOF >>${S}/debian/control
> > -
> > -Package: u-boot-${MACHINE}-config
> > -Provides: u-boot-config
> > -Architecture: ${DISTRO_ARCH}
> > -Description: ${DESCRIPTION}, environment configuration -EOF
> > -
> >          cat <<EOF >>${S}/debian/u-boot-${MACHINE}-config.install
> >  u-boot-initial-env /etc
> >  fw_env.config      /etc
> > @@ -75,4 +76,5 @@ EOF
> >  dpkg_runbuild_prepend() {
> >      export U_BOOT_CONFIG="${U_BOOT_CONFIG}"
> >      export U_BOOT_BIN="${U_BOOT_BIN}"
> > +    export DEB_BUILD_PROFILES="${U_BOOT_BUILD_PROFILES}"
>
> Can we wait with this until the DEB_BUILD_PROFILES patch series is merged.
> Then, you can simply define via bitbake: DEB_BUILD_PROFILES="${U_BOOT_BUILD_PROFILES}"
> Manually exporting will break either on the sbuilder series or the DEB_BUILD_PROFILES series as both have API changes.

Works for me. I will rebase once your changes are in.

Thanks,
Vijai Kumar K

>
> Best regards,
> Felix
>
> >  }
> > --
> > 2.25.1
> >
> > --
> > You received this message because you are subscribed to the Google Groups
> > "isar-users" group.
> > To unsubscribe from this group and stop receiving emails from it, send an email
> > to isar-users+unsubscribe@googlegroups.com.
> > To view this discussion on the web visit
> > https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgroups.g
> > oogle.com%2Fd%2Fmsgid%2Fisar-users%2F20220201115713.3062835-2-
> > Vijaikumar_Kanagarajan%2540mentor.com&amp;data=04%7C01%7Cfelix.moes
> > sbauer%40siemens.com%7C7c8fc33935e249cbc16e08d9e57a0b6d%7C38ae3bc
> > d95794fd4addab42e1495d55a%7C1%7C0%7C637793135659965600%7CUnkno
> > wn%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1ha
> > WwiLCJXVCI6Mn0%3D%7C3000&amp;sdata=s%2FUtf%2FS8cSwq4Pi%2Bqjbs%2
> > F49aeewXBhaA7b3m38cWxgo%3D&amp;reserved=0.
>
> --
> You received this message because you are subscribed to the Google Groups "isar-users" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/isar-users/AM9PR10MB4869BCA3C85B3DBA0D50B3CE89269%40AM9PR10MB4869.EURPRD10.PROD.OUTLOOK.COM.

^ permalink raw reply	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-02-01 19:03 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-01 11:57 [PATCH v5 0/4] U-boot Refactor and update to 2022.01 Vijai Kumar K
2022-02-01 11:57 ` [PATCH v5 1/4] u-boot: Switch to use DEB_BUILD_PROFILES Vijai Kumar K
2022-02-01 12:54   ` Moessbauer, Felix
2022-02-01 19:03     ` vijai kumar
2022-02-01 11:57 ` [PATCH v5 2/4] meta-isar: u-boot: Migrate to U_BOOT_BUILD_PROFILES Vijai Kumar K
2022-02-01 11:57 ` [PATCH v5 3/4] meta: u-boot: Prepare for newer versions Vijai Kumar K
2022-02-01 11:57 ` [PATCH v5 4/4] meta-isar: u-boot: Update to 2022.01 Vijai Kumar K

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox