From patchwork Thu Sep 14 07:42:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "MOESSBAUER, Felix" X-Patchwork-Id: 3050 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 14 Sep 2023 09:43:02 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f63.google.com (mail-wm1-f63.google.com [209.85.128.63]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 38E7h1jo018643 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 14 Sep 2023 09:43:01 +0200 Received: by mail-wm1-f63.google.com with SMTP id 5b1f17b1804b1-4011fa32e99sf5233495e9.0 for ; Thu, 14 Sep 2023 00:43:01 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1694677376; cv=pass; d=google.com; s=arc-20160816; b=Fen2qmNyRTovwUEx7vVvknxJ973Rrp5skrkcFM0VfS9b2WhqAGOSmurpXH+Wb1X2AA HUgdZ7GbIZ1Q7uCSbreUI75qYH/jlTswQ2kV+3ik6WLTApcDoxuzl2iTxpMDT5sLZnQX Ve1Nsi4vC6MJOMNTWTTHaokhr/iSHZAQA5ZrdvIVWR1O2ATG5Xn6Qbk1jcI38RZvKvtt rfdijBOKfiNb0QDaFZ0xSkvlsfN/Sm0+bgiLQwtCyKKDiujIIQdMsaV+KxHUMDM4EYrP LZGWX8XeQqNryzig7AhBHWEcBPlcBBumrWWgbEd7LKMe1kCHdPDY8jcicLCVq+TXh08Z ZkKw== 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=x/btJMUxg2v7U9we1yUDm2XjqtiGqyncYAcJ70uve7c=; fh=hVYktHjFK3UeoGDZlUQU1wEqevMtRi4UYh8CRbP42CI=; b=km9iWO6jbOXS9/jIm/aCsZavYTL0shB8xZCOxQcFAFmRItzVYWKRoe2t9g6ic1nmzu LXGb9+Iv4euvQzg/2u3r1xj4Mk4GpRhEOd9KzN6HUf3CFpSBFUHBKA57mFKcgTLNI8FV EEbn0FOf2MwtKRh49QGL+/xDhA5yHfUL+KWBZP2Z3WXtG1hyRLKEcAzqWM5DwroMV7ji kG/KJCwSZ1LY/Hiya5/gHdAUhTNbb36/qEDf3FFG/s/lZAyWH8Cgq4qzs52XXYvbD9mg Z3kX/lHiWBHovMcGn01ilw6pJj48NY7EjXWzHrOFHV1+MBxRrr9fOKM0UHzrpZgpCfeJ nMxQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=LSQS4cyf; spf=pass (google.com: domain of fm-72506-20230914074253af7fdf47e6b1c6eda0-ubedxa@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-72506-20230914074253af7fdf47e6b1c6eda0-UBEdxa@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=1694677376; x=1695282176; 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=x/btJMUxg2v7U9we1yUDm2XjqtiGqyncYAcJ70uve7c=; b=MHEdUfjX7SUK+Iufv6K/yRNp177TACsvdtjot0MIkHz3g/dzaI0NtMH1lCFJQSAl+Z oE83cd9KpF5ce0UkwcS/0nysP+fqEIfFXKYxWTQMberjP36dtFj9STU43eK4/wnu7cRY +jMEPb75DbF8tnenpkM8sbrWvbmmdFApf5EHSqpc2a6c623kf60NcwLSKiHXKkhNyobY +sEm7rGb07NOb+vWHf0usFGCHShGtL2kGGFA/mwgYq9uLh3K2vm0f5iJmo7ra/Z57iVW fcBeupFNNB1bjWOFy++E1JDP32KqW23qDzv68kJKOU6qa4ZZEG+4SNoJzcA3gZhKdGCS uw9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694677376; x=1695282176; 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=x/btJMUxg2v7U9we1yUDm2XjqtiGqyncYAcJ70uve7c=; b=sz1hUZfdmsAMEeyvg85ZZ4jaQh6g2vGglvjy3LcGRhHtxdiUWGKVUxXl1k2xprkPT8 HuqMa7ThLFW2tcQ94MssFlXT6+tmUNHAwU1+sIeFLVrbMl7v4EjTGOFMhCK/S6/HXRgp jgTAy/O3BGZnzeTMODCEZaSYLgvdg4Lu6PLWkvvjRXFERvhL6KACGvitFH0Mj05ZGFG1 35PDCKKZhJFEYBYelsGOmNqRvZnG8uWsiMn3r9RVOc1G4wUEk0HjTKsHI4shZ/zr+P0A lqykwhAeOA/YfEd/yv/lTPNHuj3LPXYHqhMSuYGDeNgZJUXJszgBA1wdkVUMjJ1Gy5Fe Parg== X-Gm-Message-State: AOJu0YxH6ZMfIcmOecht5vRSjftK4lq0Y9Pj1zVzcNDc79U1kIaQVY1K 7zbr84vH6crOnH1r3ALSMGQ= X-Google-Smtp-Source: AGHT+IE2Dqxccdnhc3A5RS5GaPg5uqzY776U51Bb7TMkhEjIAAciUdTN4MrYXwk8YPPfoc1NIDB74A== X-Received: by 2002:a1c:7404:0:b0:401:db0b:48dc with SMTP id p4-20020a1c7404000000b00401db0b48dcmr4147308wmc.37.1694677375461; Thu, 14 Sep 2023 00:42:55 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:3514:b0:400:87b3:94b9 with SMTP id h20-20020a05600c351400b0040087b394b9ls252967wmq.2.-pod-prod-04-eu; Thu, 14 Sep 2023 00:42:53 -0700 (PDT) X-Received: by 2002:a7b:c8c2:0:b0:401:6800:7032 with SMTP id f2-20020a7bc8c2000000b0040168007032mr3944549wml.18.1694677373661; Thu, 14 Sep 2023 00:42:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694677373; cv=none; d=google.com; s=arc-20160816; b=ZqAfPmTkC0be16VHLp+ZkeHJXjrK9cQbFfWhsTZ6gIQl7a7XDuW0k/mp5SKS0LN3nw k453EvW0E6y/VTVkxULCeWz6xmTT7zxnGe7ZAxWFhzoOD3AFDJzKCvR2ihgBS+qZG7GG e/DsWRHPef1AhSTs9JNUVBxJCcxyVIx2cWSUE0UqLKsP0Kz1kPTtBjLUb+2zKDU3NGRd MOQtA+4ZYn9KP3eKidC7RJkD3Fptz434bawk+NiX8TBGvFCbxx3Z3jMQrQ0aQwN3pJdR RB/AvTpUpuZD02GeQrMifoXITTAaMl6wn3xTBfQ4aoThJ5LOLQ1yuQX8pv15p46MxL/B nraQ== 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=Bi5Mvw5j8nb8uDthJ499CiWqZ+nVJTbZDiByfNaV/gc=; fh=hVYktHjFK3UeoGDZlUQU1wEqevMtRi4UYh8CRbP42CI=; b=dmnyQwG4qnc8AFpVSSXKlpF6ujgSwY4nFz05gLZr0ccQ8D74K0ZfrefzP5eFd+4cXt noYMsIVQlNSgc+TtkbvfUW+Myq5DGUxTeHZkFbRgKhw9RJiYBUd2zx1YVhiYp/yfdRZc HCzXd5nvUSnKq6mMPA05/91mshEcsCYVzd2CmR7mqReqKRaBC3p92u/HSsvIaWwTJmV+ +anGhizgai9nTz2IOAc8eK8s4wvpJCjHqYI2cKDt3388YTttA7VmrozTb+8twfpLp46U U91EcIdemrSux7pYmjohs4ML9QndT+6/5Klb8SHSwsJuUV9VbEtCr29NV1MBGVuIra5p XToA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=LSQS4cyf; spf=pass (google.com: domain of fm-72506-20230914074253af7fdf47e6b1c6eda0-ubedxa@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-72506-20230914074253af7fdf47e6b1c6eda0-UBEdxa@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 az19-20020a05600c601300b003fefb9e1a6asi81229wmb.0.2023.09.14.00.42.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Sep 2023 00:42:53 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-20230914074253af7fdf47e6b1c6eda0-ubedxa@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 20230914074253af7fdf47e6b1c6eda0 for ; Thu, 14 Sep 2023 09:42:53 +0200 X-Patchwork-Original-From: "'Felix Moessbauer' via isar-users" From: "MOESSBAUER, Felix" To: isar-users@googlegroups.com Cc: daniel.bovensiepen@siemens.com, jan.kiszka@siemens.com, cedric.hombourger@siemens.com, Felix Moessbauer Subject: [PATCH 2/2] add EFI boot version of nanopi-neo target Date: Thu, 14 Sep 2023 07:42:26 +0000 Message-Id: <20230914074226.3018960-3-felix.moessbauer@siemens.com> In-Reply-To: <20230914074226.3018960-1-felix.moessbauer@siemens.com> References: <20230914074226.3018960-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=LSQS4cyf; spf=pass (google.com: domain of fm-72506-20230914074253af7fdf47e6b1c6eda0-ubedxa@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-72506-20230914074253af7fdf47e6b1c6eda0-UBEdxa@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 the nanopi-neo-efi machine that implements the EFI boot chain on the nanopi-neo board. This is only supported from debian bookworm on, as a more recent u-boot version is required (2021.01 which is shipped in bullseye does not work). The EFI boot pattern later can be used to support mechanisms like swupdate. Signed-off-by: Felix Moessbauer --- meta-isar/conf/machine/nanopi-neo-efi.conf | 13 +++++++++++++ .../conf/multiconfig/nanopi-neo-efi-bookworm.conf | 5 +++++ .../lib/wic/canned-wks/nanopi-neo-efi.wks.in | 15 +++++++++++++++ testsuite/citest.py | 1 + 4 files changed, 34 insertions(+) create mode 100644 meta-isar/conf/machine/nanopi-neo-efi.conf create mode 100644 meta-isar/conf/multiconfig/nanopi-neo-efi-bookworm.conf create mode 100644 meta-isar/scripts/lib/wic/canned-wks/nanopi-neo-efi.wks.in diff --git a/meta-isar/conf/machine/nanopi-neo-efi.conf b/meta-isar/conf/machine/nanopi-neo-efi.conf new file mode 100644 index 00000000..1878c3cc --- /dev/null +++ b/meta-isar/conf/machine/nanopi-neo-efi.conf @@ -0,0 +1,13 @@ +# This software is a part of ISAR. +# Copyright (c) Siemens AG, 2023 +# +# SPDX-License-Identifier: MIT + +DISTRO_ARCH ?= "armhf" + +KERNEL_NAME ?= "armmp" + +IMAGE_FSTYPES ?= "wic" +WKS_FILE ?= "nanopi-neo-efi.wks.in" + +IMAGER_INSTALL += "u-boot-sunxi ${SYSTEMD_BOOTLOADER_INSTALL}" diff --git a/meta-isar/conf/multiconfig/nanopi-neo-efi-bookworm.conf b/meta-isar/conf/multiconfig/nanopi-neo-efi-bookworm.conf new file mode 100644 index 00000000..02daf94f --- /dev/null +++ b/meta-isar/conf/multiconfig/nanopi-neo-efi-bookworm.conf @@ -0,0 +1,5 @@ +# This software is a part of ISAR. +# Copyright (C) 2023 Siemens AG + +MACHINE ?= "nanopi-neo-efi" +DISTRO ?= "debian-bookworm" diff --git a/meta-isar/scripts/lib/wic/canned-wks/nanopi-neo-efi.wks.in b/meta-isar/scripts/lib/wic/canned-wks/nanopi-neo-efi.wks.in new file mode 100644 index 00000000..7171a23e --- /dev/null +++ b/meta-isar/scripts/lib/wic/canned-wks/nanopi-neo-efi.wks.in @@ -0,0 +1,15 @@ +# +# Copyright (c) Siemens AG, 2023 +# +# SPDX-License-Identifier: MIT + +# Newer SoCs (tested on H2+, A64, H5, H6) can also load the SPL from sector 256 (128KB) +# of an SD card or eMMC, if no valid eGON/TOC0 signature is found at 8KB. This is required +# to not overlap with the GPT header. +# https://linux-sunxi.org/Bootable_SD_card#SD_Card_Layout +part u-boot --source rawcopy --sourceparams "file=/usr/lib/u-boot/nanopi_neo/u-boot-sunxi-with-spl.bin" --no-table --align 128 + +part /boot --use-uuid --source bootimg-efi-isar --sourceparams="loader=systemd-boot" --label efi --part-type EF00 --align 1024 +part / --use-uuid --source rootfs --fstype=ext4 --mkfs-extraopts "-T default" --label platform --active --align 1024 --exclude-path boot + +bootloader --ptable gpt --timeout 0 --append "rootwait" diff --git a/testsuite/citest.py b/testsuite/citest.py index 73dddaf3..5e8299d6 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -134,6 +134,7 @@ class CrossTest(CIBaseTest): 'mc:qemuarm-bookworm:isar-image-ci', 'mc:qemuarm64-bookworm:isar-image-ci', 'mc:qemuarm64-focal:isar-image-base', + 'mc:nanopi-neo-efi-bookworm:isar-image-base', ] self.init()