From b42bdbb7d6d1a34cff1e4ecde7bbccbb91867919 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 11 Sep 2023 14:45:43 +0100 Subject: [PATCH] arm/generic-arm64: move SERIAL_CONSOLES to generic-arm64 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 Signed-off-by: Jon Mason --- meta-arm/conf/machine/generic-arm64.conf | 3 +++ meta-arm/conf/machine/qemu-generic-arm64.conf | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) 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