aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorben Vornholz <thorben.vornholz@baslerweb.com>2018-06-06 10:48:12 +0200
committerNicolas Dechesne <nicolas.dechesne@linaro.org>2018-06-28 12:37:42 +0200
commitdfe5d143de324812ea63d4f535bf0203018ff192 (patch)
tree04d0abd920df4f7da7f094ef8f52063ba11708e8
parent8e3d5216646913f6dee2f40695e53318b4d57ccd (diff)
downloadmeta-qcom-dfe5d143de324812ea63d4f535bf0203018ff192.tar.gz
meta-qcom-dfe5d143de324812ea63d4f535bf0203018ff192.tar.bz2
meta-qcom-dfe5d143de324812ea63d4f535bf0203018ff192.zip
conf: machine: *.conf: added overwrite options for all machines
Adding overwriting options to certain variables to supply i.e. a different kernel version or another serial output without having extra files. This also allows setting these values via environment. Signed-off-by: Thorben Vornholz <thorben.vornholz@baslerweb.com> [nicolas.dechesne@linaro.org: extended initial PR to apply to all machines, not just 820c] Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
-rw-r--r--conf/machine/dragonboard-410c-32.conf2
-rw-r--r--conf/machine/dragonboard-410c.conf6
-rw-r--r--conf/machine/dragonboard-600c.conf6
-rw-r--r--conf/machine/dragonboard-820c.conf6
-rw-r--r--conf/machine/ifc6410.conf6
-rw-r--r--conf/machine/sd-600eval.conf6
6 files changed, 16 insertions, 16 deletions
diff --git a/conf/machine/dragonboard-410c-32.conf b/conf/machine/dragonboard-410c-32.conf
index 147c2ba..859bbfd 100644
--- a/conf/machine/dragonboard-410c-32.conf
+++ b/conf/machine/dragonboard-410c-32.conf
@@ -7,7 +7,7 @@ require conf/machine/include/tune-cortexa8.inc
MACHINE_FEATURES = "usbhost usbgadget alsa screen wifi bluetooth ext2"
-SERIAL_CONSOLE = "115200 ttyMSM0"
+SERIAL_CONSOLE ?= "115200 ttyMSM0"
# Building 32-bit kernel is not supported.
PREFERRED_PROVIDER_virtual/kernel = "linux-dummy"
diff --git a/conf/machine/dragonboard-410c.conf b/conf/machine/dragonboard-410c.conf
index 617ac87..c8e7fc5 100644
--- a/conf/machine/dragonboard-410c.conf
+++ b/conf/machine/dragonboard-410c.conf
@@ -7,10 +7,10 @@ require conf/machine/include/arm/arch-armv8.inc
MACHINE_FEATURES = "usbhost usbgadget alsa screen wifi bluetooth ext2"
-KERNEL_IMAGETYPE = "Image.gz"
-KERNEL_DEVICETREE = "qcom/apq8016-sbc.dtb"
+KERNEL_IMAGETYPE ?= "Image.gz"
+KERNEL_DEVICETREE ?= "qcom/apq8016-sbc.dtb"
-SERIAL_CONSOLE = "115200 ttyMSM0"
+SERIAL_CONSOLE ?= "115200 ttyMSM0"
MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
kernel-modules \
diff --git a/conf/machine/dragonboard-600c.conf b/conf/machine/dragonboard-600c.conf
index 773554c..595207b 100644
--- a/conf/machine/dragonboard-600c.conf
+++ b/conf/machine/dragonboard-600c.conf
@@ -13,9 +13,9 @@ MACHINE_EXTRA_RRECOMMENDS = " \
firmware-qcom-sd-600eval \
"
-KERNEL_IMAGETYPE = "zImage"
-KERNEL_DEVICETREE = "qcom-apq8064-db600c.dtb"
+KERNEL_IMAGETYPE ?= "zImage"
+KERNEL_DEVICETREE ?= "qcom-apq8064-db600c.dtb"
-SERIAL_CONSOLE = "115200 ttyMSM0"
+SERIAL_CONSOLE ?= "115200 ttyMSM0"
QCOM_BOOTIMG_ROOTFS ?= "mmcblk0p12"
diff --git a/conf/machine/dragonboard-820c.conf b/conf/machine/dragonboard-820c.conf
index 8e7da11..8e3670e 100644
--- a/conf/machine/dragonboard-820c.conf
+++ b/conf/machine/dragonboard-820c.conf
@@ -6,10 +6,10 @@ require conf/machine/include/qcom-apq8096.inc
MACHINE_FEATURES = "usbhost usbgadget alsa screen wifi bluetooth ext2"
-KERNEL_IMAGETYPE = "Image.gz"
-KERNEL_DEVICETREE = "qcom/apq8096-db820c.dtb"
+KERNEL_IMAGETYPE ?= "Image.gz"
+KERNEL_DEVICETREE ?= "qcom/apq8096-db820c.dtb"
-SERIAL_CONSOLE = "115200 ttyMSM0"
+SERIAL_CONSOLE ?= "115200 ttyMSM0"
MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
firmware-qcom-dragonboard820c \
diff --git a/conf/machine/ifc6410.conf b/conf/machine/ifc6410.conf
index 4a698b6..40d89b7 100644
--- a/conf/machine/ifc6410.conf
+++ b/conf/machine/ifc6410.conf
@@ -12,10 +12,10 @@ MACHINE_EXTRA_RRECOMMENDS = " \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-msm', '', d)} \
"
-KERNEL_IMAGETYPE = "zImage"
-KERNEL_DEVICETREE = "qcom-apq8064-ifc6410.dtb"
+KERNEL_IMAGETYPE ?= "zImage"
+KERNEL_DEVICETREE ?= "qcom-apq8064-ifc6410.dtb"
-SERIAL_CONSOLE = "115200 ttyMSM0"
+SERIAL_CONSOLE ?= "115200 ttyMSM0"
QCOM_BOOTIMG_ROOTFS ?= "mmcblk0p12"
diff --git a/conf/machine/sd-600eval.conf b/conf/machine/sd-600eval.conf
index f731b41..f7da072 100644
--- a/conf/machine/sd-600eval.conf
+++ b/conf/machine/sd-600eval.conf
@@ -14,9 +14,9 @@ MACHINE_EXTRA_RRECOMMENDS = " \
firmware-qcom-sd-600eval \
"
-KERNEL_IMAGETYPE = "zImage"
-KERNEL_DEVICETREE = "qcom-apq8064-arrow-sd-600eval.dtb"
+KERNEL_IMAGETYPE ?= "zImage"
+KERNEL_DEVICETREE ?= "qcom-apq8064-arrow-sd-600eval.dtb"
-SERIAL_CONSOLE = "115200 ttyMSM0"
+SERIAL_CONSOLE ?= "115200 ttyMSM0"
QCOM_BOOTIMG_ROOTFS ?= "mmcblk0p12"