diff mbox series

[1/3] arm/generic-arm64: move SERIAL_CONSOLES to generic-arm64

Message ID 20230911134545.426509-1-ross.burton@arm.com
State New
Headers show
Series [1/3] arm/generic-arm64: move SERIAL_CONSOLES to generic-arm64 | expand

Commit Message

Ross Burton Sept. 11, 2023, 1:45 p.m. UTC 
From: Ross Burton <ross.burton@arm.com>

The consoles to use isn't specific to the qemu machine, and without a
value results in no serial consoles when running on real hardware under
sysvinit.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-arm/conf/machine/generic-arm64.conf      | 3 +++
 meta-arm/conf/machine/qemu-generic-arm64.conf | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

Comments

Jon Mason Sept. 12, 2023, 3:56 a.m. UTC | #1 
On Mon, 11 Sep 2023 14:45:43 +0100, ross.burton@arm.com wrote:
> The consoles to use isn't specific to the qemu machine, and without a
> value results in no serial consoles when running on real hardware under
> sysvinit.
> 
> 

Applied, thanks!

[1/3] arm/generic-arm64: move SERIAL_CONSOLES to generic-arm64
      commit: b42bdbb7d6d1a34cff1e4ecde7bbccbb91867919
[2/3] arm/qemu-generic-arm64: force off KVM in qemu
      commit: 333719ea3efb0c24443b3408e651f4d236182ef6
[3/3] arm/generic-arm64: set XSERVER to install the modesetting driver
      commit: 3748fc07d2930723d4eb5adf4f3dc924b95392dd

Best regards,
diff mbox series

Patch

diff --git a/meta-arm/conf/machine/generic-arm64.conf b/meta-arm/conf/machine/generic-arm64.conf
index 2ee78056..27a0a2f1 100644
--- a/meta-arm/conf/machine/generic-arm64.conf
+++ b/meta-arm/conf/machine/generic-arm64.conf
@@ -16,3 +16,6 @@  WKS_FILE ?= "efi-disk.wks.in"
 EFI_PROVIDER ?= "${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd-boot", "grub-efi", d)}"
 
 MACHINE_FEATURES:append = " alsa bluetooth efi qemu-usermode rtc screen usbhost vfat wifi"
+
+SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
diff --git a/meta-arm/conf/machine/qemu-generic-arm64.conf b/meta-arm/conf/machine/qemu-generic-arm64.conf
index 717a45c9..edd15475 100644
--- a/meta-arm/conf/machine/qemu-generic-arm64.conf
+++ b/meta-arm/conf/machine/qemu-generic-arm64.conf
@@ -8,9 +8,6 @@  MACHINEOVERRIDES =. "generic-arm64:"
 require conf/machine/generic-arm64.conf
 require conf/machine/include/qemu.inc
 
-SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-
 EXTRA_IMAGEDEPENDS += "edk2-firmware"
 
 # This unique WIC file is necessary because kernel boot args cannot be passed