From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7278583858725912576 X-Received: by 2002:a7b:c8c4:0:b0:3fe:d1b9:7ea8 with SMTP id f4-20020a7bc8c4000000b003fed1b97ea8mr4278524wml.28.1695292962352; Thu, 21 Sep 2023 03:42:42 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:b95:b0:400:2531:251 with SMTP id fl21-20020a05600c0b9500b0040025310251ls405376wmb.1.-pod-prod-06-eu; Thu, 21 Sep 2023 03:42:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IERSlbFx6TF9Z/LqxYwinzrTGFswIJuax1ZZjWPNImsUoJx097OIvHfWWyyn2epINMS2sMK X-Received: by 2002:adf:fe4a:0:b0:31f:8e7c:6ebe with SMTP id m10-20020adffe4a000000b0031f8e7c6ebemr4568066wrs.5.1695292960399; Thu, 21 Sep 2023 03:42:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695292960; cv=none; d=google.com; s=arc-20160816; b=j/HOFz4dBTyoM6qwpnIvr7BAL1o9iF3OPZNu8YAV96ZyMGshNSYh32O0XLACrfpmi8 jbMAW8SeD4jNNo8kugizLBplcasQoixMKzVEi7M9+PNMyYvb95B+zi9tQGsrxBevCzqb W3X9soW5WmFGGIh3t+WmZ+U/MH9G+F7fnEf8e1QIUIqBs7jUHx1HVzFVv9Xcabv94T2/ Y2eNwzYZZ9Tlpd22yldRrSvsfj7VyJZElf+l7nbjWBpPyEwJNeuzp5V8VqMpYdD03SmV gVvcboO3j7d61iT1PE8F4fHCsGcC/oyuEJuimMXuv8lgvJOp8Y3OGZmIZY2LO0c6w+IJ ek2A== 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=5PFvBxh7uddescLfL5m868S1lyA+EW/cNl0HNbzkE5M=; fh=6t0D1/GHSCxYBbPoOrvPW2ddOGNXUhmXnLDoNYJDkmU=; b=dp6zP7OYWJlDMZTJOewE/GVq6sMgGEb+aAJeaUy2jI10S885xNUMsbXhw8D7IdhsJM uQZqD3g931PnV8liUxhpGN2TnXeRPA21HUpoXFLVbrI4HYa0SmWxno59gOI+aXKWDSQM s/bWd5vj91WOE6IOw0iCrf6CsdBFVdfoj7WKneUeQb0rQAkDeTe9v9agA7VZMuEViFt+ FxMjuvTXtGPaAmN93k8RcP6BlfEstM6Da9D5j1lFpu6xZKBx5O1/VR0le9nKATBvUV19 q9IaygUWOEwD8geILJs9Lp09hpAunPG7hRnF6/4oORrYgCWoXdA8jKVsJ/axFAWh8o2i avGA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=VHcc7JAp; spf=pass (google.com: domain of fm-72506-20230921104240475a2afc06f7eb1640-gbs0ng@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-72506-20230921104240475a2afc06f7eb1640-gBs0Ng@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 dd2-20020a0560001e8200b0031ad54d83besi64995wrb.5.2023.09.21.03.42.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Sep 2023 03:42:40 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-20230921104240475a2afc06f7eb1640-gbs0ng@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=VHcc7JAp; spf=pass (google.com: domain of fm-72506-20230921104240475a2afc06f7eb1640-gbs0ng@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-72506-20230921104240475a2afc06f7eb1640-gBs0Ng@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 20230921104240475a2afc06f7eb1640 for ; Thu, 21 Sep 2023 12:42:40 +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=5PFvBxh7uddescLfL5m868S1lyA+EW/cNl0HNbzkE5M=; b=VHcc7JApVzi/ndwGi5bGa+hU10Gn+0jAVvmIG8JSR0QhsLIw7a1+q06pdRNlOnXzqrllRl fc/8KHmnba/1rzBzn/OWvTqIl1NxDRm9Vd1cJKdmZiC/VKsXfY5CqhUGSLsjt7HA/tXvwcZQ j7H1au5Pc6xuJ85GsrHOufIWrV89k=; From: Felix Moessbauer To: isar-users@googlegroups.com Cc: daniel.bovensiepen@siemens.com, jan.kiszka@siemens.com, cedric.hombourger@siemens.com, ubely@ilbers.de, Felix Moessbauer Subject: [PATCH v2 2/2] add EFI boot version of nanopi-neo target Date: Thu, 21 Sep 2023 18:42:14 +0800 Message-Id: <20230921104214.1658110-3-felix.moessbauer@siemens.com> In-Reply-To: <20230921104214.1658110-1-felix.moessbauer@siemens.com> References: <20230921104214.1658110-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: Un3ifohO3h9Y 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/local.conf.sample | 1 + 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 + 5 files changed, 35 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/local.conf.sample b/meta-isar/conf/local.conf.sample index 5fd45f29..9ed5e21c 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -70,6 +70,7 @@ BBMULTICONFIG = " \ nanopi-neo-buster \ nanopi-neo-bullseye \ nanopi-neo-bookworm \ + nanopi-neo-efi-bookworm \ stm32mp15x-bullseye \ virtualbox-bullseye \ rpi-arm-bullseye \ 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 2f832435..7304efe6 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.39.2