From patchwork Wed May 22 11:56:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 3574 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 22 May 2024 13:56:27 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f187.google.com (mail-lj1-f187.google.com [209.85.208.187]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 44MBuQIm007938 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 22 May 2024 13:56:26 +0200 Received: by mail-lj1-f187.google.com with SMTP id 38308e7fff4ca-2e5225e937asf1276771fa.1 for ; Wed, 22 May 2024 04:56:26 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1716378981; cv=pass; d=google.com; s=arc-20160816; b=s5NuwaQSVswmT0G1AXMFJU882zJrHu6kpRXfAC0WnjF0o+vczX3FjoTCBb63POQ/Ru 0n4LUGAa4A4N9UmnaCZd+9GefsPKIcltxf3THPXkFXXpnvzPbVxgsV24tqAbbAVT/t/f jdVMEkfG6s8/8M9Kzbfz7mQJOoZsKbqH2YalWZwImMudYu53s63vGmfn3hdh+riFGN4J /ac/SjiCA5Mrk1AGaxE5xa1170mY80fNGuO1z1vq85izfbNEgOhBVVqlXfTm6/vdTmze Kyq+Cj9IVCynewgCuGegrQpSbvMKBDvx0j9QZC/0YG5VkYWpPaJQWCfmrtY/x5f8pROi J2yQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:message-id:date :subject:cc:to:from:sender:dkim-signature; bh=vxB9oA5WspX3POgH4C2nsi3nPib8NkzoyYBXzxQGx1g=; fh=6NN+MenFBGSsz7dofMQMbhHCykYAF4F1kYz2BDf3KrA=; b=lWI87uBeAFFiz3c9Tw9bOBL+D+ZFg+2wU1RBv3wcdFWFYwnC8Aw6svuS9/YUJ3BGUZ cWG8S+lm2MoYK/Ea8cZu6PphDFJQfxxhXEzP2GNPD7Z6vXE4mfLzg1Bz6Y542FisPOlz bX7rfxgJazdxz5o1OXcswbUYPwtz2wLbQcYknfK7DUCoiSbL7VIHEYzoB2uTSsCTXhtx fmuuetWJZAhZBiK4NFcnK5+vNS14pIxUxMO8ZVLKuE3dAm4Hr9cIZtg9/s6/B4K/nTSG 0iZRJ3w9h8OUiTw8JJSHO4XkCmwPkS0vhcd42BwvsN4a5UFsuAoVZ0Kem4hVNu3kA4Rw R5ZA==; darn=isar-build.org ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1716378981; x=1716983781; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:cc:to:from :sender:from:to:cc:subject:date:message-id:reply-to; bh=vxB9oA5WspX3POgH4C2nsi3nPib8NkzoyYBXzxQGx1g=; b=q3Yx+eredqILeCqJKKl4O6VIL+f4qU/iTd8sBrTrNf0AklHKN6Gn8jwFF2f9pfRX82 s3XlEqRQ98WCMzYfmZVCNBukvUkbsudZ8Rlq5I4C8KfNq/IAt5hf0m/Nab/Wm2Cjq+6x c/c2RP/443hEQSQBiIw5/vL2F4UicmcCbr4oYmslt95PFxukv8zGnGZ1URCIQFcXQma0 brLFIj57UXXEjcFjinVNSUOF2u2/FWZa7RcJS1lgV0dR8RCtAYAadRZHkf8DeyUAdlUA ZUjB3jzypYGHcBh6zlwA+xY1MVVE1E4VqxZcSUR2m9/xOb2SOtGElCuGIO2PcCOxVrWQ gcYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716378981; x=1716983781; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :message-id:date:subject:cc:to:from:x-beenthere:x-gm-message-state :sender:from:to:cc:subject:date:message-id:reply-to; bh=vxB9oA5WspX3POgH4C2nsi3nPib8NkzoyYBXzxQGx1g=; b=NgX3aPOq7TfQIeFwoz1Kko9szNVUnG2WFozZSjcaj0b1VcSCoVCP+e5RDbiNZ711bd kDoYR0ictG8gpSot6P0MiK1weODRqsMGDZGdIvCT8ejcHkUHYjcSaW6gDxqkjnK7GKap XsY1jH66kc9h6cBF5gMZK1ZHGP4Slcg8O4i25dM6VGk5GklOWkIZPQHiXKtKi+dwiVZp Lin/Vogd9B8yMgcauX6Gry7JyXCP+dGqOyLIWz1NdCGO6kNnffNMeDu1CXAr548aUnGJ jY2xMgxljqXuag7prCanagPGdQkWVSakQKOBmuhXdeLbmFq+Ax6ch2N4g5M4xQcp7RTZ Bl6A== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCVRFZCxxWEhakwC8tt4JIE/xenOW4IN/FgO6tLf6hS29UyyqDXxOM2C3VeFHJiJLelSPL89bGpMvLpLCpZaY0/eRIoE+vg= X-Gm-Message-State: AOJu0YyN/fACxDNL2xD8ZqI72IzxRcsRcIhT4KnCHWVaewv0A67vPEoY 5BaXEthD29VpKy7UJsPi3WSO7ndFIoRpo2LZDFhWY7iXjg03lg57 X-Google-Smtp-Source: AGHT+IExsbalD57cuvnG3sImh6Z/cM7WVRJWn/wM0/CysxDStfYbilQRyo7sCrTJSp02hIw0s165yA== X-Received: by 2002:a2e:a264:0:b0:2d6:f69d:c74c with SMTP id 38308e7fff4ca-2e949665d47mr9666751fa.38.1716378980658; Wed, 22 May 2024 04:56:20 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:9201:0:b0:2e6:a17b:c564 with SMTP id 38308e7fff4ca-2e6a17bc888ls5175621fa.0.-pod-prod-02-eu; Wed, 22 May 2024 04:56:18 -0700 (PDT) X-Received: by 2002:a2e:b603:0:b0:2e0:37be:b70f with SMTP id 38308e7fff4ca-2e9495bf9c9mr10464011fa.26.1716378978405; Wed, 22 May 2024 04:56:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716378978; cv=none; d=google.com; s=arc-20160816; b=A/Hra72Nje4sdI2q7kxzdTOFpX79M6Ca+YRzVry+QOh+32t2z+gaIfP8MMpjTQS0Ki E1TGJImuY/iK54xN9b7Zej9R74RRxvr9G61YyeyiKOwEslLEJvtLIL2keZ0HE0GHPsLj 3ixtNyJiNF55zb8PALmhdniY4bBNUa4MTPlq4ACfPvStLm1mJJ9Rnf20pyKCkltN2wKX BX2up2EtSoOcYAo9cVUg3BvdtFhLEIPIIb1sJ8i3YBxnpevn1Rx+lIMWzA7xH9+WUkZV EO4hU2kHWU3oq11KFBIH5QOrS9ssYTzaL8kLbjGm6AeZBYed5RSTyomVlr0e7VtcuBAy TTzA== 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=QaLyvsmi+L4yBLXvlNfMx9e3SmKIDnYcNEmkb53NAE8=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=txp9rKGa/BYVQTWKiUlnE5WVQl9o4HHL2zjzVpP3raio4DPgzbXhFBVSuqR9fapPJd ErKMoTPPKlzjy0orgvMTkUYhhz9HKpmKBcx5h1LxadO12ndvHTSWvPjSC8rd7zvfZIT1 CrGfeMGzM5ozt3DKazXtMaqGi7k86ZRUbSL4eHJ9XjCmTJF3pbSvw+PQSAvSYwA7GBvd BkXsoPba0SLlG4HfqcIwsE5YjZaL70s9vvaSNM2T23CbuDrgiozcWk05pXbzJT/9Plsx hdSpaEAgWoh2BwZd64hzdt5HUO3Ay6EtM85w9F7E/O+69rNI5BbBevPowoyrkTWGEhqQ CsWA==; 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 Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 38308e7fff4ca-2e70fbfed21si3087531fa.4.2024.05.22.04.56.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 22 May 2024 04:56:18 -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; 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 44MBuGrS007930 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 22 May 2024 13:56:17 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH] u-boot: Improve extra template variables usage Date: Wed, 22 May 2024 14:56:10 +0300 Message-Id: <20240522115610.857600-1-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS 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-Original-Sender: amikan@ilbers.de X-Original-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 Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= Commit 1b0ea08f introduced BL31 and TEE variables to be used in custom u-boot recipes. Summorize 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 --- 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"