From c3a5e154b39e5696ffdc59566e9800b2d5daaffe Mon Sep 17 00:00:00 2001 From: Markus Niebel Date: Tue, 12 Apr 2022 11:16:43 +0200 Subject: 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 (cherry picked from commit 382b57379c51201af8c951898e1ae4ec98a93454) --- conf/machine/include/qoriq-arm.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 @@ # Provides the common settings for QorIQ ARM -KERNEL_IMAGETYPE ??= "uImage" +# default assignment to override defaults from kernel.bbclass +# should be assigned by machine if other type needed +KERNEL_IMAGETYPE ?= "uImage" SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0 115200;ttyAMA0" SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}" -- cgit v1.2.3-54-g00ecf