* [Buildroot] [PATCH v3 1/3] board/qemu/aarch64-sbsa: use PARTLABEL to specify root
2023-03-07 9:35 [Buildroot] [PATCH v3 0/3] misc aarch64-sbsa cleanups Niklas Cassel via buildroot
@ 2023-03-07 9:35 ` Niklas Cassel via buildroot
2023-03-07 9:35 ` [Buildroot] [PATCH v3 2/3] board/qemu/aarch64-sbsa: use the default console specified by ACPI Niklas Cassel via buildroot
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Niklas Cassel via buildroot @ 2023-03-07 9:35 UTC (permalink / raw)
To: buildroot
Cc: Niklas Cassel, Romain Naour, Vincent Stehlé, Damien Le Moal
Specifying /dev/sda2 is ambigious, and when booting my arm64 machine
this tries to mount the second partition of my ATA drive, instead of
the second partition of the USB-stick, simply because the ATA driver
is probed earlier than the USB controller driver.
To solve this problem, use PARTLABEL=root to specify the root filesystem.
This is similar to how it is currently done for board/aarch64-efi/grub.cfg
and board/qemu/aarch64-ebbr/grub.cfg.
Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com>
---
board/qemu/aarch64-sbsa/grub.cfg | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/board/qemu/aarch64-sbsa/grub.cfg b/board/qemu/aarch64-sbsa/grub.cfg
index cd486caf4c..39b7842f8f 100644
--- a/board/qemu/aarch64-sbsa/grub.cfg
+++ b/board/qemu/aarch64-sbsa/grub.cfg
@@ -2,5 +2,5 @@ set default="0"
set timeout="5"
menuentry "Buildroot" {
- linux /Image root=/dev/sda2 rootwait console=ttyAMA0
+ linux /Image root=PARTLABEL=root rootwait console=ttyAMA0
}
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Buildroot] [PATCH v3 2/3] board/qemu/aarch64-sbsa: use the default console specified by ACPI
2023-03-07 9:35 [Buildroot] [PATCH v3 0/3] misc aarch64-sbsa cleanups Niklas Cassel via buildroot
2023-03-07 9:35 ` [Buildroot] [PATCH v3 1/3] board/qemu/aarch64-sbsa: use PARTLABEL to specify root Niklas Cassel via buildroot
@ 2023-03-07 9:35 ` Niklas Cassel via buildroot
2023-03-07 9:35 ` [Buildroot] [PATCH v3 3/3] support/testing: move the kernel config only used by test_edk2.py Niklas Cassel via buildroot
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Niklas Cassel via buildroot @ 2023-03-07 9:35 UTC (permalink / raw)
To: buildroot
Cc: Niklas Cassel, Romain Naour, Vincent Stehlé, Damien Le Moal
ARM SBBR (Server Base Boot Requirements) defines SPCR (Serial Port
Console Redirection Table) as a mandatory ACPI table that specifies
the configuration of a serial console.
In the linux kernel, ARM developers have decided that consoles defined
by SPCR are always enabled when existing, see e.g.:
https://lore.kernel.org/linux-serial/20200430161438.17640-1-alpernebiyasak@gmail.com/T/
Specifying console=ttyAMA0 (which is a serial console) is thus
redundant for an ARM SBSA board. (It also blindly assumes that
the serial console is on ttyAMA0, which might not be true.)
Drop the explicit console=ttyAMA0 on the kernel command line,
such that the kernel can pick up the default console defined
by SPCR.
This is similar to how it is currently done for
board/aarch64-efi/grub.cfg.
Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com>
---
board/qemu/aarch64-sbsa/grub.cfg | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/board/qemu/aarch64-sbsa/grub.cfg b/board/qemu/aarch64-sbsa/grub.cfg
index 39b7842f8f..d99e19c4cd 100644
--- a/board/qemu/aarch64-sbsa/grub.cfg
+++ b/board/qemu/aarch64-sbsa/grub.cfg
@@ -2,5 +2,5 @@ set default="0"
set timeout="5"
menuentry "Buildroot" {
- linux /Image root=PARTLABEL=root rootwait console=ttyAMA0
+ linux /Image root=PARTLABEL=root rootwait
}
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Buildroot] [PATCH v3 3/3] support/testing: move the kernel config only used by test_edk2.py
2023-03-07 9:35 [Buildroot] [PATCH v3 0/3] misc aarch64-sbsa cleanups Niklas Cassel via buildroot
2023-03-07 9:35 ` [Buildroot] [PATCH v3 1/3] board/qemu/aarch64-sbsa: use PARTLABEL to specify root Niklas Cassel via buildroot
2023-03-07 9:35 ` [Buildroot] [PATCH v3 2/3] board/qemu/aarch64-sbsa: use the default console specified by ACPI Niklas Cassel via buildroot
@ 2023-03-07 9:35 ` Niklas Cassel via buildroot
2023-03-09 15:21 ` [Buildroot] [PATCH v3 0/3] misc aarch64-sbsa cleanups Vincent Stehlé
2023-03-12 9:09 ` Thomas Petazzoni via buildroot
4 siblings, 0 replies; 6+ messages in thread
From: Niklas Cassel via buildroot @ 2023-03-07 9:35 UTC (permalink / raw)
To: buildroot
Cc: Niklas Cassel, Romain Naour, Vincent Stehlé, Damien Le Moal
The kernel config board/qemu/aarch64-sbsa/linux.config has never been in
use by qemu_aarch64_sbsa_defconfig, neither via
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE, nor via
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES.
test_edk2.py is using the kernel config
board/qemu/aarch64-sbsa/linux.config. However, storing a kernel config
that is not used by qemu_aarch64_sbsa_defconfig, in a directory that is
"owned" by qemu_aarch64_sbsa_defconfig, is bound to cause confusion.
Therefore, move the config file to a new subdirectory:
support/testing/tests/boot/test_edk2/
This is similar to how e.g. test_grub.py has a subdirectory:
support/testing/tests/boot/test_grub/
where it keeps the kernel config that is only used by test_grub.py.
Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com>
---
support/testing/tests/boot/test_edk2.py | 2 +-
.../testing/tests/boot/test_edk2}/linux.config | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename {board/qemu/aarch64-sbsa => support/testing/tests/boot/test_edk2}/linux.config (100%)
diff --git a/support/testing/tests/boot/test_edk2.py b/support/testing/tests/boot/test_edk2.py
index c1be8fad95..623e77e992 100644
--- a/support/testing/tests/boot/test_edk2.py
+++ b/support/testing/tests/boot/test_edk2.py
@@ -18,7 +18,7 @@ class TestEdk2(infra.basetest.BRTest):
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.34"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
- BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-sbsa/linux.config"
+ BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="support/testing/tests/boot/test_edk2/linux.config"
BR2_TARGET_EDK2=y
BR2_TARGET_EDK2_PLATFORM_QEMU_SBSA=y
BR2_TARGET_GRUB2=y
diff --git a/board/qemu/aarch64-sbsa/linux.config b/support/testing/tests/boot/test_edk2/linux.config
similarity index 100%
rename from board/qemu/aarch64-sbsa/linux.config
rename to support/testing/tests/boot/test_edk2/linux.config
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [Buildroot] [PATCH v3 0/3] misc aarch64-sbsa cleanups
2023-03-07 9:35 [Buildroot] [PATCH v3 0/3] misc aarch64-sbsa cleanups Niklas Cassel via buildroot
` (2 preceding siblings ...)
2023-03-07 9:35 ` [Buildroot] [PATCH v3 3/3] support/testing: move the kernel config only used by test_edk2.py Niklas Cassel via buildroot
@ 2023-03-09 15:21 ` Vincent Stehlé
2023-03-12 9:09 ` Thomas Petazzoni via buildroot
4 siblings, 0 replies; 6+ messages in thread
From: Vincent Stehlé @ 2023-03-09 15:21 UTC (permalink / raw)
To: Niklas Cassel; +Cc: Romain Naour, Damien Le Moal, buildroot
On Tue, Mar 07, 2023 at 10:35:01AM +0100, Niklas Cassel wrote:
> Hello,
>
> Here come some small aarch64-sbsa cleanups.
> Please consider for inclusion.
>
> Changes since v2:
> -Keep the kernel config only used by test_edk2.py, but move it to a new
> subdirectory to make it move obvious that it is only used by test_edk.py.
Hi Niklas,
Thanks for working on that series.
- The defconfig works on my side, on Arm and x86, on master and next.
- The unit test works locally (on x86) and on gitlab, on master and next.
Feel free to add (or not):
Tested-by: Vincent Stehlé <vincent.stehle@arm.com>
Best regards,
Vincent.
>
> Thanks a lot to Vincent Stehlé for testing the previous versions in gitlab CI.
>
>
> Kind regards,
> Niklas
>
> Niklas Cassel (3):
> board/qemu/aarch64-sbsa: use PARTLABEL to specify root
> board/qemu/aarch64-sbsa: use the default console specified by ACPI
> support/testing: move the kernel config only used by test_edk2.py
>
> board/qemu/aarch64-sbsa/grub.cfg | 2 +-
> support/testing/tests/boot/test_edk2.py | 2 +-
> .../testing/tests/boot/test_edk2}/linux.config | 0
> 3 files changed, 2 insertions(+), 2 deletions(-)
> rename {board/qemu/aarch64-sbsa => support/testing/tests/boot/test_edk2}/linux.config (100%)
>
> --
> 2.39.2
>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [Buildroot] [PATCH v3 0/3] misc aarch64-sbsa cleanups
2023-03-07 9:35 [Buildroot] [PATCH v3 0/3] misc aarch64-sbsa cleanups Niklas Cassel via buildroot
` (3 preceding siblings ...)
2023-03-09 15:21 ` [Buildroot] [PATCH v3 0/3] misc aarch64-sbsa cleanups Vincent Stehlé
@ 2023-03-12 9:09 ` Thomas Petazzoni via buildroot
4 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni via buildroot @ 2023-03-12 9:09 UTC (permalink / raw)
To: Niklas Cassel via buildroot
Cc: Niklas Cassel, Romain Naour, Vincent Stehlé, Damien Le Moal
On Tue, 7 Mar 2023 10:35:01 +0100
Niklas Cassel via buildroot <buildroot@buildroot.org> wrote:
> Niklas Cassel (3):
> board/qemu/aarch64-sbsa: use PARTLABEL to specify root
> board/qemu/aarch64-sbsa: use the default console specified by ACPI
> support/testing: move the kernel config only used by test_edk2.py
Series applied to the next branch. Thanks!
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 6+ messages in thread