From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7278583858725912576 X-Received: by 2002:a7b:c8d1:0:b0:401:bd2e:49fc with SMTP id f17-20020a7bc8d1000000b00401bd2e49fcmr3883038wml.24.1694677375522; 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-Google-Smtp-Source: AGHT+IFFHOX1jrMoc5OETaFyB6Ow1somlAUf9E1kxT8S43r5JZ4eSuUIMta8ZfeRTR3bg03K3UlS 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 Return-Path: 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; 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 Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 20230914074253af7fdf47e6b1c6eda0 for ; Thu, 14 Sep 2023 09:42:53 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=felix.moessbauer@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=Bi5Mvw5j8nb8uDthJ499CiWqZ+nVJTbZDiByfNaV/gc=; b=LSQS4cyfx8UOOElgPD05ydKT9hnMOpsAgQ2TSvA0G3C3BJZG4WVo557XfBG6wJO9/qq+9p E2S8EHKlNgnuCroOGtmi1KS+Ws+QAtEuFuyLL6W8pjSSpgyIMqI/dVaxeHVEB2WCIPzgVi3+ N64ItKvFqTefOttvtoe73X11BRakI=; From: Felix Moessbauer 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 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-72506:519-21489:flowmailer X-TUID: b01jc7oEic42 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() -- 2.34.1