From patchwork Wed May 22 14:32:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 3577 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 16:32:55 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wr1-f61.google.com (mail-wr1-f61.google.com [209.85.221.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 44MEWtto008939 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 22 May 2024 16:32:55 +0200 Received: by mail-wr1-f61.google.com with SMTP id ffacd0b85a97d-351d13dd8aesf4128730f8f.2 for ; Wed, 22 May 2024 07:32:55 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1716388369; cv=pass; d=google.com; s=arc-20160816; b=uJFOvNSUEueYg68xfwW+YTs4BVkif46OBbX9KrwxoppzaOMr18CKDVhOS7I+wvuGot +P5Zqg2eLgwpbnvjddESCHu3DWsyptBOA8kZwLGGuCDvlA04Bc1jfW2gQfUto/gFw91l td27QTX1/8v3neZsL9Cvfk/D8Il/DwR+Th0w7hNFmi1GcPcHz6AWuEp6bQ+gJHoA6AJA cAtqvJZWqrI5eRRG18h3WaLytHnA/TaTnTDDbflMh3czDoqdeZ9OLwnrhO4ldSYkC8u5 mwfQzylhHIhBxMRqXPOBcvMQMHfctdNPdPaMKRbiGXRZ2nsaUD3BWmYVPpVhEz6RC8WX l+Tg== 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=Sej5+dsCA3LXEjYrijwBYOVHF2rYH/N4tjOrRzP1XII=; fh=cWBuqzUwgGVIaonQQkg6Sy4Rtv59hagKvqJEt94EaUY=; b=FV4RSaIPTpeNvQ1RyPbLk1+kouNK37MomkxrtQ97DW0vUhMBx/2YfjLuLh9U8mXMM0 qkuC4VssJzzIMXCQtc3AMwW6eX//gIuOR7PZnLu5Dy/gVMZbkwNfMimjzHQEhlBne8YE cC+Gz7M5K5/Qyx7CPKTReF4T8YwxLtiV+mSafqXbRWYrfY8eZYDFFbmlEDO0lWmOwk6h 3eazRhzpIFnBkWfOTHhuZ31HQcyqy8oAPREoX5cPBAUWwTIvPPH69YCprkyW4bk4uwtS DNT8tXzHMlzR0MONekoFlbbQ1qfgshpTw6lZAp4tVLzc3zrYGFmJW6gUdXuIgmPPBYj8 KwzQ==; 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=1716388369; x=1716993169; 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=Sej5+dsCA3LXEjYrijwBYOVHF2rYH/N4tjOrRzP1XII=; b=JThSxcpUEGUQy4dM0VCWHkPXGJtm9+ZxE9VrguclefSeDq8+wUpAIy/7Z75IsmrjL0 iRyplkDT/3+PDrvVdGU6TufVvAfT3bjJJPw9kDeS3uz03wsTcqDiR6qieKrWf3U0xET8 vm+UZifkKLUlY3FuOtvQEwmUlbaP766QhIvo2uWE0N3EoCBUnejYCsaFn8nnZZc5ahXN 3MO4r+eg/5q5Kw6L3wolwZ2YTKm7LK1+pJXib5jWhMjVas8AzqjqteTNKTDSiPOGGA73 6G1EYlxDGS9FZZxdc1UMsC9ILgmlZSucpgmJTJKfxfnysOniQ33eu544TYZ5JtSGdKB/ z2Iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716388369; x=1716993169; 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=Sej5+dsCA3LXEjYrijwBYOVHF2rYH/N4tjOrRzP1XII=; b=SVkNnKCZaetDxbo4ebZZvYiCaOXq1w4/co0vCAYaRcP93Gs3NcCmONV3AmpYq1wnFq cJJicIyumX4pVM6SeFKOfqIUnn8R7X5y+VUVrBsVqeSbJUZpTv2bVLAhHjG/HrKFW8jj cd96QWdLMNEPOhcFNpmXha3NR/xl9j89e7eDWNDQDWNwLKQd9vV8HAg4YNL0Q9lNNDKm WR/VC+cfe509HJsdDgubFXnShjmM3qsWxBS0LrW01MffOKgcvFrAJxLicTco0yjWRMZb qDZzPRmKTOuL2jljOs/Ox7xSbsegxbVlyP/TlL5nRhf+Iwo01d5i93kVEisCSyCkwXUz jshw== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCU5Ep4LVk502oGNVib4jl7RVD1C4GNyIDTMLEFxsXyMie7/QBpFpskHcAIdHvzSJhNcio06KTh+Jt727qKZZdxHxra+M5U= X-Gm-Message-State: AOJu0Yx7hJq2Bhdw/zTJLwSi4N/jsp/8JuSr6CzkaUluM64AVQaLDWYU AAuN07hLvFPXkcFczVrK1UcO4CiBELx18te/v8jMA5xkX+g18gLg X-Google-Smtp-Source: AGHT+IGu5yf0uHQawen+qgl+rdx8MRwAcp+GnLjxxlrmkG32o4CN3Tt1H458yADYbw9lYCDMyfLYEw== X-Received: by 2002:a5d:457b:0:b0:34a:4227:e9e8 with SMTP id ffacd0b85a97d-354d8d8de10mr2365605f8f.47.1716388369590; 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-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 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; 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 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. 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"