From patchwork Sun Jun 12 23:54:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijai Kumar K X-Patchwork-Id: 1877 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 13 Jun 2022 09:54:31 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-io1-f63.google.com (mail-io1-f63.google.com [209.85.166.63]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 25D7sTBF028087 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 13 Jun 2022 09:54:30 +0200 Received: by mail-io1-f63.google.com with SMTP id n19-20020a056602341300b0066850b49e09sf2265453ioz.12 for ; Mon, 13 Jun 2022 00:54:30 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1655106864; cv=pass; d=google.com; s=arc-20160816; b=aJQCYROmmEq3HHfOvmV5J97N2vDosJ+0h1IdTAahNiY0uNuOmM1JaqgHn5FuJ3ebRH l3dbYvOlUEsRCYfaUpDXYMs+nLB5i+as1zRom0IYydsQiLQnBftv8HWlUpnnfPbpqBTA TGZVeePOtSD2Qhgk3mb6hCosoXDCkM2chxdAWoUU0OcmcblGgwUxCzplo1vlXPZg94SQ icwM9Kpp5krYBvsHLDKVdhnOLfEDXcxji1gJuxNR1uUwQX7F+dPhrP7LJuDWPmpMxOby f+4oXSNHCdZlAGuMR8qIE/K2S6hcan+Gn7BkTEIyUdA6aQn6u7FkbAjNhTTQLb0NIZ74 fazw== 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:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:ironport-sdr:sender :dkim-signature; bh=y5v89ItHfFk4qCdbz1YLBpn7AU9fJMB58sINmR/t8UA=; b=jXtka94aJ0ZPBAGLofIMCAatlTsLglYF6T2jgApDuZC8D7A7HvKZxKrijtBbLHeujx G65I4pkR7ffbhzWGwfuZ+Hqx9dy1XxHMS/B8V7GYoIboqLCPxyUkh0ffwOkgpbRWw1Hv oSgEugH9C88q0GNHi1dg9PHwnmCl3ThKv13Skur/qcJVz3jgjpG/7hPllEawqJgi5iL7 q/cyrHf7HVn2hv1ohTDRK9lCFrzcPg0apnj2F+gw1pHehyFb7IXuuQ+LA5J8M+vWsNTI /rFJEgWnjDSp9fxd8VBGv2cVrqtWIJCJz5v+dB93GE3u9dfRgUDwWL8iVhAn4wCGC0Xd BJEQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=sender:ironport-sdr:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-subscribe:list-unsubscribe; bh=y5v89ItHfFk4qCdbz1YLBpn7AU9fJMB58sINmR/t8UA=; b=XNJCW0z01C3iWBlrd4YbgVA4TbNwumVseawFWzzdY8PpbTFwE0+SvxLHrveV2TGMEu /37uIkqlDfroE/MfoHGeBeCXAOQSuUSgyVZXB1BgPNMBkSGaM64PP5Aq7OUFW/EJgQPb jVOi4t/301iEvWK9gNSYjHo1plilfwbn3B5k5ZR+0Tc+O5FrSDEuysfig5cBlAUn8QZU M0FGvJ8bveuLNfHNZEfOFAQ1SJBiyIZWCn6l68BX5P1puaeB8BA5LXE4o2iDcngLAxWe DmE9YpJKYEODCjHc2TFNUeHE95wlj8K2WsebrWlrsO52QcKLGbllf2Z5+/7eWWuwqpzc BVkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=sender:x-gm-message-state:ironport-sdr:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=y5v89ItHfFk4qCdbz1YLBpn7AU9fJMB58sINmR/t8UA=; b=V34oaLlF7DdkquZpOG0Vam2c82DToq6roUO1g2J9XgnyaBYp4Dt/Zb4MqdLZ69UX93 ANsLGS9agxMxHZV9HloHQ9Cz3iQVjxXCkXsXvKNZSXiJRy1XppbMhPID/NlBqQxcdENS CUne9yH1uyLZa5SyD6ZvEqTZ86+T1RfHi+jszw4KfWQoDKlvxr7HT3NErjGXF1KUek+k XGmrDjmrpxTjwmwrP7nHQrTWzlTdSJVH5f2BxWn0U/l57ZicDXOvSFAoaFkIp3lpLdas dVqfuvMkzCMGQgE/z7x0QnSJO8tf5L19kWlkI70g9ydwNklVnh+QxsZUKBoqgyTnEfHX rsWQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530cfdw5on2RlMeQ5jlJDNvoaZqiBE2sgYdOlvTvfYv7RCO9Tjek KFm+pm0naqXu7qLMlvz2IYg= X-Google-Smtp-Source: ABdhPJzLukP0Wimr/CU6bLcnFIMgCazmxjE9D88lwPwkUKSBBpyT0x0rjfFkmZHyxz+lWZibxR4EKA== X-Received: by 2002:a92:d5cf:0:b0:2d1:d9b0:d5b1 with SMTP id d15-20020a92d5cf000000b002d1d9b0d5b1mr29817447ilq.252.1655106864237; Mon, 13 Jun 2022 00:54:24 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6e02:887:b0:2d2:6c8c:45ac with SMTP id z7-20020a056e02088700b002d26c8c45acls768613ils.4.gmail; Mon, 13 Jun 2022 00:54:23 -0700 (PDT) X-Received: by 2002:a05:6e02:1c42:b0:2d1:aaac:ecc2 with SMTP id d2-20020a056e021c4200b002d1aaacecc2mr30491856ilg.128.1655106863689; Mon, 13 Jun 2022 00:54:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655106863; cv=none; d=google.com; s=arc-20160816; b=wkkpqMMlsNT6w2BD2P8oty8MCLH0frap85bPnYyi45CZ54LZnEH0WAwoculJPyKHY8 cc8onUT9l18yDyZmxMuHSuzVvdJVCG/e/JD/HBdV/iY0yM/6Ii8A4h51cahAwCyxsh7z 5SbsD5TvjTGh5z9ANVsGXYyGDwA8L7ITbipNJLLDFhPwuj364z/aJ9rpDfOAuGXvLhZf PoVqqjj7/WH+zVQw6uBGx04d5l8CfJCUyi3fvV/1halCR7AoZ109CwjJrcFUPYbICFVZ sYO/j9K5rmZTEqzL2fH3LSE+UWQqdl7lEc5OXQDqu8XlNiIlI+vV3216hoL9bsV/g+wf 3O0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:ironport-sdr; bh=dyXHNXKc0YCMPULuFiOT+wilrmvpBy7iPVsQgIz1OCc=; b=aD3JxQ7NyDW3koVnf2qtmfMvAWpfCpoXNPHHaeP/FrUB0mlrrNgLnptRdzmY8k927C FfqEmJ1aErEforSMoxbTmDXC6HxnYIKfQJwGJ+0B/gxgLVLbPe0zEdycYxqBvJ8Zp/gU qE33WqS7V8k9cF8N5PT/krnADgWLE2b0kEs74NIfTgxI5pJ4AJ0QO7Mrb8KS/Q5gbY3E ZrSnv12FCETuB4kEBq6rkgcHNy7oMzfK7bk3fyJywFsHuTlMagxTsAQbSTfzsBv52JpA qAHKbPmykipIsitVnB9ecnr9/17mtyz01Vw80k8eMKKpXf57KgDLy0slIoq/MIPzgN1U TzUQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Received: from esa1.mentor.iphmx.com (esa1.mentor.iphmx.com. [68.232.129.153]) by gmr-mx.google.com with ESMTPS id v10-20020a056602014a00b006495f98f57asi281003iot.1.2022.06.13.00.54.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Jun 2022 00:54:23 -0700 (PDT) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 as permitted sender) client-ip=68.232.129.153; X-IronPort-AV: E=Sophos;i="5.91,296,1647331200"; d="scan'208";a="79831816" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa1.mentor.iphmx.com with ESMTP; 12 Jun 2022 23:54:23 -0800 IronPort-SDR: 5sY8EKl0fEysCBmozzk1dTsAfes/yd3lSVWoFOT8oDfZCfI7cERTxMYxJoBjJeyR2zRorAv/nL Gk0mnzZqVAV1krtaacW1SDx+nAgZRo5BWB1iHBXQozK9J38yy1J8QLMWE/LrNNiwJOn0Xl63+V cQWq5pCH4TyE5aRD7CGOJNho2cT+42OySVUMYxA5GSNzVufvTfvBG2LptOqFBcqu1GyBNL5AnQ f4xroA3/TcGklJ2fADlMz/VlhzHMUbAKLN1FO9EcQ3SDjJI9ImeU7VzllOVBisqjAhYeBGmmsf cI0= From: Vijai Kumar K To: CC: , , Vijai Kumar K Subject: [PATCH v2 1/2] meta-isar/wks: prepare wks for wic uprev Date: Mon, 13 Jun 2022 13:24:00 +0530 Message-ID: <20220613075401.2059119-2-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220613075401.2059119-1-Vijaikumar_Kanagarajan@mentor.com> References: <20220613075401.2059119-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 X-ClientProxiedBy: svr-orw-mbx-11.mgc.mentorg.com (147.34.90.211) To svr-orw-mbx-12.mgc.mentorg.com (147.34.90.212) X-Original-Sender: vijaikumar_kanagarajan@mentor.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com 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=-0.9 required=5.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, 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: INBOX In the current version of wic we use, "/" mount points are ignored and their entries are not added to fstab. But in the latest version of wic available in oe-core, this is not the case. "/" mountpoints are respected and are added to fstab. ISAR already creates the necessary fstab. With the new version we will end up with 2 entries for "/". One from ISAR's image_configure_fstab and the other one appended by wic. Explicitly drop "/" mountpoint args in wks files to avoid this. Signed-off-by: Vijai Kumar K --- meta-isar/scripts/lib/wic/canned-wks/common-isar.wks.inc | 2 +- meta-isar/scripts/lib/wic/canned-wks/de0-nano-soc.wks.in | 2 +- meta-isar/scripts/lib/wic/canned-wks/efi-plus-pcbios.wks | 2 +- meta-isar/scripts/lib/wic/canned-wks/hikey.wks | 2 +- meta-isar/scripts/lib/wic/canned-wks/multipart-efi.wks | 2 +- meta-isar/scripts/lib/wic/canned-wks/nanopi-neo.wks.in | 2 +- meta-isar/scripts/lib/wic/canned-wks/rpi-sdimg.wks | 2 +- meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sd.wks | 2 +- meta-isar/scripts/lib/wic/canned-wks/sdimage-efi.wks | 2 +- meta-isar/scripts/lib/wic/canned-wks/sifive-fu540.wks | 2 +- meta-isar/scripts/lib/wic/canned-wks/stm32mp15x.wks.in | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/meta-isar/scripts/lib/wic/canned-wks/common-isar.wks.inc b/meta-isar/scripts/lib/wic/canned-wks/common-isar.wks.inc index fe028b5..32a358e 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/common-isar.wks.inc +++ b/meta-isar/scripts/lib/wic/canned-wks/common-isar.wks.inc @@ -1,3 +1,3 @@ # This file is included into 3 canned wks files from this directory part /boot --source bootimg-pcbios-isar --ondisk sda --label boot --active --align 1024 -part / --source rootfs --use-uuid --fstype=ext4 --label platform --align 1024 --exclude-path=boot --mkfs-extraopts "-T default" +part --source rootfs --use-uuid --fstype=ext4 --label platform --align 1024 --exclude-path=boot --mkfs-extraopts "-T default" diff --git a/meta-isar/scripts/lib/wic/canned-wks/de0-nano-soc.wks.in b/meta-isar/scripts/lib/wic/canned-wks/de0-nano-soc.wks.in index 0794a2f..15dab79 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/de0-nano-soc.wks.in +++ b/meta-isar/scripts/lib/wic/canned-wks/de0-nano-soc.wks.in @@ -5,6 +5,6 @@ part --source rawcopy --sourceparams "file=/usr/lib/u-boot/${MACHINE}/${U_BOOT_BIN}" --system-id 0xa2 --align 1 -part / --source rootfs-u-boot --ondisk mmcblk0 --fstype ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --active +part --source rootfs-u-boot --ondisk mmcblk0 --fstype ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --active bootloader --append "rw rootwait" diff --git a/meta-isar/scripts/lib/wic/canned-wks/efi-plus-pcbios.wks b/meta-isar/scripts/lib/wic/canned-wks/efi-plus-pcbios.wks index 0392891..9bff6aa 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/efi-plus-pcbios.wks +++ b/meta-isar/scripts/lib/wic/canned-wks/efi-plus-pcbios.wks @@ -1,6 +1,6 @@ # Example to show how to create an efi + pcbios image # Note, that the loader argument is mandatory. But systemd-boot also works. part /boot --source bootimg-biosplusefi-isar --sourceparams="loader=grub-efi" --label boot --active --align 1024 -part / --source rootfs --ondisk sda --fstype=ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --exclude-path=boot +part --source rootfs --ondisk sda --fstype=ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --exclude-path=boot bootloader --ptable gpt --timeout 3 --append "rootwait console=ttyS0,115200 console=tty0" diff --git a/meta-isar/scripts/lib/wic/canned-wks/hikey.wks b/meta-isar/scripts/lib/wic/canned-wks/hikey.wks index 0c966e6..28bfa22 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/hikey.wks +++ b/meta-isar/scripts/lib/wic/canned-wks/hikey.wks @@ -5,6 +5,6 @@ part /boot --source bootimg-efi-isar --sourceparams "loader=grub-efi" --ondisk mmcblk1 --label efi --part-type EF00 --align 1024 -part / --source rootfs --ondisk mmcblk1 --fstype ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --use-uuid --exclude-path boot/ +part --source rootfs --ondisk mmcblk1 --fstype ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --use-uuid --exclude-path boot/ bootloader --ptable gpt --timeout=3 diff --git a/meta-isar/scripts/lib/wic/canned-wks/multipart-efi.wks b/meta-isar/scripts/lib/wic/canned-wks/multipart-efi.wks index b3abb3d..3f524d5 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/multipart-efi.wks +++ b/meta-isar/scripts/lib/wic/canned-wks/multipart-efi.wks @@ -1,7 +1,7 @@ # Example showing how to split a single rootfs across partitions part /boot --ondisk sda --source bootimg-efi-isar --sourceparams="loader=grub-efi" --label boot --active --align 1024 # when excluding paths, just specify --exclude-path once and separate paths using spaces -part / --ondisk sda --source rootfs --fstype=ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --exclude-path boot home --extra-space 1G +part --ondisk sda --source rootfs --fstype=ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --exclude-path boot home --extra-space 1G # put home last to support auto-expand of this partition part /home --ondisk sda --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/home --fstype=ext4 --mkfs-extraopts "-T default" --label platform --align 1024 diff --git a/meta-isar/scripts/lib/wic/canned-wks/nanopi-neo.wks.in b/meta-isar/scripts/lib/wic/canned-wks/nanopi-neo.wks.in index de1c92c..7df6ae8 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/nanopi-neo.wks.in +++ b/meta-isar/scripts/lib/wic/canned-wks/nanopi-neo.wks.in @@ -5,6 +5,6 @@ part u-boot --source rawcopy --sourceparams "file=/usr/lib/u-boot/nanopi_neo/u-boot-sunxi-with-spl.bin" --no-table --align 8 -part / --source rootfs-u-boot --ondisk mmcblk0 --fstype ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --active +part --source rootfs-u-boot --ondisk mmcblk0 --fstype ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --active bootloader --append "rw rootwait" diff --git a/meta-isar/scripts/lib/wic/canned-wks/rpi-sdimg.wks b/meta-isar/scripts/lib/wic/canned-wks/rpi-sdimg.wks index e5a3668..c76013f 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/rpi-sdimg.wks +++ b/meta-isar/scripts/lib/wic/canned-wks/rpi-sdimg.wks @@ -1,5 +1,5 @@ part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 4096 --size 10 -part / --source rootfs --ondisk mmcblk0 --fstype=ext4 --mkfs-extraopts "-T default" --label root --align 4096 --exclude-path=boot +part --source rootfs --ondisk mmcblk0 --fstype=ext4 --mkfs-extraopts "-T default" --label root --align 4096 --exclude-path=boot bootloader diff --git a/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sd.wks b/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sd.wks index 754fbc4..43e6dc1 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sd.wks +++ b/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sd.wks @@ -4,6 +4,6 @@ part /boot --source bootimg-efi-isar --sourceparams "loader=systemd-boot" --ondisk sda --label efi --part-type EF00 --align 1024 -part / --source rootfs --ondisk sda --fstype ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --use-uuid --exclude-path boot/ +part --source rootfs --ondisk sda --fstype ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --use-uuid --exclude-path boot/ bootloader --ptable gpt --timeout 3 --append "rootwait console=ttyS0,115200 console=tty0" diff --git a/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi.wks b/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi.wks index f3addbc..530304f 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi.wks +++ b/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi.wks @@ -4,6 +4,6 @@ part /boot --source bootimg-efi-isar --sourceparams "loader=grub-efi" --ondisk sda --label efi --part-type EF00 --align 1024 -part / --source rootfs --ondisk sda --fstype ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --use-uuid --exclude-path boot/ +part --source rootfs --ondisk sda --fstype ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --use-uuid --exclude-path boot/ bootloader --ptable gpt --timeout 3 --append "rootwait console=ttyS0,115200 console=tty0" diff --git a/meta-isar/scripts/lib/wic/canned-wks/sifive-fu540.wks b/meta-isar/scripts/lib/wic/canned-wks/sifive-fu540.wks index 9cd0e66..f63b06a 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/sifive-fu540.wks +++ b/meta-isar/scripts/lib/wic/canned-wks/sifive-fu540.wks @@ -5,6 +5,6 @@ part --source rawcopy --sourceparams "file=/usr/lib/opensbi/sifive-fu540/fw_payload.bin" --ondisk mmcblk0 --fixed-size 8M --align 1 --part-type 2e54b353-1271-4842-806f-e436d6af6985 -part / --source rootfs-u-boot --ondisk mmcblk0 --fstype ext4 --mkfs-extraopts "-T default" --label platform --active --align 1024 --sourceparams "no_initrd=yes,script_prepend=setenv fdtfile sifive/hifive-unleashed-a00.dtb" +part --source rootfs-u-boot --ondisk mmcblk0 --fstype ext4 --mkfs-extraopts "-T default" --label platform --active --align 1024 --sourceparams "no_initrd=yes,script_prepend=setenv fdtfile sifive/hifive-unleashed-a00.dtb" bootloader --ptable gpt --append "rootwait" diff --git a/meta-isar/scripts/lib/wic/canned-wks/stm32mp15x.wks.in b/meta-isar/scripts/lib/wic/canned-wks/stm32mp15x.wks.in index 4ed4ee8..2fa8ebf 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/stm32mp15x.wks.in +++ b/meta-isar/scripts/lib/wic/canned-wks/stm32mp15x.wks.in @@ -11,6 +11,6 @@ part teeh --part-name teeh --source rawcopy --sourceparams "file=/usr/lib/optee- part teed --part-name teed --source rawcopy --sourceparams "file=/usr/lib/optee-os/${MACHINE}/tee-pageable_v2.stm32" --fstype=ext4 --fsoptions "noauto" --part-type 0x8301 --fixed-size 512K part teex --part-name teex --source rawcopy --sourceparams "file=/usr/lib/optee-os/${MACHINE}/tee-pager_v2.stm32" --fstype=ext4 --fsoptions "noauto" --part-type 0x8301 --fixed-size 256K -part / --source rootfs-u-boot --fstype ext4 --mkfs-extraopts "-T default" --label root --align 1024 --active --use-uuid +part --source rootfs-u-boot --fstype ext4 --mkfs-extraopts "-T default" --label root --align 1024 --active --use-uuid bootloader --ptable gpt --append="rootwait rw console=ttySTM0,115200"