summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2022-04-06 08:41:38 -0300
committerGitHub <noreply@github.com>2022-04-06 08:41:38 -0300
commitb986705c8e81b4b60941d1f2cff74a8f02c99942 (patch)
treebcb743f5ee4ed28360a1d98e84a5fee192cbe8f8
parent8f98fb6454bb236c1ddf2e6389c6f21fab4df11c (diff)
parent9d5c49f8c604f117da0995f8946ff04c17caada9 (diff)
downloadmeta-freescale-b986705c8e81b4b60941d1f2cff74a8f02c99942.tar.gz
Merge pull request #1039 from niebelm/qoriq-weak-console-default
Qoriq weak console default
-rw-r--r--conf/machine/include/qoriq-arm.inc6
-rw-r--r--conf/machine/include/qoriq-arm64.inc4
2 files changed, 5 insertions, 5 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 @@
1# Provides the common settings for QorIQ ARM 1# Provides the common settings for QorIQ ARM
2 2
3KERNEL_IMAGETYPE ?= "uImage" 3KERNEL_IMAGETYPE ??= "uImage"
4 4
5SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0 115200;ttyAMA0" 5SERIAL_CONSOLES ??= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0 115200;ttyAMA0"
6SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}" 6SERIAL_CONSOLES_CHECK ??= "${SERIAL_CONSOLES}"
7 7
8MACHINEOVERRIDES =. "qoriq-arm:" 8MACHINEOVERRIDES =. "qoriq-arm:"
9 9
diff --git a/conf/machine/include/qoriq-arm64.inc b/conf/machine/include/qoriq-arm64.inc
index e8d99a6e..73a7cdcf 100644
--- a/conf/machine/include/qoriq-arm64.inc
+++ b/conf/machine/include/qoriq-arm64.inc
@@ -2,8 +2,8 @@
2 2
3KERNEL_IMAGETYPE ?= "Image" 3KERNEL_IMAGETYPE ?= "Image"
4 4
5SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyAMA0" 5SERIAL_CONSOLES ??= "115200;ttyS0 115200;ttyS1 115200;ttyAMA0"
6SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}" 6SERIAL_CONSOLES_CHECK ??= "${SERIAL_CONSOLES}"
7 7
8MACHINEOVERRIDES =. "qoriq-arm64:" 8MACHINEOVERRIDES =. "qoriq-arm64:"
9 9