From 46f85b7839522fa2bf4dc8f297a5e205f985defe Mon Sep 17 00:00:00 2001 From: Markus Niebel Date: Wed, 6 Apr 2022 11:46:02 +0200 Subject: qoriq-arm.inc: use weak defaults When maintaining a hardware support layer for a SOM there will be different mainboards and BSP for this SOM. Depending on the use case there may be different needs for console UART and KERNEL_IMAGETYPE. When providing a valid weak default in meta-freescale a machine definition can override this easier as well as a BSP for a specific mainboard. Signed-off-by: Markus Niebel (cherry picked from commit 4d3ab7284a98fc0b3e3915e5ac21fc56828e95fa) --- conf/machine/include/qoriq-arm.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/machine/include/qoriq-arm.inc b/conf/machine/include/qoriq-arm.inc index eb03af43..cd6470ca 100644 --- a/conf/machine/include/qoriq-arm.inc +++ b/conf/machine/include/qoriq-arm.inc @@ -1,9 +1,9 @@ # Provides the common settings for QorIQ ARM -KERNEL_IMAGETYPE ?= "uImage" +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