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)