aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Dechesne <ndechesne@users.noreply.github.com>2021-07-22 16:12:56 +0200
committerGitHub <noreply@github.com>2021-07-22 16:12:56 +0200
commit3a7898ebaf229f1c3e1f3a82c129a10b4e075bdd (patch)
tree4d8fbbfd9bef22f96073f40e9ba56624d7445f30
parentcd4076aa3f2afa5bd7d0831bfc3af2536bc5177d (diff)
parent40ae8d5b56422ef440b603d2e6713d8b577138ab (diff)
downloadmeta-qcom-3a7898ebaf229f1c3e1f3a82c129a10b4e075bdd.tar.gz
meta-qcom-3a7898ebaf229f1c3e1f3a82c129a10b4e075bdd.tar.bz2
meta-qcom-3a7898ebaf229f1c3e1f3a82c129a10b4e075bdd.zip
Merge pull request #321 from alimon/serial_consoles
conf/machine: Set default SERIAL_CONSOLES in qcom-common.inc
-rw-r--r--conf/machine/include/qcom-common.inc3
-rw-r--r--conf/machine/sdx55-mtp.conf2
-rw-r--r--conf/machine/sdx55-telit-fn980.conf2
3 files changed, 4 insertions, 3 deletions
diff --git a/conf/machine/include/qcom-common.inc b/conf/machine/include/qcom-common.inc
index fd86574..88da089 100644
--- a/conf/machine/include/qcom-common.inc
+++ b/conf/machine/include/qcom-common.inc
@@ -31,3 +31,6 @@ IMAGE_ROOTFS_ALIGNMENT ?= "4096"
# Android boot image settings
QCOM_BOOTIMG_KERNEL_BASE ?= "0x80000000"
QCOM_BOOTIMG_PAGE_SIZE ?= "4096"
+
+# Default serial console for QCOM devices
+SERIAL_CONSOLES ?= "115200;ttyMSM0"
diff --git a/conf/machine/sdx55-mtp.conf b/conf/machine/sdx55-mtp.conf
index 92fcd9e..b37278b 100644
--- a/conf/machine/sdx55-mtp.conf
+++ b/conf/machine/sdx55-mtp.conf
@@ -17,6 +17,4 @@ UBINIZE_ARGS ?= "-m 4096 -p 256KiB -s 4096"
UBI_VOLNAME ?= "system"
QCOM_BOOTIMG_ROOTFS ?= "ubi0:system"
-SERIAL_CONSOLES ?= "115200;ttyMSM0"
-
PREFERRED_PROVIDER_virtual/kernel = "linux-linaro-qcomlt-dev"
diff --git a/conf/machine/sdx55-telit-fn980.conf b/conf/machine/sdx55-telit-fn980.conf
index 24f5f97..f9cbf2e 100644
--- a/conf/machine/sdx55-telit-fn980.conf
+++ b/conf/machine/sdx55-telit-fn980.conf
@@ -17,6 +17,6 @@ UBINIZE_ARGS ?= "-m 4096 -p 256KiB -s 4096"
UBI_VOLNAME ?= "system"
QCOM_BOOTIMG_ROOTFS ?= "ubi0:system"
-SERIAL_CONSOLES ?= "921600;ttyMSM0"
+SERIAL_CONSOLES = "921600;ttyMSM0"
PREFERRED_PROVIDER_virtual/kernel = "linux-linaro-qcomlt-dev"