From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7371791587029811200 X-Received: by 2002:a05:6000:2af:b0:354:db70:3815 with SMTP id ffacd0b85a97d-354db703cd9mr2386188f8f.7.1716388369669; Wed, 22 May 2024 07:32:49 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:4f03:0:b0:354:c7ff:3f65 with SMTP id ffacd0b85a97d-354c7ff4585ls1807167f8f.2.-pod-prod-05-eu; Wed, 22 May 2024 07:32:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHZHSOshg+qIVpy2txHdUSHoD87KuHNxLJ5vSKp17p4NjmFv2IuOGkaIV9JQCsj2rDVg7JN X-Received: by 2002:adf:cf02:0:b0:34c:fa08:791c with SMTP id ffacd0b85a97d-354d8d8d9fbmr1796010f8f.45.1716388367570; Wed, 22 May 2024 07:32:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716388367; cv=none; d=google.com; s=arc-20160816; b=oMOf3dBPer4XvNJtKvwEJgFEAsAiQgPoOPZSJHB9fmL1xdpJMr1kwRCxWOQ3ci2eHW 2QrkemRoN5MVk2M6gP77m9Crl5LjbbAg6annyTPm5HCBiPWSgL98+QbsLHLTJHfea0JW HOJp5lIMzKjSEtqhG2l3tsaBYehwAGN7ULpb1d9ojIiClmKM7V0Ixzsdh7uU3rnDLsN8 w9F5rghmCXFQAK791Fm29jlT72Wnm1koV6e39cZBwNp5W3CTh6j0lNd08xnv9xWUSc4z hbyBD2PIi9HMSNClhnGrAFmR5s2NDUexNwiOcefrxWdbZUqiVYZVF9MJ5u1KUGou4a/Q zbdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=RPLOkpJrm31sdR93q/CN9U1aY2A62izn9iEInL6Zg7k=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=nPjB+gfMkyGusgZFqYdzT7QR4bUtwaI27WDeT/KwTUdDU7PEqXQBDHA2IT/evw6ifY nBC9NqDNUziHJ0Zn0/u5stCoBCtdl0G5MZyYBvhFPT1E6R3MEoULYO2JbNhTpMMp29/I xtK+YCpnJ5ZfIUlUvI8po5jEwMsaeJEpQJ3i3XTH0LMkMCOiNHTNRjBvkjpx0Ld7UoKL yJ/EKvDRkNPno2TTwC3KkCt2Vleh2J6obGJ5QNbD/Nl4dHEUQ33xBGGSKqiLyu5dDj6e a/Tl8Ny72Vd/qqIMoX8NPQNsEJ/REV/E7Oq7PvoZ6rVSGT8P0CsAevubpzbI8gcTtXiE HmSw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id ffacd0b85a97d-354c7d8ac03si127565f8f.1.2024.05.22.07.32.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 22 May 2024 07:32:47 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from user-B660.promwad.corp ([159.148.83.123]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 44MEWkYJ008925 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 22 May 2024 16:32:46 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v2] u-boot: Improve extra template variables usage Date: Wed, 22 May 2024 17:32:38 +0300 Message-Id: <20240522143238.863223-1-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: +X91AKDi1ZLY Commit 1b0ea08f introduced BL31 and TEE variables to be used in custom u-boot recipes. Summarize them to U_BOOT_EXTRA_BUILDARGS (with default to the same values) to allow any custom variables to be set. Signed-off-by: Anton Mikanovich --- Changes since v1: - Fixed typo in commit message meta/recipes-bsp/u-boot/files/debian/rules.tmpl | 2 +- meta/recipes-bsp/u-boot/u-boot-custom.inc | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-bsp/u-boot/files/debian/rules.tmpl b/meta/recipes-bsp/u-boot/files/debian/rules.tmpl index 53c85451..f4c161aa 100755 --- a/meta/recipes-bsp/u-boot/files/debian/rules.tmpl +++ b/meta/recipes-bsp/u-boot/files/debian/rules.tmpl @@ -14,7 +14,7 @@ endif override_dh_auto_build: $(MAKE) $(PARALLEL_MAKE) ${U_BOOT_CONFIG} - $(MAKE) $(PARALLEL_MAKE) BL31=${BL31} TEE=${TEE} ${U_BOOT_BIN} + $(MAKE) $(PARALLEL_MAKE) ${U_BOOT_EXTRA_BUILDARGS} ${U_BOOT_BIN} $(MAKE) -n u-boot-initial-env >/dev/null 2>&1; if [ $$? -ne 2 ]; then \ $(MAKE) $(PARALLEL_MAKE) u-boot-initial-env; \ else \ diff --git a/meta/recipes-bsp/u-boot/u-boot-custom.inc b/meta/recipes-bsp/u-boot/u-boot-custom.inc index 017e8336..a7b6cb0b 100644 --- a/meta/recipes-bsp/u-boot/u-boot-custom.inc +++ b/meta/recipes-bsp/u-boot/u-boot-custom.inc @@ -22,9 +22,11 @@ DEBIAN_BUILD_DEPENDS ?= "bc, bison, flex, device-tree-compiler, git" U_BOOT_BIN_INSTALL ?= "${U_BOOT_BIN}" +U_BOOT_EXTRA_BUILDARGS ??= "BL31=${BL31} TEE=${TEE}" + TEMPLATE_FILES = "debian/control.tmpl debian/rules.tmpl" TEMPLATE_VARS += "MACHINE DEBIAN_BUILD_DEPENDS U_BOOT_CONFIG U_BOOT_BIN \ - BL31 TEE" + U_BOOT_EXTRA_BUILDARGS" U_BOOT_TOOLS_PACKAGE ?= "0" U_BOOT_CONFIG_PACKAGE ?= "0" -- 2.34.1