From 9a71061c61e45cdebb26ba35c383f3b6af299e7d Mon Sep 17 00:00:00 2001 From: Markus Niebel Date: Tue, 12 Apr 2022 10:41:05 +0200 Subject: Partially revert "qoriq-arm.inc: use weak defaults" Although it seems a good idea to use a weak default for SERIAL_CONSOLES this cannot be achieved since bitbake.conf does a weak assignment after the inclusion of machine config files. This will override the weak assignment here. Revert the changes for SERIAL_CONSOLES variable to bring old behaviour back. Signed-off-by: Markus Niebel --- conf/machine/include/qoriq-arm.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/machine/include/qoriq-arm.inc b/conf/machine/include/qoriq-arm.inc index cd6470ca..6941d3a4 100644 --- a/conf/machine/include/qoriq-arm.inc +++ b/conf/machine/include/qoriq-arm.inc @@ -2,8 +2,8 @@ KERNEL_IMAGETYPE ??= "uImage" -SERIAL_CONSOLES ??= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0 115200;ttyAMA0" -SERIAL_CONSOLES_CHECK ??= "${SERIAL_CONSOLES}" +SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0 115200;ttyAMA0" +SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}" MACHINEOVERRIDES =. "qoriq-arm:" -- cgit v1.2.3-54-g00ecf