From patchwork Tue Aug 1 09:37:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "MOESSBAUER, Felix" X-Patchwork-Id: 2999 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 01 Aug 2023 11:37:47 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f189.google.com (mail-lj1-f189.google.com [209.85.208.189]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 3719bj40020973 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 1 Aug 2023 11:37:46 +0200 Received: by mail-lj1-f189.google.com with SMTP id 38308e7fff4ca-2b710c5677esf50473541fa.0 for ; Tue, 01 Aug 2023 02:37:46 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1690882660; cv=pass; d=google.com; s=arc-20160816; b=OZpfmAPmnbxgR2YePgoFABMsHUiOR5pDIg6vWZlP0TeffgZm2xrTT6NamqlzkoJ/kW 8APFvK/su3xxms2oQJYtZsKnvNyhGlmzkQQg+MU86sSU1RWj/gGy9gGyOuOZNEtN2YiJ 0bu1JMgTVRO+dikM/AroV1HQ6UYBWu9MKDaKPju2Wd2sukuue5lJdYQyoL0gjSl8D/31 jaz0/SFf/b9WLr/ls3RsJ0xGWGhD2fgVCDnjjzTUV2nhN0ppEc3F1NFIoeaqCDaVwpDa J0PTpmXVV5tycMNhecQxM8WVwEuGtIMchvti2s5440DyEFDCnKLAGt3oShI3+X0KVrKa 09ZQ== 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:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=bbby/P5C1uTKsFg8IkNnKJRG6bTDLQATw0guWOpqxms=; fh=FK95eqZp7lRnKesB3RkINaKKaryhiXkUiWtU9nFsGzo=; b=nf2vUqcCIvI7XOq9ZUDMh1ExeDm3U/KJughw+3LsYW/okFe42doorHcEvzbeDWaABR oQzQiSGZnxIve8Lqf/07lFHo+S8CXp3E39rxSBNjtpkOtMo0mYjZGCJKnX8lqU578h0w cv39w+HyinO6OVSOqudOvYIjle0a6LX9tZaLJhJbaxibfoXHd6IE+yJ53OZ8DUR24wDj Jha3efJ9EUFzB2b2xjH4ZXw39DHOuz5O4Zk2mGHggPGV0v80PIZ/UNm4ej45gsp2FqDN Zo0AFU34jfh3vZNPEsw2hXD9LLw+8ENMqDsOoh4WbeToLIF8esJ0gHVRMHa1cKI9XkF6 8AuA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=NTyacp2r; spf=pass (google.com: domain of fm-72506-20230801093737759bedba4aaee6be85-mtooy_@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-72506-20230801093737759bedba4aaee6be85-mTooY_@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20221208; t=1690882660; x=1691487460; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=bbby/P5C1uTKsFg8IkNnKJRG6bTDLQATw0guWOpqxms=; b=H6lOclvvGmKgRFOwSxcKUEgxk3Os/1YZpfrWlGhy1+m0QnJe4ZQSTUEEjIkJWeuuXU 96B2ji1do6aFIUuJe1unbl81+nR6SBLgGFq1upYzUW2hkQK2qC1MRkV6w9Xi3M2eZV55 0a0cCgOnkOeVuLpQ6QVefrkCt6acfYNHbziHxsR39YiJHX7sV8En1FjFCIZvJ4nYOMd0 Wc9bFVsES/1ejCCNs4ridITvzsk+qX6gib4pHi6xsHk1hYOleGFeMoJ8LnZIUbte4rLN MQBiF3xY1vqbFWvJqy90VA/PAIStr0pIZZdmFnkB6rX5PsPb5yrj1SF7hHvgxVMOqPlF 8Iiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690882660; x=1691487460; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=bbby/P5C1uTKsFg8IkNnKJRG6bTDLQATw0guWOpqxms=; b=Cc0au8fnQyCQuGu5439SGXcVgHr8+DZ4yi7AtmqgWwPOLPWe8l1bsh55RlBifSiLlP 96pTVVHu/QFT98VB9abRgivqbewntsBqMu4xsGaaUorxp5P2vxI4CN1BoQX57RMoJLuR xcAV/0O3YDRoz/7EaXdeFhLvO1a41I5Oir6uwKISdtGASz/Cx9QyhF+A7dwi6D0IawsA fi0cA0cHm1JgI/hg2x2/5l0h8FUYyAk2dcZsjg88fMVDvqjtH7gGiQZQoFLiMjytn2rb mysc8SLu4KmgBWKiptAr0CEGEKyZWMIH1+lIrWgwWocZhTLlc3qJuietxy3KaLIJr0Tb UpSQ== X-Gm-Message-State: ABy/qLZGQPWILboyS2cb9d0TS6enAx4hGkFCYfzNhvswAm966t6JqWWA rljQgGm4rJLSYj31WblHZfs= X-Google-Smtp-Source: APBJJlEirqRGsCLQ7VfABwmc4gB+YOp25ibNS+Da3JMCszNPb1X8yKF7zPOq1z7iSV9Fhn9iBWWQTg== X-Received: by 2002:a2e:7e06:0:b0:2b9:e40a:30bc with SMTP id z6-20020a2e7e06000000b002b9e40a30bcmr1935393ljc.19.1690882660136; Tue, 01 Aug 2023 02:37:40 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:bc1d:0:b0:2b9:631f:ac29 with SMTP id b29-20020a2ebc1d000000b002b9631fac29ls102063ljf.1.-pod-prod-08-eu; Tue, 01 Aug 2023 02:37:38 -0700 (PDT) X-Received: by 2002:a2e:9c10:0:b0:2b9:e9c8:cb1 with SMTP id s16-20020a2e9c10000000b002b9e9c80cb1mr1900089lji.48.1690882658039; Tue, 01 Aug 2023 02:37:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690882658; cv=none; d=google.com; s=arc-20160816; b=a+rbC06/cQFvdjCGEGCxYib7RiYo19qr2nQdExju/XGN4G3LFbrH/IRAQ6vDy3m/3Z nCYTeyuFPoLLKDoqHnjcX+4mo0bqQQ+bGnwEAyUtOR9U6qEc4/BjVTb+lE0fLgDF6KQU wfA63aqtKq1bsP3vUyyIOr7hWu71d+IUCw57CmRMcszkdug6V/UiOuCvfMeYAlBENyge CS+jn/uYearr8ec5bUHcYAxc9l5x3g274zbZaF+2KmLMITjt+DK9mFxSUMI6EUT2SIs1 nYdXuSIWxq/qyP0PFkeen+JB6CHEmFJeXC3+/5BAtok6ATTqmzyTspKBUZ0xuu9RWqPm W0ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=3TGmcbx2LLxShMIyl+zmp+vJgDsgVkBw56aB7wuWGgE=; fh=Y8xmVxKsXeOwj5VJYPzj0QBUOe1XiBsygT7R+JGa07w=; b=MjOCmH0mfKuTtLNEtB7oQFVz/8tRabQWVOqpGKawN1KMc3y6soY0PmnohcxotXlV62 E6EG8961pu6xWV/HKbaCt1FYQ0G3AnjB5JwYlgFtwuPsIgpaaoVKr7LT+D9TO9dzrmS3 wIACCXOjYsVdtYI2I238C4J9EgqUuOrsJyH4yDwyBDaovJ8NX1MLoXMH/w7ZIPZkxajj 39sfC7+/bPGzFMJK2y/cIvlEO8LDxVY0Zj9MO5KC97tdgCu7dsAyQMsMzPtr62ApiJnZ z7QQjiei8mq/R8bdWVtsLnfj+zh24cb3V0Q5lWgIbLpy+8v935Uqef7Ind/uQQ8+ekBy goQQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=NTyacp2r; spf=pass (google.com: domain of fm-72506-20230801093737759bedba4aaee6be85-mtooy_@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-72506-20230801093737759bedba4aaee6be85-mTooY_@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net. [185.136.65.227]) by gmr-mx.google.com with ESMTPS id fm5-20020a05600c0c0500b003fbf22a6ddcsi871398wmb.1.2023.08.01.02.37.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 Aug 2023 02:37:37 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-20230801093737759bedba4aaee6be85-mtooy_@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) client-ip=185.136.65.227; Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 20230801093737759bedba4aaee6be85 for ; Tue, 01 Aug 2023 11:37:37 +0200 X-Patchwork-Original-From: "'Felix Moessbauer' via isar-users" From: "MOESSBAUER, Felix" To: isar-users@googlegroups.com Cc: florian.bezdeka@siemens.com, jan.kiszka@siemens.com, Felix Moessbauer Subject: [PATCH 1/4] fix(u-boot-script): use correct ramdisk size Date: Tue, 1 Aug 2023 09:37:03 +0000 Message-Id: <20230801093706.1347928-2-felix.moessbauer@siemens.com> In-Reply-To: <20230801093706.1347928-1-felix.moessbauer@siemens.com> References: <20230801093706.1347928-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-72506:519-21489:flowmailer X-Original-Sender: felix.moessbauer@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=NTyacp2r; spf=pass (google.com: domain of fm-72506-20230801093737759bedba4aaee6be85-mtooy_@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-72506-20230801093737759bedba4aaee6be85-mTooY_@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Felix Moessbauer Reply-To: Felix Moessbauer 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-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= When booting the kernel via a boot* command, the ramdisk is passed as address : size. However, the size pointed to the temporary variable filesize, which denotes the filesize of the last load. When combining with DT overlays, the overlays are loaded later and by that overwrite the filesize variable, resulting in a partially passed initrd. To fix this, we assign the size immediately after loading it to an env variable and use that when booting. Signed-off-by: Felix Moessbauer --- meta/recipes-bsp/u-boot-script/files/update-u-boot-script | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-bsp/u-boot-script/files/update-u-boot-script b/meta/recipes-bsp/u-boot-script/files/update-u-boot-script index 39b9fa0f..e9ace15e 100755 --- a/meta/recipes-bsp/u-boot-script/files/update-u-boot-script +++ b/meta/recipes-bsp/u-boot-script/files/update-u-boot-script @@ -50,7 +50,8 @@ yes|1) echo "load \${devtype} \${devnum}:\${distro_bootpart}" \ "\${ramdisk_addr_r} /boot/initrd.img-${KERNEL_VERSION}" \ >> ${BOOT_CMD} - INITRD_ADDR="\${ramdisk_addr_r}:\${filesize}" + echo "setenv ramdisk_size \${filesize}" >> ${BOOT_CMD} + INITRD_ADDR="\${ramdisk_addr_r}:\${ramdisk_size}" esac if [ -n "${OVERLAYS}" ]; then From patchwork Tue Aug 1 09:37:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "MOESSBAUER, Felix" X-Patchwork-Id: 3000 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 01 Aug 2023 11:37:53 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f186.google.com (mail-lj1-f186.google.com [209.85.208.186]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 3719br3m021031 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 1 Aug 2023 11:37:53 +0200 Received: by mail-lj1-f186.google.com with SMTP id 38308e7fff4ca-2b9bee2d344sf50133291fa.1 for ; Tue, 01 Aug 2023 02:37:53 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1690882667; cv=pass; d=google.com; s=arc-20160816; b=EqXQ0Anvjmfl59e/PNPfV2gm4nI51e/N+1YW/oe7cYN6J1Ayxgz86KTJNBD1Am68fd 9RP+eQEEqlDIr8Pl5kHx4sOMKwzIlzBWYcKJs6vyiThnBkB8/DyxfRx1KrDWkE0K7gXr SoTa2QF1PpU+P1TJDwhvN7RiZhdyZLiZ2inWiAoeAz4/8CH4kYfOypNw6srloKr8F+40 h9wvSmswOFbeL4Q3IMihSFwhbkJg22dIv6JnagJaC5NOHIsx9m0SjgvmimUUfJ+pDh2b M71vKcVzwaZPhmsgEMULF5kG6OnvB2t+g8mgNzf15jhk8yHSDNkfas+ERaqdD7IF2SDT E7HQ== 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:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=qDja/+/XPCtbqEyKAWeg8w9JvQwnXCxDavZK7s3Locg=; fh=FK95eqZp7lRnKesB3RkINaKKaryhiXkUiWtU9nFsGzo=; b=DQjedlGFK94W+SMCJSyt4RMWYjUHL0Z71m4aujJkga92XHmk+lCBc8Q1DhweFIKb84 uUhPKuC2zXkDh4FvLfqy3FDiwFnLhExeVFIUh9qPHRCgr8zf2CNnSJVcn2OZFmjYsRgr tmHXVRHXpvstRWP1x8mIXBI1Azh58NVgT9iL/AZuv0el0AJFMECqAzEpWq0FbX7AKrtq JDVxR7b5JVsV1UbwxpxQvW7WKad9p/dL+HbIggPQDyOwP0UL0ERxPOEu2HTrj7GSxZA6 eslFwQ+uf1vZE4AGDVnTHP3CmeWjYGpyjdsFFsi0kYYNYw7adLkTdtGqBneHv7SfrodO /VWA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=aPyMXjGC; spf=pass (google.com: domain of fm-72506-20230801093744a5f7e06dcbc4189fda-_t9cih@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-72506-20230801093744a5f7e06dcbc4189fda-_t9cIh@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20221208; t=1690882667; x=1691487467; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=qDja/+/XPCtbqEyKAWeg8w9JvQwnXCxDavZK7s3Locg=; b=DRcHXfDQjNVMVyaTnzezKN70iBRpJoMsrbOD4nDAcJ0Ui8ZfP8AGvytaIpxiMfE5CN t70sLUCXWZgTMvzktglhE+BECyjrT8dixiG7Jc63a3ZiHty+Ae65sMlyXMUPJjxb4Fjy nEzqt5LBbZThNf+rNS6ISsIUsvpiWWWbANWg4Of8h0+3F1zA0CtPd9e4rTbiZtkzBno2 mbGE9P12QKQmiJosdbXCepxOHxJ3Op4pLzYOn+PlCt/k0LERs+pc9e5qWAHc/iPEGgF5 4X/QWmGbEeavIU8TWdYdpWNtp2r/2AyRZn1btAStZ8FiVirg+cUttSwbDljYJVfxsDfs Jxgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690882667; x=1691487467; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=qDja/+/XPCtbqEyKAWeg8w9JvQwnXCxDavZK7s3Locg=; b=YKr4Whya7BFRR6RsZ9ApewynnrDr2yRP9lOaU0C2/eySq3jt6wv9vHF3QcD4W4EgjT MdQeY1MNpbVrooBSwyKAXD3bwqlbtKCV0vYg1DIDpH8UKxF466nJHar6KgvIa1TB20zQ 1x/J2R2TZNOeAKqKR/Lq6ubX39o93Htu+3MoQnm3W0Y3ykrnItYl7NoKxcxHagL0RKZe K6QtugkZqPpjZj7yEVzgU+VR+nnx/DHbkxyU/naxSULbe0iEEcfObv+I41P7ZJ28+DC+ M49aTtX22O1WXUmg3XnIkWE9lpBOFwpa3TzCclib6/zicg7CN5KQFNYPMuJOvHEFHSPT DSxA== X-Gm-Message-State: ABy/qLaHvJGiB43fmWcRLxx2jk2QdlujKgGnOjUhSPoonYZgIxsIJYwV yeoCWTYd4NGTuZX9j9yFZCo= X-Google-Smtp-Source: APBJJlGgT420u14bRAHglyHPcW4kV3UbcaTl7PRWz+ICUuy5edzSc7lb9WNlx8+2QzJQFSXigs1ewA== X-Received: by 2002:a19:770a:0:b0:4fd:f827:225a with SMTP id s10-20020a19770a000000b004fdf827225amr1622561lfc.43.1690882667112; Tue, 01 Aug 2023 02:37:47 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:8c17:0:b0:4fb:df27:460b with SMTP id o23-20020a198c17000000b004fbdf27460bls460487lfd.2.-pod-prod-04-eu; Tue, 01 Aug 2023 02:37:45 -0700 (PDT) X-Received: by 2002:a19:5f12:0:b0:4f9:586b:dba1 with SMTP id t18-20020a195f12000000b004f9586bdba1mr1714051lfb.4.1690882665102; Tue, 01 Aug 2023 02:37:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690882665; cv=none; d=google.com; s=arc-20160816; b=OtGON2g+fXOC4bG+wc/t9PHNUHEjgpckynavecFAuMwuC72xzZkPzugCZ4l+cDfqLB VHHJJqwIdFaHfKRX0vJaSELm7VoocJTQ0ZUr3I9iFuMKaGytnbqiWOnjwdqt4myQhu6Z CdiELxQLK3qxRsg0E0HbWCV7wSDrMcQ4Dd5wUcPSsy918sDfN5mXdkWfRGF6Q6M9XBHQ MGpDpqjWSGUcrk9cd05lPhHF8O4fR0KmmQzM4cKmWObDYaf+wiwm52QMkJG3yh4n5f/6 zSwMUn5+Owu0/1PeORotZJTPJPtJ1rtgOIG8xAXRlvs2qJ77U0rG6sz3k5aqUNcPY1y8 TOMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=WuB+w9LCg6Kd3+CnrznccNq54xFxhdAVmMHwve+xA5Q=; fh=Y8xmVxKsXeOwj5VJYPzj0QBUOe1XiBsygT7R+JGa07w=; b=ZkvOrzO425n3Slk0NhDYl6o+rHD863ANX8VOj9FnS3+fm44HnfOw2a2HdJFctUEmFv EQoeFYIxWWpzJlys0gB41ooA9uwvrRPYFdTJNiA45I8unI0fjGLbfIy/XmhRgm3BmqkT JBb1pr3uoZcy0bRd1/YDHyAfyGVMOLl/ZyvHDEEPq7UbP+UPmI7BN48YPhLnfe0vnfBD Jkyl2XAYSWXe4nSB8jdPkH6sAQwrDQtipv7RIhGqu4e5dxm3uoJwRH9V60OecxrmB4xq k4R2zblrFsQPonZQEosOLQjDfH+YeH785iV+F+MzRVqyvDjZk5JSZh85oKUl3sPrYczJ t4YQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=aPyMXjGC; spf=pass (google.com: domain of fm-72506-20230801093744a5f7e06dcbc4189fda-_t9cih@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-72506-20230801093744a5f7e06dcbc4189fda-_t9cIh@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net. [185.136.64.225]) by gmr-mx.google.com with ESMTPS id q5-20020a056512210500b004fbdf1f6dcasi705382lfr.4.2023.08.01.02.37.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 Aug 2023 02:37:45 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-20230801093744a5f7e06dcbc4189fda-_t9cih@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) client-ip=185.136.64.225; Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 20230801093744a5f7e06dcbc4189fda for ; Tue, 01 Aug 2023 11:37:44 +0200 X-Patchwork-Original-From: "'Felix Moessbauer' via isar-users" From: "MOESSBAUER, Felix" To: isar-users@googlegroups.com Cc: florian.bezdeka@siemens.com, jan.kiszka@siemens.com, Felix Moessbauer Subject: [PATCH 2/4] refactor loading of DT overlays in uboot Date: Tue, 1 Aug 2023 09:37:04 +0000 Message-Id: <20230801093706.1347928-3-felix.moessbauer@siemens.com> In-Reply-To: <20230801093706.1347928-1-felix.moessbauer@siemens.com> References: <20230801093706.1347928-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-72506:519-21489:flowmailer X-Original-Sender: felix.moessbauer@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=aPyMXjGC; spf=pass (google.com: domain of fm-72506-20230801093744a5f7e06dcbc4189fda-_t9cih@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-72506-20230801093744a5f7e06dcbc4189fda-_t9cIh@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Felix Moessbauer Reply-To: Felix Moessbauer 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-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= As we already expand the DT overlays variable in the code generation, we do not need to loop over the elements in the generated code again. This reduces the size of the boot.src script a little and makes it better readable. No functional change. Signed-off-by: Felix Moessbauer --- meta/recipes-bsp/u-boot-script/files/update-u-boot-script | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meta/recipes-bsp/u-boot-script/files/update-u-boot-script b/meta/recipes-bsp/u-boot-script/files/update-u-boot-script index e9ace15e..14a81563 100755 --- a/meta/recipes-bsp/u-boot-script/files/update-u-boot-script +++ b/meta/recipes-bsp/u-boot-script/files/update-u-boot-script @@ -63,13 +63,11 @@ if [ -n "${OVERLAYS}" ]; then if ! echo $OVERLAY | grep -q "^/"; then OVERLAY_PATH=/usr/lib/linux-image-${KERNEL_VERSION}/ fi - echo "for entry in ${OVERLAY}; do" >> ${BOOT_CMD} - echo "echo Loading ${OVERLAY_PATH}\${entry}..." >> ${BOOT_CMD} + echo "echo Loading ${OVERLAY_PATH}${OVERLAY} ..." >> ${BOOT_CMD} echo "load \${devtype} \${devnum}:${ROOT_PARTITION}" \ - "\${overlay_addr_r} ${OVERLAY_PATH}\${entry}" \ + "\${overlay_addr_r} ${OVERLAY_PATH}${OVERLAY}" \ >> ${BOOT_CMD} echo "fdt apply \${overlay_addr_r}" >> ${BOOT_CMD} - echo "done" >> ${BOOT_CMD} done fi From patchwork Tue Aug 1 09:37:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "MOESSBAUER, Felix" X-Patchwork-Id: 3001 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 01 Aug 2023 11:38:08 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-ed1-f55.google.com (mail-ed1-f55.google.com [209.85.208.55]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 3719c77u021089 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 1 Aug 2023 11:38:07 +0200 Received: by mail-ed1-f55.google.com with SMTP id 4fb4d7f45d1cf-522a85b4caasf5165859a12.0 for ; Tue, 01 Aug 2023 02:38:07 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1690882682; cv=pass; d=google.com; s=arc-20160816; b=tb+9mZqJI8hW8UECeyNVNPb1aDpV1UDwLATaz04xqiVrFIo84wO8x1aXOMdq9dxtpV DLUGG8yGb40aY9cjwBeV+xp+JSBzhc8Xg4BGbWJYayrsJHdvtXJFrzRNOgYJNU1ikXrv ddbl7nGyIWhKn7b9KRxCDbpen8I40jVr7TJBfvLPM5XXB8oroOaMEK1jx6JVgm88DC+8 8pMM3eHxKiJlbd3BOkUevOgcbkllczeLwSSYxMgUkQ2rDKGCU8IjpS++A4XOPFLPHylD prbXvywBp30jX58Rlrmmh3szgBxNCykIyT/bKjBRt3kvTbSte2QYkn5qHM+Ync30kmsM kejQ== 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:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=oy8MOyZD6PZDboBnLUbE8hiImmd0YvUaOIJjzEbmB5Y=; fh=FK95eqZp7lRnKesB3RkINaKKaryhiXkUiWtU9nFsGzo=; b=TeBkwGOlXAlFP7+Wd4uQBq6t2FCuikx48CDXmMkh34bZKq8+1uDurjKrMuXhQ9weBd XqFO7Oaav9OaSbtoeNCj50Uf2nmTyH7R/DQD23LZe8w5JpfWEGMx1QUViPzNHII4+bby ZQWdCRWtimyUuHu78z6NKGbCJkaRaBzMeifX9z8mGDgU2DPABZntKoz8NJ6wLeEBvg28 Vs1LKsTy/OV2d1AXuL2N570NupvoffQsiXmiIIb5PFMneC48zEHppRpbzE22QMD9HkT1 atUiFM5xwE23KS/0EMR4zmBffIgau7btBzF70IicgvbedzTIoK4npqdY8pua0s2oNL5d a5hQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=SMXuLTsD; spf=pass (google.com: domain of fm-72506-20230801093759cce4b245ab7fc6711a-abnx9y@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-72506-20230801093759cce4b245ab7fc6711a-ABNX9y@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20221208; t=1690882682; x=1691487482; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=oy8MOyZD6PZDboBnLUbE8hiImmd0YvUaOIJjzEbmB5Y=; b=qv85qB5o+3aUkDMm90lIVnoVyNLSzbWkToXGyhLTkNQJZHzc0JU5M4cFA75u+E1f1s oJOtawG6rs3P3Arx+jmhIKXJqFV5z8pctOe7O5taZFLbWRBTd9gmGzFhv1V660kV4fsF cpMQ+7r6nZVgYVGZKiXIeYJKtw8VXBbBjK9xCGSbBd2BSdLIr46OLKVC5OXDxFprqxvc q+idlzKHn0SUhLFSnK3y1BzcCRqCp7ZdVtPxyS9S34iuPBCkrfb27ImAdnJPuk+VLYOV ZlOTL29zUyfdxk4V6+GYuwI5LWoBHi9Gqw5NpsP06l/7L4btNPXRXypdIQCjppx7elS3 gcFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690882682; x=1691487482; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=oy8MOyZD6PZDboBnLUbE8hiImmd0YvUaOIJjzEbmB5Y=; b=JWGKjEuVMfRNmtb22u+1/ICWP1YBQEFcad4wAVsFKqsL/3Hll0uX44PJ/01j+XZgA4 FpgGgT27EhiEcJqTUfgegPA9kJdFPrWJJ5iK1qNBLiF6hrDF4OqUoVIomkfip0pVcRKV o5RNK0VV2lRJja3lFfiubUUqSFHEwiieBZ8CH9RXQOnQiK08cddmoxzv+3uv+fYfm60u XTg9YP25EkvSOJT1xarD/GB6aqX4GoAJc5YhTQkGuiMZB5nvujkgJdRINCZURV7/TOIY iaMeQ5SiqWWN2I2DJcMs/5qVpT1m5tvT3t5zhG/2jutA9g6P+wKZGyl5545uf7FcimAp M9PQ== X-Gm-Message-State: ABy/qLbz3NEZiq/8mFUWH70gBwxGeqY9yDd91eL+UZbeHOgb5zQlsImF GZvu2b8kR9po3TPwV2WP/cI= X-Google-Smtp-Source: APBJJlFNy2I+CyUS1aYwsfduD+huycNYisjcTh0gfReTP66i0QToQ0GoFFbAoTHElkVHlGozDwAk+A== X-Received: by 2002:a05:6402:3507:b0:51e:5aac:6bad with SMTP id b7-20020a056402350700b0051e5aac6badmr2878516edd.11.1690882681889; Tue, 01 Aug 2023 02:38:01 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:14c6:b0:522:3ad4:9c9e with SMTP id f6-20020a05640214c600b005223ad49c9els286036edx.0.-pod-prod-00-eu; Tue, 01 Aug 2023 02:38:00 -0700 (PDT) X-Received: by 2002:a05:6402:520e:b0:51d:cf7b:c9f0 with SMTP id s14-20020a056402520e00b0051dcf7bc9f0mr2820693edd.12.1690882679989; Tue, 01 Aug 2023 02:37:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690882679; cv=none; d=google.com; s=arc-20160816; b=YFKlkDbr7G/UBCBAFvB7ad6FZPfQghArp4oBYj2eVP70wC/mIb/xwSYPszjdnYRqSv gFtOEQhRrST9EYz/TLFM5VsNGFhN7v81E0Bbi57wry7NHymoV9DWTxZLDJ1D+6/Jl/HG ctNKhHWbycOdgzbPZ2PWEm9YEaNr8cXCqEatBK5X47GNDEOWfhF94dZLzEHF7cauhNAS 4Wr9uATSM8i1Uz1sxuFt4qk2t6g5ThZQPYPe8h3MKDiM8YmNjFXhJvFQ4MtSMvXNeFYh m/9QmKBKdBbrVKxqhImpLFjfCAiJYPRCnM4qGxLf1n0XFzHn72Va1D2F7UsOoID59GeZ 6ypw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=OHnvd7j+7hL1A+tpY17J65lND4UpBuOixZp+gy5DwBo=; fh=Y8xmVxKsXeOwj5VJYPzj0QBUOe1XiBsygT7R+JGa07w=; b=UVdr9cStoDrDAN69fOlafFg9bi/+qyrRJah7HhGhda5sIQ2oS0zHFh3oI02oLfLzV3 NPs6U7ePJn/opGaeDN/aqjwdDJl+lJnnZ8+ujpy3uThkbngSGzal8BDThT6UQI+7Mzhq yIq9qc8UojgkPMAihiEfwvLBRvNqDAOyNP5cbCEVa+c1f6cE/uXF4Ciij9aXcjpvTbaE RdbHjp8gmApBdO5434USiol+2KpWkOTDVS8xLTRZONZf/+pX8cfaL0kmzXrVcqL4j4TE pxnuVRG3dfl6Fr5rxh24DwYKpxPIHqzELn+jDglPaTn+W5zLkXTnRDn8ZTss1ic9XHme oUBQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=SMXuLTsD; spf=pass (google.com: domain of fm-72506-20230801093759cce4b245ab7fc6711a-abnx9y@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-72506-20230801093759cce4b245ab7fc6711a-ABNX9y@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net. [185.136.65.226]) by gmr-mx.google.com with ESMTPS id ez2-20020a056402450200b0052174fd486fsi769853edb.1.2023.08.01.02.37.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 Aug 2023 02:37:59 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-20230801093759cce4b245ab7fc6711a-abnx9y@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) client-ip=185.136.65.226; Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 20230801093759cce4b245ab7fc6711a for ; Tue, 01 Aug 2023 11:37:59 +0200 X-Patchwork-Original-From: "'Felix Moessbauer' via isar-users" From: "MOESSBAUER, Felix" To: isar-users@googlegroups.com Cc: florian.bezdeka@siemens.com, jan.kiszka@siemens.com, Felix Moessbauer Subject: [PATCH 3/4] u-boot-script: add support to use builtin dt Date: Tue, 1 Aug 2023 09:37:05 +0000 Message-Id: <20230801093706.1347928-4-felix.moessbauer@siemens.com> In-Reply-To: <20230801093706.1347928-1-felix.moessbauer@siemens.com> References: <20230801093706.1347928-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-72506:519-21489:flowmailer X-Original-Sender: felix.moessbauer@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=SMXuLTsD; spf=pass (google.com: domain of fm-72506-20230801093759cce4b245ab7fc6711a-abnx9y@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-72506-20230801093759cce4b245ab7fc6711a-ABNX9y@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Felix Moessbauer Reply-To: Felix Moessbauer 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-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= This patch adds support to use the u-boot builtin device tree instead of the one from the rootfs / linux. This enables the use of dt overlays even if the corresponding device tree in the kernel is not compiled with symbol support (uboot builtin DTBs always have symbol information). To use the builtin dt, add the WKS sourceparam "builtin_dt=yes" to the rootfs-u-boot sourcer. Co-developed-by: Florian Bezdeka Signed-off-by: Felix Moessbauer --- .../u-boot-script/files/u-boot-script | 3 +++ .../u-boot-script/files/update-u-boot-script | 16 ++++++++++++---- .../lib/wic/plugins/source/rootfs-u-boot.py | 3 +++ 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/meta/recipes-bsp/u-boot-script/files/u-boot-script b/meta/recipes-bsp/u-boot-script/files/u-boot-script index d053d721..a11212c0 100644 --- a/meta/recipes-bsp/u-boot-script/files/u-boot-script +++ b/meta/recipes-bsp/u-boot-script/files/u-boot-script @@ -15,3 +15,6 @@ NO_INITRD="" # U-boot commands to prepend to boot script SCRIPT_PREPEND="" + +# use u-boot builtin device tree +BUILTIN_DT="no" diff --git a/meta/recipes-bsp/u-boot-script/files/update-u-boot-script b/meta/recipes-bsp/u-boot-script/files/update-u-boot-script index 14a81563..f4e36ed2 100755 --- a/meta/recipes-bsp/u-boot-script/files/update-u-boot-script +++ b/meta/recipes-bsp/u-boot-script/files/update-u-boot-script @@ -33,10 +33,18 @@ echo "${SCRIPT_PREPEND}" >> ${BOOT_CMD} echo "setenv bootargs ${KERNEL_ARGS}" >> ${BOOT_CMD} -echo "echo Loading /usr/lib/linux-image-${KERNEL_VERSION}/\${fdtfile}..." \ - >> ${BOOT_CMD} -echo "load \${devtype} \${devnum}:${ROOT_PARTITION} \${fdt_addr_r}" \ - "/usr/lib/linux-image-${KERNEL_VERSION}/\${fdtfile}" >> ${BOOT_CMD} +if [ "${BUILTIN_DT}" = "yes" ]; then + echo "echo Loading builtin device tree..." \ + >> ${BOOT_CMD} + echo "fdt addr \${fdtcontroladdr}" >> ${BOOT_CMD} + echo "fdt move \${fdtcontroladdr} \${fdt_addr_r}" >> ${BOOT_CMD} +else + echo "echo Loading /usr/lib/linux-image-${KERNEL_VERSION}/\${fdtfile}..." \ + >> ${BOOT_CMD} + echo "load \${devtype} \${devnum}:${ROOT_PARTITION} \${fdt_addr_r}" \ + "/usr/lib/linux-image-${KERNEL_VERSION}/\${fdtfile}" >> ${BOOT_CMD} +fi + echo "echo Loading /boot/${KERNEL_FILE}-${KERNEL_VERSION}..." >> ${BOOT_CMD} echo "load \${devtype} \${devnum}:\${distro_bootpart} \${kernel_addr_r}" \ "/boot/${KERNEL_FILE}-${KERNEL_VERSION}" >> ${BOOT_CMD} diff --git a/meta/scripts/lib/wic/plugins/source/rootfs-u-boot.py b/meta/scripts/lib/wic/plugins/source/rootfs-u-boot.py index 0b4f9eec..93600dc2 100644 --- a/meta/scripts/lib/wic/plugins/source/rootfs-u-boot.py +++ b/meta/scripts/lib/wic/plugins/source/rootfs-u-boot.py @@ -10,6 +10,7 @@ # Recognized sourceparams: # - no_initrd=yes (disables initrd loading) # - overlays=file.dtbo ... (overlay files) +# - builtin_dt=no (use DT from uboot instead of kernel) # - script_prepend=cmd;... (prepends U-Boot command) import glob @@ -82,6 +83,8 @@ class RootfsUBootPlugin(RootfsPlugin): cfg.write('NO_INITRD="%s"\n' % no_initrd) overlays = source_params.get('overlays') or '' cfg.write('OVERLAYS="%s"\n' % overlays) + builtin_dt = source_params.get('builtin_dt') or '' + cfg.write('BUILTIN_DT="%s"\n' % builtin_dt) script_prepend = source_params.get('script_prepend') or '' # remove escapes from $\{var\} that are needed to avoid expansion by wic script_prepend = re.sub(r'\$\\{([^\\]+)\\}', r'${\1}', script_prepend) From patchwork Tue Aug 1 09:37:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "MOESSBAUER, Felix" X-Patchwork-Id: 3002 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 01 Aug 2023 11:38:12 +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 3719cBN1021102 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 1 Aug 2023 11:38:11 +0200 Received: by mail-lj1-f187.google.com with SMTP id 38308e7fff4ca-2b9bb2d0b47sf49360621fa.2 for ; Tue, 01 Aug 2023 02:38:11 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1690882686; cv=pass; d=google.com; s=arc-20160816; b=NYq4zAXGt3WRpY7Pq1Be/jmTK/x/dvJOW497xaCFtjdzrbebSpqCH+ejk0h0XiUg5s 41hoYzj6VqnGZfpzKyD/RnrDpHaMPzQsKU4HhtaHeVBFhjX8/Xmhi1hpu4zDt/fQLFFp OeQsGY5Vp6YZDUZCuOsXxZuPPf1dQ8/iC6MEqEMP0pzcux7c9bATuvdl1JC2JFg+LRaY AENuMTtjZjzLVgC3brhhDIvgidLt9j5ZmffHST3vdQLTByds6uMILT2uodJeLpIC1ONd rJw8+/8kyj4e6pXRNer7J8W1f0mnZP8AomblpQaQYfBSxj2ympH8LLnwKqlF5x5mLHQI QAVg== 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:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=qcklQIV29D4Z1Dy21fHSDuEmAzbrWQGY8geS4AupU/4=; fh=FK95eqZp7lRnKesB3RkINaKKaryhiXkUiWtU9nFsGzo=; b=tqJwOkqDoZsPNR+8fPxDPNFSUTFzBsRp/qq8Dw+cY5VGMUhhbtMjQKxQvW/pivGVS4 JBHCc2BnuHC0b3l6os+KuMzgdGi5IBsG5jYiRjebBHLn2Sc/HrqoOTvBoqCiBWA0vkx6 W5h3zHkCZczgD4XU9Cf8rXpXjZN19UW2Ktp8xHxiHd8aJhpx9bpPabnNGqJwLwRhc2Fl XAF2UG2VsRhUrHJnOxtWecXiwmRpaNMJX65ulbGBy1ZE3j/VdMAV85eM0kdcy4Ez9FFa xa8zwU7E8uSYxu+527sYWYgwXsiKhEgwu3clcnXZyIe6+lsp9u/tnDcJL3YJRm+cL7bi pJ8g== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=ZrcjwroV; spf=pass (google.com: domain of fm-72506-202308010938028d8cf8f5e15cdc6532-mxic_q@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-72506-202308010938028d8cf8f5e15cdc6532-mXic_q@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20221208; t=1690882686; x=1691487486; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=qcklQIV29D4Z1Dy21fHSDuEmAzbrWQGY8geS4AupU/4=; b=ZMzYLJz/8fCrWjng0GaurGuJSbqer0+FLiVAC6zqFGy3x23wWwl2CQDnB8xcdtnfkL TBTsytDMC7PyVPrrR5CpDQ6xL+6jYD+36oqgP9c5qW7LWe5ZZZYaXECzpvETFIJwxK1G Qf7r562GU2A2Z2ef0v/Tcl/heQZNRtjuPwc3O76j8GHRYSxShdws61CQG08pHe+XGPQD Mox3wxeioZJ/Htc3JeMsnyDbCRHz+aLs2+jRWFbFXtaAkv0zpE9z5sxiXkZpqFCvTBxm Z0PMSBdgaQW+lAF88VUj4Guyf/5lP0WjvLn2VvVqIBJ0bOvbxTt+J2aPcqjxSsQsWq0h 3oZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690882686; x=1691487486; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=qcklQIV29D4Z1Dy21fHSDuEmAzbrWQGY8geS4AupU/4=; b=dmBWMwCsBIjS9Cq+pL5lPcounZDErVg0YAI0jsz4OucHkxLU4RWAk40TeRRhVSrni2 D+Vrd4fLktLQ0iMR/9sErMxBeDuehlPufCKPpfgttUXvtci3T/y19ov4EF/D5/9hAkdc tb2WW+CYZD7l7asl1uJ1lncjp12va2XtP72tbkhtB68EwDknpa0bXHUiPha0cdKTgStR juRqYykbRb0eB4J7mBBxoXfVQvO5Q/b98tLol6wev2ODJJaq9Vco09YnHl9h+nAOwgWV 85240If9t4+65okmLi2vZnZKgpSVxp90O8FS+09VjdyOef6mdVPI42DyU6lyx8M///v7 KVHA== X-Gm-Message-State: ABy/qLbnB9ZRulQtieQxzGuc7seypBKa6H2IJpzU27eS+iIRZTKf/B5N xcfeHPj213FpvpDtNPdGUjY= X-Google-Smtp-Source: APBJJlEI/aoVlJuC6vQuuooORuvd52lZXH6WEq75b3WY6a3Bgc/OEqRzrEo0ARa7lAfc47lgWMWA3A== X-Received: by 2002:a2e:968e:0:b0:2b9:ee3e:240b with SMTP id q14-20020a2e968e000000b002b9ee3e240bmr2008200lji.41.1690882685537; Tue, 01 Aug 2023 02:38:05 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:bba6:0:b0:2b9:35cd:6782 with SMTP id y38-20020a2ebba6000000b002b935cd6782ls1343322lje.0.-pod-prod-05-eu; Tue, 01 Aug 2023 02:38:03 -0700 (PDT) X-Received: by 2002:a2e:840b:0:b0:2b5:81bc:43a8 with SMTP id z11-20020a2e840b000000b002b581bc43a8mr1724241ljg.0.1690882683582; Tue, 01 Aug 2023 02:38:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690882683; cv=none; d=google.com; s=arc-20160816; b=AvUw53ks+VT6+y9xDWzmCiY37z9WtGAcupFZE3q+/k0F8dTrLAmHQo6VJXKmDi1ZNq qTet+8xDignEUvYpYVcQJ9AK4xNZCgcDAHov+FN9MesqfWSzL0qUBui8d+M6A6+olIoJ HTfGrKZ8sQlWT8NgZsQ9HuTIr5tcyLNocAPoP/q1D6f29eUoNBLGSTHC6fr3Q+vQGPn9 DdyPcqYYkHLsCMXmqxab/iA0bUJlSXEeFNpr9UGXWbGTUV2RruXiIQW9CJOozzIic1wq SLlVP/XHXjx0n/BIhgujMVpS0Jt82L4PH5oonIM608zoBNMi/PvXAt6IE5cKYzd+I1XJ PtLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=iGcZVZ1dvDllWLSyu5gZDV9IjMLojSQfBdEPUithaeQ=; fh=Y8xmVxKsXeOwj5VJYPzj0QBUOe1XiBsygT7R+JGa07w=; b=T9jKxFulmIi9zrVFlqgbuafhQd8reeb+Nz4WQAj4iEGbzi82EsSjBIjI2MKGbQNp6o QU4egqBKpkTNi16jmhHXITpvmepOLdRp/rEFuPMetVDsVSIg20eK7L5+NrEWFo86Fp7A nussevveroRSbkv9JmNB+fesPHODlHHJM6CnoU4YayD3Ldtxj3lMwQJ/HLMTg85QWBMt 2ouqAuOQ5r4CkGTWuK/c7mw2JNNxessL0Hj1xSOVrwC0Dy30EtBUlzS7EwSUYiIJRpyp hxOnWmcLFzTglKVR25VGbMooXpKHn0ol2hw+qkxSOdigH7oGEDHmGfL4MnYaGg248gV5 QZGA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=ZrcjwroV; spf=pass (google.com: domain of fm-72506-202308010938028d8cf8f5e15cdc6532-mxic_q@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-72506-202308010938028d8cf8f5e15cdc6532-mXic_q@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-227.siemens.flowmailer.net (mta-64-227.siemens.flowmailer.net. [185.136.64.227]) by gmr-mx.google.com with ESMTPS id a14-20020a2e980e000000b002b945894b21si833965ljj.6.2023.08.01.02.38.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 Aug 2023 02:38:03 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-202308010938028d8cf8f5e15cdc6532-mxic_q@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) client-ip=185.136.64.227; Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 202308010938028d8cf8f5e15cdc6532 for ; Tue, 01 Aug 2023 11:38:02 +0200 X-Patchwork-Original-From: "'Felix Moessbauer' via isar-users" From: "MOESSBAUER, Felix" To: isar-users@googlegroups.com Cc: florian.bezdeka@siemens.com, jan.kiszka@siemens.com, Felix Moessbauer Subject: [PATCH 4/4] use builtin DT for nanopi-neo target Date: Tue, 1 Aug 2023 09:37:06 +0000 Message-Id: <20230801093706.1347928-5-felix.moessbauer@siemens.com> In-Reply-To: <20230801093706.1347928-1-felix.moessbauer@siemens.com> References: <20230801093706.1347928-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-72506:519-21489:flowmailer X-Original-Sender: felix.moessbauer@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=ZrcjwroV; spf=pass (google.com: domain of fm-72506-202308010938028d8cf8f5e15cdc6532-mxic_q@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-72506-202308010938028d8cf8f5e15cdc6532-mXic_q@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Felix Moessbauer Reply-To: Felix Moessbauer 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-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= The upstream kernel still misses the __symbol__ information in the device tree. By that, overlays cannot be applied (DT was compiled without -@). However, all u-boot internal device trees are compiled with symbol information. By that, just use the one from u-boot. Note, that the mmclbk entry changed in this device tree (mmclbk2 instead of mmclbk0). This change is reflected in the wks file. An alternative option would be to use --use-uuid. Signed-off-by: Felix Moessbauer --- meta-isar/scripts/lib/wic/canned-wks/nanopi-neo.wks.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-isar/scripts/lib/wic/canned-wks/nanopi-neo.wks.in b/meta-isar/scripts/lib/wic/canned-wks/nanopi-neo.wks.in index de1c92c4..af5b6f08 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/nanopi-neo.wks.in +++ b/meta-isar/scripts/lib/wic/canned-wks/nanopi-neo.wks.in @@ -1,10 +1,10 @@ # -# Copyright (c) Siemens AG, 2018 +# Copyright (c) Siemens AG, 2018-2023 # # SPDX-License-Identifier: MIT part u-boot --source rawcopy --sourceparams "file=/usr/lib/u-boot/nanopi_neo/u-boot-sunxi-with-spl.bin" --no-table --align 8 -part / --source rootfs-u-boot --ondisk mmcblk0 --fstype ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --active +part / --source rootfs-u-boot --ondisk mmcblk2 --fstype ext4 --mkfs-extraopts "-T default" --sourceparams "builtin_dt=yes" --label platform --align 1024 --active bootloader --append "rw rootwait"