2 files changed, 5 insertions, 5 deletions
diff --git a/conf/machine/include/qoriq-arm.inc b/conf/machine/include/qoriq-arm.inc
index eb03af432..cd6470ca0 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 ??= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0 115200;ttyAMA0"
-SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
+SERIAL_CONSOLES_CHECK ??= "${SERIAL_CONSOLES}"
 MACHINEOVERRIDES =. "qoriq-arm:"
diff --git a/conf/machine/include/qoriq-arm64.inc b/conf/machine/include/qoriq-arm64.inc
index e8d99a6e5..73a7cdcfd 100644
--- a/conf/machine/include/qoriq-arm64.inc
+++ b/conf/machine/include/qoriq-arm64.inc
@@ -2,8 +2,8 @@
 KERNEL_IMAGETYPE ?= "Image"
-SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyAMA0"
+SERIAL_CONSOLES ??= "115200;ttyS0 115200;ttyS1 115200;ttyAMA0"
-SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
+SERIAL_CONSOLES_CHECK ??= "${SERIAL_CONSOLES}"
 MACHINEOVERRIDES =. "qoriq-arm64:"

diff --git a/conf/machine/include/qoriq-arm.inc b/conf/machine/include/qoriq-arm.inc index eb03af432..cd6470ca0 100644 --- a/conf/machine/include/qoriq-arm.inc +++ b/conf/machine/include/qoriq-arm.inc
@@ -1,9 +1,9 @@
1	# Provides the common settings for QorIQ ARM	1	# Provides the common settings for QorIQ ARM
2		2
3	KERNEL_IMAGETYPE ?= "uImage"	3	KERNEL_IMAGETYPE ??= "uImage"
4		4
5	SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0 115200;ttyAMA0"	5	SERIAL_CONSOLES ??= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0 115200;ttyAMA0"
6	SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"	6	SERIAL_CONSOLES_CHECK ??= "${SERIAL_CONSOLES}"
7		7
8	MACHINEOVERRIDES =. "qoriq-arm:"	8	MACHINEOVERRIDES =. "qoriq-arm:"
9		9


diff --git a/conf/machine/include/qoriq-arm64.inc b/conf/machine/include/qoriq-arm64.inc index e8d99a6e5..73a7cdcfd 100644 --- a/conf/machine/include/qoriq-arm64.inc +++ b/conf/machine/include/qoriq-arm64.inc
@@ -2,8 +2,8 @@
2		2
3	KERNEL_IMAGETYPE ?= "Image"	3	KERNEL_IMAGETYPE ?= "Image"
4		4
5	SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyAMA0"	5	SERIAL_CONSOLES ??= "115200;ttyS0 115200;ttyS1 115200;ttyAMA0"
6	SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"	6	SERIAL_CONSOLES_CHECK ??= "${SERIAL_CONSOLES}"
7		7
8	MACHINEOVERRIDES =. "qoriq-arm64:"	8	MACHINEOVERRIDES =. "qoriq-arm64:"
9		9