nanopi-neo: Use partition uuid instead of particular disk

Message ID 20231127151259.7554-1-badrikesh_prusty@mentor.com
State Accepted, archived
Headers show
Series nanopi-neo: Use partition uuid instead of particular disk | expand

Commit Message

Badrikesh Prusty Nov. 27, 2023, 3:12 p.m. UTC
From: Badrikesh Prusty <badrikesh.prusty@siemens.com>

Observing boot failure on nanopi-neo, if booted from external sd-card
due to dev/mmcblk2p1 not found.

From FriendlyElec documentation, mmcblk2 is used as internal emmc,
while mmcblk0 is used for external sd-card.

Some nanopi-neo's doesn't support emmc, instead uses external sd-card
as a boot device.

With this change it will allow booting from external sd-card and the
image can be copied to emmc to boot from emmc as well.

Signed-off-by: Badrikesh Prusty <badrikesh.prusty@siemens.com>
---
 meta-isar/scripts/lib/wic/canned-wks/nanopi-neo.wks.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Badrikesh Prusty Nov. 27, 2023, 5:12 p.m. UTC | #1
Hi all,
The cause of windows style code was likely caused due to copy pasting the 
patch in windows system browser itself via new conversation. Now, I updated 
the commit and sent via git send-mail from linux host.

Thanks

On Monday, November 27, 2023 at 9:31:48 PM UTC+5:30 Badrikesh Prusty wrote:

> From: Badrikesh Prusty <badrikes...@siemens.com>
>
> Observing boot failure on nanopi-neo, if booted from external sd-card
> due to dev/mmcblk2p1 not found.
>
> From FriendlyElec documentation, mmcblk2 is used as internal emmc,
> while mmcblk0 is used for external sd-card.
>
> Some nanopi-neo's doesn't support emmc, instead uses external sd-card
> as a boot device.
>
> With this change it will allow booting from external sd-card and the
> image can be copied to emmc to boot from emmc as well.
>
> Signed-off-by: Badrikesh Prusty <badrikes...@siemens.com>
> ---
> meta-isar/scripts/lib/wic/canned-wks/nanopi-neo.wks.in | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> 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 af5b6f08..9489bd12 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 mmcblk2 --fstype ext4 
> --mkfs-extraopts "-T default" --sourceparams "builtin_dt=yes" --label 
> platform --align 1024 --active
> +part / --source rootfs-u-boot --use-uuid --fstype ext4 --mkfs-extraopts 
> "-T default" --sourceparams "builtin_dt=yes" --label platform --align 1024 
> --active
>
> bootloader --append "rw rootwait"
> -- 
> 2.39.2
>
>
Uladzimir Bely Nov. 30, 2023, 2:35 p.m. UTC | #2
On Mon, 2023-11-27 at 20:42 +0530, Badrikesh Prusty wrote:
> From: Badrikesh Prusty <badrikesh.prusty@siemens.com>
> 
> Observing boot failure on nanopi-neo, if booted from external sd-card
> due to dev/mmcblk2p1 not found.
> 
> From FriendlyElec documentation, mmcblk2 is used as internal emmc,
> while mmcblk0 is used for external sd-card.
> 
> Some nanopi-neo's doesn't support emmc, instead uses external sd-card
> as a boot device.
> 
> With this change it will allow booting from external sd-card and the
> image can be copied to emmc to boot from emmc as well.
> 
> Signed-off-by: Badrikesh Prusty <badrikesh.prusty@siemens.com>
> ---
>  meta-isar/scripts/lib/wic/canned-wks/nanopi-neo.wks.in | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> 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 af5b6f08..9489bd12 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 mmcblk2 --fstype ext4 --mkfs-
> extraopts "-T default" --sourceparams "builtin_dt=yes" --label
> platform --align 1024 --active
> +part / --source rootfs-u-boot --use-uuid --fstype ext4 --mkfs-
> extraopts "-T default" --sourceparams "builtin_dt=yes" --label
> platform --align 1024 --active
>  
>  bootloader --append "rw rootwait"
> -- 
> 2.39.2
> 

Applied to next, thanks.

Patch

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 af5b6f08..9489bd12 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 mmcblk2 --fstype ext4 --mkfs-extraopts "-T default" --sourceparams "builtin_dt=yes" --label platform --align 1024 --active
+part / --source rootfs-u-boot --use-uuid --fstype ext4 --mkfs-extraopts "-T default" --sourceparams "builtin_dt=yes" --label platform --align 1024 --active
 
 bootloader --append "rw rootwait"