summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Niebel <Markus.Niebel@ew.tq-group.com>2022-04-12 11:16:43 +0200
committerMarkus Niebel <Markus.Niebel@ew.tq-group.com>2022-04-12 14:30:43 +0200
commitc3a5e154b39e5696ffdc59566e9800b2d5daaffe (patch)
tree015fa9e83a47e9fdce4b44c83592df8761d5d52a
parentad4f5ddd5cf76adb6c2f85d32c224409c1e9f15b (diff)
downloadmeta-freescale-c3a5e154b39e5696ffdc59566e9800b2d5daaffe.tar.gz
Partially revert "qoriq-arm.inc: use weak defaults"
Although it seems a good idea to use a weak default for KERNEL_IMAGETYPE this cannot be achieved since kernel.bbclass does already a default assignment which has precedence over weak assignments. If a machine requeires other image types, KERNEL_IMAGETYPE needs to be assigned by the machine config file. Signed-off-by: Markus Niebel <Markus.Niebel@ew.tq-group.com> (cherry picked from commit 382b57379c51201af8c951898e1ae4ec98a93454)
-rw-r--r--conf/machine/include/qoriq-arm.inc4
1 files changed, 3 insertions, 1 deletions
diff --git a/conf/machine/include/qoriq-arm.inc b/conf/machine/include/qoriq-arm.inc
index 6941d3a4..89e9c4c0 100644
--- a/conf/machine/include/qoriq-arm.inc
+++ b/conf/machine/include/qoriq-arm.inc
@@ -1,6 +1,8 @@
1# Provides the common settings for QorIQ ARM 1# Provides the common settings for QorIQ ARM
2 2
3KERNEL_IMAGETYPE ??= "uImage" 3# default assignment to override defaults from kernel.bbclass
4# should be assigned by machine if other type needed
5KERNEL_IMAGETYPE ?= "uImage"
4 6
5SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0 115200;ttyAMA0" 7SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0 115200;ttyAMA0"
6SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}" 8SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"