* [PATCH 1/2] xen, rpi4: Fix syntax in linux-yocto bbappend
@ 2021-09-30 14:54 luca fancellu
2021-09-30 14:54 ` [PATCH 2/2] xen, rpi4: Use PARTUUID for rootfs discovery luca fancellu
` (3 more replies)
0 siblings, 4 replies; 9+ messages in thread
From: luca fancellu @ 2021-09-30 14:54 UTC (permalink / raw)
To: meta-virtualization; +Cc: bertrand.marquis
Syntax conversion for bbappend linux-yocto_5.10
and linux-yocto-dev inside the raspberrypi
dynamic layer.
Signed-off-by: Luca Fancellu <luca.fancellu@arm.com>
---
.../recipes-kernel/linux/linux-yocto-dev.bbappend | 6 +++---
.../recipes-kernel/linux/linux-yocto_5.10.bbappend | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto-dev.bbappend b/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto-dev.bbappend
index 8381e44..5f43052 100644
--- a/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ b/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto-dev.bbappend
@@ -1,8 +1,8 @@
# For a Xen-enabled distro on the Raspberry Pi, override the contents of cmdline.txt
# with Xen-on-ARM-specific command line options
-KBRANCH_raspberrypi4-64 ?= "standard/bcm-2xxx-rpi"
-KMACHINE_raspberrypi4-64 ?= "bcm-2xxx-rpi4"
-COMPATIBLE_MACHINE_raspberrypi4-64 = "(raspberrypi4-64)"
+KBRANCH:raspberrypi4-64 ?= "standard/bcm-2xxx-rpi"
+KMACHINE:raspberrypi4-64 ?= "bcm-2xxx-rpi4"
+COMPATIBLE_MACHINE:raspberrypi4-64 = "(raspberrypi4-64)"
require linux-yocto_xen-rpi.inc
diff --git a/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto_5.10.bbappend b/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto_5.10.bbappend
index af92493..f279ef7 100644
--- a/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto_5.10.bbappend
+++ b/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto_5.10.bbappend
@@ -1,6 +1,6 @@
# Enable use of the linux-yocto 5.10 kernel for the Raspberry Pi 4
-KBRANCH_raspberrypi4-64 ?= "v5.10/standard/bcm-2xxx-rpi"
-KMACHINE_raspberrypi4-64 ?= "bcm-2xxx-rpi4"
-COMPATIBLE_MACHINE_raspberrypi4-64 = "(raspberrypi4-64)"
+KBRANCH:raspberrypi4-64 ?= "v5.10/standard/bcm-2xxx-rpi"
+KMACHINE:raspberrypi4-64 ?= "bcm-2xxx-rpi4"
+COMPATIBLE_MACHINE:raspberrypi4-64 = "(raspberrypi4-64)"
require linux-yocto_xen-rpi.inc
--
2.17.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/2] xen, rpi4: Use PARTUUID for rootfs discovery
2021-09-30 14:54 [PATCH 1/2] xen, rpi4: Fix syntax in linux-yocto bbappend luca fancellu
@ 2021-09-30 14:54 ` luca fancellu
2021-09-30 14:59 ` [meta-virtualization] " Diego Sueiro
2021-09-30 15:02 ` Bertrand Marquis
2021-09-30 14:59 ` [meta-virtualization] [PATCH 1/2] xen, rpi4: Fix syntax in linux-yocto bbappend Diego Sueiro
` (2 subsequent siblings)
3 siblings, 2 replies; 9+ messages in thread
From: luca fancellu @ 2021-09-30 14:54 UTC (permalink / raw)
To: meta-virtualization; +Cc: bertrand.marquis
The mmc probing order has become unpredictable
due to recent linux kernel changes, therefore devices
like the raspberry pi that have two mmc interface most
of the time can't boot from the hard-coded root path.
Modify the u-boot script to fetch the PARTUUID of the
second partition of the sd card and use it to put
root=PARTUUID=<xxx> in the command line passed to
the dom0 kernel.
Signed-off-by: Luca Fancellu <luca.fancellu@arm.com>
---
.../xen-rpi-u-boot-scr/files/boot.cmd.xen.in | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/dynamic-layers/raspberrypi/recipes-bsp/xen-rpi-u-boot-scr/files/boot.cmd.xen.in b/dynamic-layers/raspberrypi/recipes-bsp/xen-rpi-u-boot-scr/files/boot.cmd.xen.in
index 0367e36..9874220 100644
--- a/dynamic-layers/raspberrypi/recipes-bsp/xen-rpi-u-boot-scr/files/boot.cmd.xen.in
+++ b/dynamic-layers/raspberrypi/recipes-bsp/xen-rpi-u-boot-scr/files/boot.cmd.xen.in
@@ -13,10 +13,6 @@ fdt resize 0x1000
echo Add boot arguments for Xen
fdt set /chosen xen,xen-bootargs "console=dtuart dtuart=/soc/serial@7e215040 dom0_mem='@@RPI_DOM0_MEM@@' @@RPI_DEBUG_XEN_ARGS@@"
-echo Add boot arguments for dom0
-setenv dom0_bootargs "console=hvc0 earlycon=xenboot debug root=/dev/mmcblk0p2 rootwait"
-fdt set /chosen xen,dom0-bootargs \"${dom0_bootargs}\"
-
echo Add a dom0 node to chosen to put Linux boot information in
fdt mknode /chosen dom0
@@ -32,6 +28,13 @@ fdt rm /scb/pcie@7d500000/pci@1,0/usb@1,0
echo Delay to allow the MMC card to be ready
sleep 1
+# Retrieve PARTUUID for the rootfs partition of the sdcard
+part uuid mmc 1:2 rootfs_partuuid
+
+echo Add boot arguments for dom0
+setenv dom0_bootargs "console=hvc0 earlycon=xenboot debug root=PARTUUID=${rootfs_partuuid} rootwait"
+fdt set /chosen xen,dom0-bootargs \"${dom0_bootargs}\"
+
echo Load Xen into memory
fatload mmc 1:1 ${xen_loadaddr} xen
echo Xen loaded, size: 0x$filesize
--
2.17.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [meta-virtualization] [PATCH 1/2] xen, rpi4: Fix syntax in linux-yocto bbappend
2021-09-30 14:54 [PATCH 1/2] xen, rpi4: Fix syntax in linux-yocto bbappend luca fancellu
2021-09-30 14:54 ` [PATCH 2/2] xen, rpi4: Use PARTUUID for rootfs discovery luca fancellu
@ 2021-09-30 14:59 ` Diego Sueiro
2021-09-30 15:02 ` Bertrand Marquis
2021-10-04 1:42 ` Bruce Ashfield
3 siblings, 0 replies; 9+ messages in thread
From: Diego Sueiro @ 2021-09-30 14:59 UTC (permalink / raw)
To: Luca Fancellu, meta-virtualization; +Cc: Bertrand Marquis, nd
>-----Original Message-----
>From: meta-virtualization@lists.yoctoproject.org <meta-
>virtualization@lists.yoctoproject.org> On Behalf Of luca fancellu via
>lists.yoctoproject.org
>Sent: 30 September 2021 15:54
>To: meta-virtualization@lists.yoctoproject.org
>Cc: Bertrand Marquis <Bertrand.Marquis@arm.com>
>Subject: [meta-virtualization] [PATCH 1/2] xen, rpi4: Fix syntax in linux-yocto
>bbappend
>
>Syntax conversion for bbappend linux-yocto_5.10 and linux-yocto-dev inside
>the raspberrypi dynamic layer.
>
>Signed-off-by: Luca Fancellu <luca.fancellu@arm.com>
Reviewed-by: Diego Sueiro <diego.sueiro@arm.com>
>---
> .../recipes-kernel/linux/linux-yocto-dev.bbappend | 6 +++---
> .../recipes-kernel/linux/linux-yocto_5.10.bbappend | 6 +++---
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
>diff --git a/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto-
>dev.bbappend b/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-
>yocto-dev.bbappend
>index 8381e44..5f43052 100644
>--- a/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto-
>dev.bbappend
>+++ b/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto-dev.bb
>+++ append
>@@ -1,8 +1,8 @@
> # For a Xen-enabled distro on the Raspberry Pi, override the contents of
>cmdline.txt # with Xen-on-ARM-specific command line options
>
>-KBRANCH_raspberrypi4-64 ?= "standard/bcm-2xxx-rpi"
>-KMACHINE_raspberrypi4-64 ?= "bcm-2xxx-rpi4"
>-COMPATIBLE_MACHINE_raspberrypi4-64 = "(raspberrypi4-64)"
>+KBRANCH:raspberrypi4-64 ?= "standard/bcm-2xxx-rpi"
>+KMACHINE:raspberrypi4-64 ?= "bcm-2xxx-rpi4"
>+COMPATIBLE_MACHINE:raspberrypi4-64 = "(raspberrypi4-64)"
>
> require linux-yocto_xen-rpi.inc
>diff --git a/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-
>yocto_5.10.bbappend b/dynamic-layers/raspberrypi/recipes-
>kernel/linux/linux-yocto_5.10.bbappend
>index af92493..f279ef7 100644
>--- a/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-
>yocto_5.10.bbappend
>+++ b/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto_5.10.b
>+++ bappend
>@@ -1,6 +1,6 @@
> # Enable use of the linux-yocto 5.10 kernel for the Raspberry Pi 4
>-KBRANCH_raspberrypi4-64 ?= "v5.10/standard/bcm-2xxx-rpi"
>-KMACHINE_raspberrypi4-64 ?= "bcm-2xxx-rpi4"
>-COMPATIBLE_MACHINE_raspberrypi4-64 = "(raspberrypi4-64)"
>+KBRANCH:raspberrypi4-64 ?= "v5.10/standard/bcm-2xxx-rpi"
>+KMACHINE:raspberrypi4-64 ?= "bcm-2xxx-rpi4"
>+COMPATIBLE_MACHINE:raspberrypi4-64 = "(raspberrypi4-64)"
>
> require linux-yocto_xen-rpi.inc
>--
>2.17.1
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [meta-virtualization] [PATCH 2/2] xen, rpi4: Use PARTUUID for rootfs discovery
2021-09-30 14:54 ` [PATCH 2/2] xen, rpi4: Use PARTUUID for rootfs discovery luca fancellu
@ 2021-09-30 14:59 ` Diego Sueiro
2021-09-30 15:02 ` Bertrand Marquis
1 sibling, 0 replies; 9+ messages in thread
From: Diego Sueiro @ 2021-09-30 14:59 UTC (permalink / raw)
To: Luca Fancellu, meta-virtualization; +Cc: Bertrand Marquis
>-----Original Message-----
>From: meta-virtualization@lists.yoctoproject.org <meta-
>virtualization@lists.yoctoproject.org> On Behalf Of luca fancellu via
>lists.yoctoproject.org
>Sent: 30 September 2021 15:54
>To: meta-virtualization@lists.yoctoproject.org
>Cc: Bertrand Marquis <Bertrand.Marquis@arm.com>
>Subject: [meta-virtualization] [PATCH 2/2] xen, rpi4: Use PARTUUID for rootfs
>discovery
>
>The mmc probing order has become unpredictable due to recent linux kernel
>changes, therefore devices like the raspberry pi that have two mmc interface
>most of the time can't boot from the hard-coded root path.
>
>Modify the u-boot script to fetch the PARTUUID of the second partition of the
>sd card and use it to put root=PARTUUID=<xxx> in the command line passed
>to the dom0 kernel.
>
>Signed-off-by: Luca Fancellu <luca.fancellu@arm.com>
Reviewed-by: Diego Sueiro <diego.sueiro@arm.com>
>---
> .../xen-rpi-u-boot-scr/files/boot.cmd.xen.in | 11 +++++++----
> 1 file changed, 7 insertions(+), 4 deletions(-)
>
>diff --git a/dynamic-layers/raspberrypi/recipes-bsp/xen-rpi-u-boot-
>scr/files/boot.cmd.xen.in b/dynamic-layers/raspberrypi/recipes-bsp/xen-rpi-
>u-boot-scr/files/boot.cmd.xen.in
>index 0367e36..9874220 100644
>--- a/dynamic-layers/raspberrypi/recipes-bsp/xen-rpi-u-boot-
>scr/files/boot.cmd.xen.in
>+++ b/dynamic-layers/raspberrypi/recipes-bsp/xen-rpi-u-boot-scr/files/bo
>+++ ot.cmd.xen.in
>@@ -13,10 +13,6 @@ fdt resize 0x1000
> echo Add boot arguments for Xen
> fdt set /chosen xen,xen-bootargs "console=dtuart
>dtuart=/soc/serial@7e215040 dom0_mem='@@RPI_DOM0_MEM@@'
>@@RPI_DEBUG_XEN_ARGS@@"
>
>-echo Add boot arguments for dom0
>-setenv dom0_bootargs "console=hvc0 earlycon=xenboot debug
>root=/dev/mmcblk0p2 rootwait"
>-fdt set /chosen xen,dom0-bootargs \"${dom0_bootargs}\"
>-
> echo Add a dom0 node to chosen to put Linux boot information in fdt
>mknode /chosen dom0
>
>@@ -32,6 +28,13 @@ fdt rm /scb/pcie@7d500000/pci@1,0/usb@1,0
> echo Delay to allow the MMC card to be ready sleep 1
>
>+# Retrieve PARTUUID for the rootfs partition of the sdcard part uuid
>+mmc 1:2 rootfs_partuuid
>+
>+echo Add boot arguments for dom0
>+setenv dom0_bootargs "console=hvc0 earlycon=xenboot debug
>root=PARTUUID=${rootfs_partuuid} rootwait"
>+fdt set /chosen xen,dom0-bootargs \"${dom0_bootargs}\"
>+
> echo Load Xen into memory
> fatload mmc 1:1 ${xen_loadaddr} xen
> echo Xen loaded, size: 0x$filesize
>--
>2.17.1
IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] xen, rpi4: Fix syntax in linux-yocto bbappend
2021-09-30 14:54 [PATCH 1/2] xen, rpi4: Fix syntax in linux-yocto bbappend luca fancellu
2021-09-30 14:54 ` [PATCH 2/2] xen, rpi4: Use PARTUUID for rootfs discovery luca fancellu
2021-09-30 14:59 ` [meta-virtualization] [PATCH 1/2] xen, rpi4: Fix syntax in linux-yocto bbappend Diego Sueiro
@ 2021-09-30 15:02 ` Bertrand Marquis
2021-10-05 4:39 ` [meta-virtualization] " Christopher Clark
2021-10-04 1:42 ` Bruce Ashfield
3 siblings, 1 reply; 9+ messages in thread
From: Bertrand Marquis @ 2021-09-30 15:02 UTC (permalink / raw)
To: Luca Fancellu; +Cc: meta-virtualization
Hi Luca,
> On 30 Sep 2021, at 15:54, Luca Fancellu <Luca.Fancellu@arm.com> wrote:
>
> Syntax conversion for bbappend linux-yocto_5.10
> and linux-yocto-dev inside the raspberrypi
> dynamic layer.
>
> Signed-off-by: Luca Fancellu <luca.fancellu@arm.com>
Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>
Thanks a lot for that :-)
Cheers
Bertrand
> ---
> .../recipes-kernel/linux/linux-yocto-dev.bbappend | 6 +++---
> .../recipes-kernel/linux/linux-yocto_5.10.bbappend | 6 +++---
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto-dev.bbappend b/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto-dev.bbappend
> index 8381e44..5f43052 100644
> --- a/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto-dev.bbappend
> +++ b/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto-dev.bbappend
> @@ -1,8 +1,8 @@
> # For a Xen-enabled distro on the Raspberry Pi, override the contents of cmdline.txt
> # with Xen-on-ARM-specific command line options
>
> -KBRANCH_raspberrypi4-64 ?= "standard/bcm-2xxx-rpi"
> -KMACHINE_raspberrypi4-64 ?= "bcm-2xxx-rpi4"
> -COMPATIBLE_MACHINE_raspberrypi4-64 = "(raspberrypi4-64)"
> +KBRANCH:raspberrypi4-64 ?= "standard/bcm-2xxx-rpi"
> +KMACHINE:raspberrypi4-64 ?= "bcm-2xxx-rpi4"
> +COMPATIBLE_MACHINE:raspberrypi4-64 = "(raspberrypi4-64)"
>
> require linux-yocto_xen-rpi.inc
> diff --git a/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto_5.10.bbappend b/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto_5.10.bbappend
> index af92493..f279ef7 100644
> --- a/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto_5.10.bbappend
> +++ b/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto_5.10.bbappend
> @@ -1,6 +1,6 @@
> # Enable use of the linux-yocto 5.10 kernel for the Raspberry Pi 4
> -KBRANCH_raspberrypi4-64 ?= "v5.10/standard/bcm-2xxx-rpi"
> -KMACHINE_raspberrypi4-64 ?= "bcm-2xxx-rpi4"
> -COMPATIBLE_MACHINE_raspberrypi4-64 = "(raspberrypi4-64)"
> +KBRANCH:raspberrypi4-64 ?= "v5.10/standard/bcm-2xxx-rpi"
> +KMACHINE:raspberrypi4-64 ?= "bcm-2xxx-rpi4"
> +COMPATIBLE_MACHINE:raspberrypi4-64 = "(raspberrypi4-64)"
>
> require linux-yocto_xen-rpi.inc
> --
> 2.17.1
>
IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/2] xen, rpi4: Use PARTUUID for rootfs discovery
2021-09-30 14:54 ` [PATCH 2/2] xen, rpi4: Use PARTUUID for rootfs discovery luca fancellu
2021-09-30 14:59 ` [meta-virtualization] " Diego Sueiro
@ 2021-09-30 15:02 ` Bertrand Marquis
2021-10-05 4:47 ` [meta-virtualization] " Christopher Clark
1 sibling, 1 reply; 9+ messages in thread
From: Bertrand Marquis @ 2021-09-30 15:02 UTC (permalink / raw)
To: Luca Fancellu; +Cc: meta-virtualization
Hi Luca,
> On 30 Sep 2021, at 15:54, Luca Fancellu <Luca.Fancellu@arm.com> wrote:
>
> The mmc probing order has become unpredictable
> due to recent linux kernel changes, therefore devices
> like the raspberry pi that have two mmc interface most
> of the time can't boot from the hard-coded root path.
>
> Modify the u-boot script to fetch the PARTUUID of the
> second partition of the sd card and use it to put
> root=PARTUUID=<xxx> in the command line passed to
> the dom0 kernel.
>
> Signed-off-by: Luca Fancellu <luca.fancellu@arm.com>
Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>
Cheers
Bertrand
> ---
> .../xen-rpi-u-boot-scr/files/boot.cmd.xen.in | 11 +++++++----
> 1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/dynamic-layers/raspberrypi/recipes-bsp/xen-rpi-u-boot-scr/files/boot.cmd.xen.in b/dynamic-layers/raspberrypi/recipes-bsp/xen-rpi-u-boot-scr/files/boot.cmd.xen.in
> index 0367e36..9874220 100644
> --- a/dynamic-layers/raspberrypi/recipes-bsp/xen-rpi-u-boot-scr/files/boot.cmd.xen.in
> +++ b/dynamic-layers/raspberrypi/recipes-bsp/xen-rpi-u-boot-scr/files/boot.cmd.xen.in
> @@ -13,10 +13,6 @@ fdt resize 0x1000
> echo Add boot arguments for Xen
> fdt set /chosen xen,xen-bootargs "console=dtuart dtuart=/soc/serial@7e215040 dom0_mem='@@RPI_DOM0_MEM@@' @@RPI_DEBUG_XEN_ARGS@@"
>
> -echo Add boot arguments for dom0
> -setenv dom0_bootargs "console=hvc0 earlycon=xenboot debug root=/dev/mmcblk0p2 rootwait"
> -fdt set /chosen xen,dom0-bootargs \"${dom0_bootargs}\"
> -
> echo Add a dom0 node to chosen to put Linux boot information in
> fdt mknode /chosen dom0
>
> @@ -32,6 +28,13 @@ fdt rm /scb/pcie@7d500000/pci@1,0/usb@1,0
> echo Delay to allow the MMC card to be ready
> sleep 1
>
> +# Retrieve PARTUUID for the rootfs partition of the sdcard
> +part uuid mmc 1:2 rootfs_partuuid
> +
> +echo Add boot arguments for dom0
> +setenv dom0_bootargs "console=hvc0 earlycon=xenboot debug root=PARTUUID=${rootfs_partuuid} rootwait"
> +fdt set /chosen xen,dom0-bootargs \"${dom0_bootargs}\"
> +
> echo Load Xen into memory
> fatload mmc 1:1 ${xen_loadaddr} xen
> echo Xen loaded, size: 0x$filesize
> --
> 2.17.1
>
IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [meta-virtualization] [PATCH 1/2] xen, rpi4: Fix syntax in linux-yocto bbappend
2021-09-30 14:54 [PATCH 1/2] xen, rpi4: Fix syntax in linux-yocto bbappend luca fancellu
` (2 preceding siblings ...)
2021-09-30 15:02 ` Bertrand Marquis
@ 2021-10-04 1:42 ` Bruce Ashfield
3 siblings, 0 replies; 9+ messages in thread
From: Bruce Ashfield @ 2021-10-04 1:42 UTC (permalink / raw)
To: luca fancellu; +Cc: meta-virtualization, Bertrand Marquis
FYI: Christopher is having a look at these updates.
I just wanted to let everyone know that they haven't been missed.
Bruce
On Thu, Sep 30, 2021 at 10:54 AM luca fancellu <luca.fancellu@arm.com> wrote:
>
> Syntax conversion for bbappend linux-yocto_5.10
> and linux-yocto-dev inside the raspberrypi
> dynamic layer.
>
> Signed-off-by: Luca Fancellu <luca.fancellu@arm.com>
> ---
> .../recipes-kernel/linux/linux-yocto-dev.bbappend | 6 +++---
> .../recipes-kernel/linux/linux-yocto_5.10.bbappend | 6 +++---
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto-dev.bbappend b/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto-dev.bbappend
> index 8381e44..5f43052 100644
> --- a/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto-dev.bbappend
> +++ b/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto-dev.bbappend
> @@ -1,8 +1,8 @@
> # For a Xen-enabled distro on the Raspberry Pi, override the contents of cmdline.txt
> # with Xen-on-ARM-specific command line options
>
> -KBRANCH_raspberrypi4-64 ?= "standard/bcm-2xxx-rpi"
> -KMACHINE_raspberrypi4-64 ?= "bcm-2xxx-rpi4"
> -COMPATIBLE_MACHINE_raspberrypi4-64 = "(raspberrypi4-64)"
> +KBRANCH:raspberrypi4-64 ?= "standard/bcm-2xxx-rpi"
> +KMACHINE:raspberrypi4-64 ?= "bcm-2xxx-rpi4"
> +COMPATIBLE_MACHINE:raspberrypi4-64 = "(raspberrypi4-64)"
>
> require linux-yocto_xen-rpi.inc
> diff --git a/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto_5.10.bbappend b/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto_5.10.bbappend
> index af92493..f279ef7 100644
> --- a/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto_5.10.bbappend
> +++ b/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto_5.10.bbappend
> @@ -1,6 +1,6 @@
> # Enable use of the linux-yocto 5.10 kernel for the Raspberry Pi 4
> -KBRANCH_raspberrypi4-64 ?= "v5.10/standard/bcm-2xxx-rpi"
> -KMACHINE_raspberrypi4-64 ?= "bcm-2xxx-rpi4"
> -COMPATIBLE_MACHINE_raspberrypi4-64 = "(raspberrypi4-64)"
> +KBRANCH:raspberrypi4-64 ?= "v5.10/standard/bcm-2xxx-rpi"
> +KMACHINE:raspberrypi4-64 ?= "bcm-2xxx-rpi4"
> +COMPATIBLE_MACHINE:raspberrypi4-64 = "(raspberrypi4-64)"
>
> require linux-yocto_xen-rpi.inc
> --
> 2.17.1
>
>
>
>
--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [meta-virtualization] [PATCH 1/2] xen, rpi4: Fix syntax in linux-yocto bbappend
2021-09-30 15:02 ` Bertrand Marquis
@ 2021-10-05 4:39 ` Christopher Clark
0 siblings, 0 replies; 9+ messages in thread
From: Christopher Clark @ 2021-10-05 4:39 UTC (permalink / raw)
To: Bertrand Marquis; +Cc: Luca Fancellu, meta-virtualization
[-- Attachment #1: Type: text/plain, Size: 3145 bytes --]
On Thu, Sep 30, 2021 at 8:03 AM Bertrand Marquis <bertrand.marquis@arm.com>
wrote:
> Hi Luca,
>
> > On 30 Sep 2021, at 15:54, Luca Fancellu <Luca.Fancellu@arm.com> wrote:
> >
> > Syntax conversion for bbappend linux-yocto_5.10
> > and linux-yocto-dev inside the raspberrypi
> > dynamic layer.
> >
> > Signed-off-by: Luca Fancellu <luca.fancellu@arm.com>
>
> Reviewed-by: Diego Sueiro <diego.sueiro@arm.com>
>
> Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>
>
Reviewed-by: Christopher Clark <christopher.w.clark@gmail.com>
Tested-by: Christopher Clark <christopher.w.clark@gmail.com>
>
> Thanks a lot for that :-)
>
Agreed! Thanks, Luca!
Christopher
>
> Cheers
> Bertrand
>
> > ---
> > .../recipes-kernel/linux/linux-yocto-dev.bbappend | 6 +++---
> > .../recipes-kernel/linux/linux-yocto_5.10.bbappend | 6 +++---
> > 2 files changed, 6 insertions(+), 6 deletions(-)
> >
> > diff --git
> a/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto-dev.bbappend
> b/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto-dev.bbappend
> > index 8381e44..5f43052 100644
> > ---
> a/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto-dev.bbappend
> > +++
> b/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto-dev.bbappend
> > @@ -1,8 +1,8 @@
> > # For a Xen-enabled distro on the Raspberry Pi, override the contents of
> cmdline.txt
> > # with Xen-on-ARM-specific command line options
> >
> > -KBRANCH_raspberrypi4-64 ?= "standard/bcm-2xxx-rpi"
> > -KMACHINE_raspberrypi4-64 ?= "bcm-2xxx-rpi4"
> > -COMPATIBLE_MACHINE_raspberrypi4-64 = "(raspberrypi4-64)"
> > +KBRANCH:raspberrypi4-64 ?= "standard/bcm-2xxx-rpi"
> > +KMACHINE:raspberrypi4-64 ?= "bcm-2xxx-rpi4"
> > +COMPATIBLE_MACHINE:raspberrypi4-64 = "(raspberrypi4-64)"
> >
> > require linux-yocto_xen-rpi.inc
> > diff --git
> a/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto_5.10.bbappend
> b/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto_5.10.bbappend
> > index af92493..f279ef7 100644
> > ---
> a/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto_5.10.bbappend
> > +++
> b/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto_5.10.bbappend
> > @@ -1,6 +1,6 @@
> > # Enable use of the linux-yocto 5.10 kernel for the Raspberry Pi 4
> > -KBRANCH_raspberrypi4-64 ?= "v5.10/standard/bcm-2xxx-rpi"
> > -KMACHINE_raspberrypi4-64 ?= "bcm-2xxx-rpi4"
> > -COMPATIBLE_MACHINE_raspberrypi4-64 = "(raspberrypi4-64)"
> > +KBRANCH:raspberrypi4-64 ?= "v5.10/standard/bcm-2xxx-rpi"
> > +KMACHINE:raspberrypi4-64 ?= "bcm-2xxx-rpi4"
> > +COMPATIBLE_MACHINE:raspberrypi4-64 = "(raspberrypi4-64)"
> >
> > require linux-yocto_xen-rpi.inc
> > --
> > 2.17.1
> >
>
> IMPORTANT NOTICE: The contents of this email and any attachments are
> confidential and may also be privileged. If you are not the intended
> recipient, please notify the sender immediately and do not disclose the
> contents to any other person, use it for any purpose, or store or copy the
> information in any medium. Thank you.
>
>
>
>
[-- Attachment #2: Type: text/html, Size: 4841 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [meta-virtualization] [PATCH 2/2] xen, rpi4: Use PARTUUID for rootfs discovery
2021-09-30 15:02 ` Bertrand Marquis
@ 2021-10-05 4:47 ` Christopher Clark
0 siblings, 0 replies; 9+ messages in thread
From: Christopher Clark @ 2021-10-05 4:47 UTC (permalink / raw)
To: Bertrand Marquis; +Cc: Luca Fancellu, meta-virtualization
[-- Attachment #1: Type: text/plain, Size: 3410 bytes --]
On Thu, Sep 30, 2021 at 8:03 AM Bertrand Marquis <bertrand.marquis@arm.com>
wrote:
> Hi Luca,
>
> > On 30 Sep 2021, at 15:54, Luca Fancellu <Luca.Fancellu@arm.com> wrote:
> >
> > The mmc probing order has become unpredictable
> > due to recent linux kernel changes, therefore devices
> > like the raspberry pi that have two mmc interface most
> > of the time can't boot from the hard-coded root path.
> >
> > Modify the u-boot script to fetch the PARTUUID of the
> > second partition of the sd card and use it to put
> > root=PARTUUID=<xxx> in the command line passed to
> > the dom0 kernel.
>
Thanks for posting a way of handling this. I've encountered the same
unpredictable device enumeration and had been looking into whether
switching the sdhci_iproc driver to PROBE_FORCE_SYNCHRONOUS instead of
PROBE_PREFER_ASYNCHRONOUS would resolve it but I can't report that it does.
I would prefer to have a way to get stable enumeration but without it, this
is an improvement.
> >
> > Signed-off-by: Luca Fancellu <luca.fancellu@arm.com>
>
> Reviewed-by: Diego Sueiro <diego.sueiro@arm.com>
>
> Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>
>
Reviewed-by: Christopher Clark <christopher.w.clark@gmail.com>
Tested-by: Christopher Clark <christopher.w.clark@gmail.com>
Christopher
>
> Cheers
> Bertrand
>
> > ---
> > .../xen-rpi-u-boot-scr/files/boot.cmd.xen.in | 11 +++++++----
> > 1 file changed, 7 insertions(+), 4 deletions(-)
> >
> > diff --git
> a/dynamic-layers/raspberrypi/recipes-bsp/xen-rpi-u-boot-scr/files/
> boot.cmd.xen.in
> b/dynamic-layers/raspberrypi/recipes-bsp/xen-rpi-u-boot-scr/files/
> boot.cmd.xen.in
> > index 0367e36..9874220 100644
> > --- a/dynamic-layers/raspberrypi/recipes-bsp/xen-rpi-u-boot-scr/files/
> boot.cmd.xen.in
> > +++ b/dynamic-layers/raspberrypi/recipes-bsp/xen-rpi-u-boot-scr/files/
> boot.cmd.xen.in
> > @@ -13,10 +13,6 @@ fdt resize 0x1000
> > echo Add boot arguments for Xen
> > fdt set /chosen xen,xen-bootargs "console=dtuart
> dtuart=/soc/serial@7e215040 dom0_mem='@@RPI_DOM0_MEM@@'
> @@RPI_DEBUG_XEN_ARGS@@"
> >
> > -echo Add boot arguments for dom0
> > -setenv dom0_bootargs "console=hvc0 earlycon=xenboot debug
> root=/dev/mmcblk0p2 rootwait"
> > -fdt set /chosen xen,dom0-bootargs \"${dom0_bootargs}\"
> > -
> > echo Add a dom0 node to chosen to put Linux boot information in
> > fdt mknode /chosen dom0
> >
> > @@ -32,6 +28,13 @@ fdt rm /scb/pcie@7d500000/pci@1,0/usb@1,0
> > echo Delay to allow the MMC card to be ready
> > sleep 1
> >
> > +# Retrieve PARTUUID for the rootfs partition of the sdcard
> > +part uuid mmc 1:2 rootfs_partuuid
> > +
> > +echo Add boot arguments for dom0
> > +setenv dom0_bootargs "console=hvc0 earlycon=xenboot debug
> root=PARTUUID=${rootfs_partuuid} rootwait"
> > +fdt set /chosen xen,dom0-bootargs \"${dom0_bootargs}\"
> > +
> > echo Load Xen into memory
> > fatload mmc 1:1 ${xen_loadaddr} xen
> > echo Xen loaded, size: 0x$filesize
> > --
> > 2.17.1
> >
>
> IMPORTANT NOTICE: The contents of this email and any attachments are
> confidential and may also be privileged. If you are not the intended
> recipient, please notify the sender immediately and do not disclose the
> contents to any other person, use it for any purpose, or store or copy the
> information in any medium. Thank you.
>
>
>
>
[-- Attachment #2: Type: text/html, Size: 5256 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2021-10-05 4:47 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-30 14:54 [PATCH 1/2] xen, rpi4: Fix syntax in linux-yocto bbappend luca fancellu
2021-09-30 14:54 ` [PATCH 2/2] xen, rpi4: Use PARTUUID for rootfs discovery luca fancellu
2021-09-30 14:59 ` [meta-virtualization] " Diego Sueiro
2021-09-30 15:02 ` Bertrand Marquis
2021-10-05 4:47 ` [meta-virtualization] " Christopher Clark
2021-09-30 14:59 ` [meta-virtualization] [PATCH 1/2] xen, rpi4: Fix syntax in linux-yocto bbappend Diego Sueiro
2021-09-30 15:02 ` Bertrand Marquis
2021-10-05 4:39 ` [meta-virtualization] " Christopher Clark
2021-10-04 1:42 ` Bruce Ashfield
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.