From patchwork Mon Sep 4 05:51:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "MOESSBAUER, Felix" X-Patchwork-Id: 3042 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 04 Sep 2023 07:52:16 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f58.google.com (mail-lf1-f58.google.com [209.85.167.58]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 3845qF84003715 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 4 Sep 2023 07:52:15 +0200 Received: by mail-lf1-f58.google.com with SMTP id 2adb3069b0e04-5009121067csf984843e87.2 for ; Sun, 03 Sep 2023 22:52:15 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1693806730; cv=pass; d=google.com; s=arc-20160816; b=Kb70PUPmWzfxd/diNdWDDC0O+ewIFbzz5ltb82UOIlhBHaqdV75qJnGBBRUn7UrCEO deRYh468E8ciJ0sjrsXmamw0oPTgfZxkPr5+XNwNbq9A1x96nBI/nTbrsHZ8/w5Kn8GG CaEcHV+mBjNdrgQYQP53n/PrF6XTmFZMg80bB2ZO0PTXSyZa1IMEh6rcakNTUmvrKlls w3gTmhXW7fcc7TqfPKCujZIZscXWZflmQllFMy5qjr4O41b+gB0IM+4NXsBXSgHEin6q aU+ZdxFOIZB2pW0qsD1yf5R3zrUQlXRHIDnCEv6Sm4Eyyw1Q5qhJS2lqSQ4e7iHl5bA8 n0IQ== 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=Yk9RdX4LtWaPM6WzxYI1lVsFp6MyrE05E3IAdJwqVLk=; fh=zinKhdw3Zi/nzo2AZM2EHC0ZYI8lGELCkTmdpv4Fq64=; b=MAz5dbP02APlRSfLI72GeiOkp+DHxm1J0cgTkaMRGRzn292QzKUOe/U84CWnKVa3eC 8qZWZz+jDnCj2tVOYS9YJlyTkkBGar7OC2S72GjNwoYjwSUfYDC5ELAEsqvlcQv3sphy ecEoaomQNFZwHUQAHT00ym/ySg4P0eS5zsMOQZXVqiclRFvqeh3uoN5xjbIueVRyFQGX XGFGpRreY+0CKdPXDNJ/SRzNjonvpzlZrd+slx3onOBUJuebu6C196UWMEe05WuBI71F tDPgH5lGsXVZAVnGo2KV1sRvFYh9rc4DGJzGdSKPcfMtnAV0HHkfdG+7rtaxW8ZR/n2n yh7Q== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=ZwcrPwWm; spf=pass (google.com: domain of fm-72506-20230904055206ea0fe395d0115b3b71-ojioei@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-72506-20230904055206ea0fe395d0115b3b71-ojIoEi@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=20230601; t=1693806730; x=1694411530; darn=isar-build.org; 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=Yk9RdX4LtWaPM6WzxYI1lVsFp6MyrE05E3IAdJwqVLk=; b=YucktAlVUEtgsht2DsrLXR5Gg8zqG5clL5AiQlYh/eZNpWnBmdHtvmdwB3JdLrVILI NIQ4eQDU0QWXuzgaeDeEM34SDg3/BckNbVzekBFh4KigDxnmatgskgbaaWbtlB70Gof8 W66CYkTyOs0EW5UhefJSyMtyCXMedeaoGCx2ahJyBlrVL7n8vUJJBPFk75rh+R9gFUa2 YsL5MURLB5DiI4ZTulHz0ge2vT6m/gyPM1oeVVfwGJr7O8wcjQeuA07tOes/gX6d9cA6 vDPdJrCyQ7uEfDbOb6lRnsoalK09tU0z3F20n5k7h/22EwUHeWzfsfrBPq14c6EzWgFo m4rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693806730; x=1694411530; 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=Yk9RdX4LtWaPM6WzxYI1lVsFp6MyrE05E3IAdJwqVLk=; b=HfGaQZ6Z0SryaaIhDK2/o76HyHce5bua4dPR80+n1krfyD6I7R6eA2DY8c0vmbF+bt GcRvQzjXsNmcyyFDr2XZKOpTnItfXxjK39MMl3F58+cZ6RJOzs02xpD8i8wIZPHJeiNX zeVQzWUKj3MlGMJQosiVYhIJvMjXxOA1jBAHmHO5z1G1kB+cZJzMulbr2UVe0WoXto6+ BI7v4atM5jyKr8NXUtxx6S9TBzPpZ4Fda0Dn68AW/3fxxc/l69biPI9ZOpVueX/u6aVg pwcOc59diMqNSPcZmZzud4u9BFX37wZHiPUe4nWr2IXwqv+pDTwfr6kWtsRHOJLpDrRr AphA== X-Gm-Message-State: AOJu0YxZf1CRHtLt6GOB6vm6BpywV5t219EHSk8/1ceNhHcA+3CH3pn7 DCLB8+fw3ZELla8HnF64gPs= X-Google-Smtp-Source: AGHT+IGe23BCdm577NNn4PKUOqFD97GYTvPTfMtzJzmazfq3Zd75anvpNQAkFbtBwQhoLbcW/S7maw== X-Received: by 2002:a05:6512:3b82:b0:500:7e70:ddf5 with SMTP id g2-20020a0565123b8200b005007e70ddf5mr7987009lfv.43.1693806729033; Sun, 03 Sep 2023 22:52:09 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:5115:b0:3fe:e6e4:c1c1 with SMTP id o21-20020a05600c511500b003fee6e4c1c1ls944339wms.2.-pod-prod-06-eu; Sun, 03 Sep 2023 22:52:07 -0700 (PDT) X-Received: by 2002:a7b:c3d8:0:b0:3fb:c9f4:150e with SMTP id t24-20020a7bc3d8000000b003fbc9f4150emr6167413wmj.14.1693806727285; Sun, 03 Sep 2023 22:52:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693806727; cv=none; d=google.com; s=arc-20160816; b=iNJRVAUU6FGJGeuatTCTiz9AcFk6DwUX/br9kUQIXPyAdhmAF9iFlzaQLYmahYDcPW 3XThuUjWUaJZofUESVDmjL8+Abak6xZXG1cTWmRU7dEdxbPGKHZKW3cCCPRy6PwVLZqg o1p+ZNAADxs9VYfBsOo7i7KsJ4sN5eGf04WvpHy+JBZrF0jkPjsZ83ppnggCQei070S/ PIVR9eTH5rrDJe+FfiHduYiZMmquiDELFdSS99VnFcHodZGh2HunCyvnZRdsaOK8Tzua OtbRs6pQrzicZJ09q2hbcCOs604CDT+GC6oBZjcvzyHdvyQIH9qA1LWL5d5g52MQ1jJd +Big== 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=kUZAqb7ygLDUxNJvee8oKvTT+WqmfUGVew/cAsHltmM=; fh=zinKhdw3Zi/nzo2AZM2EHC0ZYI8lGELCkTmdpv4Fq64=; b=x2it6bClFO0hwQqVmz/BjNSapg0tONklA/jyVu2rl9U4F2fzKcF8FCr0sKMqTXc3nb erL2W+AD4aIAMqaDv4sh2TM+R17tJ8SdoV551PplU40d8HtBpDoR/3CaIV2MxUQ+uoG/ bmfsVA14DZJWFXIfWQXNItmJFhcK9EccurJRzISM9ehgia7AHnr3sz4nYzWflKJVYb0e zJV9V0cqJd2+cfBDewY2bRUMhqSECHV8vJB3f97T/8X1MmyCDb3HomK4+1nponpnVlOh EmW/V39JdG0K/6KbLOCI7Psh5VJTKfthUQ7Q3t5KVwuL5U6xPOUZxPatmyoocxYHSSgF m+fQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=ZwcrPwWm; spf=pass (google.com: domain of fm-72506-20230904055206ea0fe395d0115b3b71-ojioei@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-72506-20230904055206ea0fe395d0115b3b71-ojIoEi@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 r7-20020a05600c35c700b003fee787cc43si729954wmq.1.2023.09.03.22.52.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 Sep 2023 22:52:07 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-20230904055206ea0fe395d0115b3b71-ojioei@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 20230904055206ea0fe395d0115b3b71 for ; Mon, 04 Sep 2023 07:52:07 +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, daniel.bovensiepen@siemens.com, Felix Moessbauer Subject: [PATCH 2/3] u-boot-script: add support to use builtin dt Date: Mon, 4 Sep 2023 05:51:32 +0000 Message-Id: <20230904055133.1851073-3-felix.moessbauer@siemens.com> In-Reply-To: <20230904055133.1851073-1-felix.moessbauer@siemens.com> References: <20230904055133.1851073-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=ZwcrPwWm; spf=pass (google.com: domain of fm-72506-20230904055206ea0fe395d0115b3b71-ojioei@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-72506-20230904055206ea0fe395d0115b3b71-ojIoEi@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 (u-boot 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 1d9c6d45..2eb6097c 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)