diff options
author | Markus Niebel <Markus.Niebel@ew.tq-group.com> | 2022-04-12 10:41:05 +0200 |
---|---|---|
committer | Markus Niebel <Markus.Niebel@ew.tq-group.com> | 2022-04-12 14:30:37 +0200 |
commit | ad4f5ddd5cf76adb6c2f85d32c224409c1e9f15b (patch) | |
tree | ac005b119552061b97314bcbc8bb88b9babe2145 | |
parent | a2dbffc4e8bb52a9693eabd801e8c87ab56e6f71 (diff) | |
download | meta-freescale-ad4f5ddd5cf76adb6c2f85d32c224409c1e9f15b.tar.gz |
Partially revert "qoriq-arm.inc: use weak defaults"
Although it seems a good idea to use a weak default for SERIAL_CONSOLES
this cannot be achieved since bitbake.conf does a weak assignment after
the inclusion of machine config files. This will override the weak
assignment here. Revert the changes for SERIAL_CONSOLES variable to bring old
behaviour back.
Signed-off-by: Markus Niebel <Markus.Niebel@ew.tq-group.com>
(cherry picked from commit 9a71061c61e45cdebb26ba35c383f3b6af299e7d)
-rw-r--r-- | conf/machine/include/qoriq-arm.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/conf/machine/include/qoriq-arm.inc b/conf/machine/include/qoriq-arm.inc index cd6470ca..6941d3a4 100644 --- a/conf/machine/include/qoriq-arm.inc +++ b/conf/machine/include/qoriq-arm.inc | |||
@@ -2,8 +2,8 @@ | |||
2 | 2 | ||
3 | KERNEL_IMAGETYPE ??= "uImage" | 3 | KERNEL_IMAGETYPE ??= "uImage" |
4 | 4 | ||
5 | SERIAL_CONSOLES ??= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0 115200;ttyAMA0" | 5 | SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0 115200;ttyAMA0" |
6 | SERIAL_CONSOLES_CHECK ??= "${SERIAL_CONSOLES}" | 6 | SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}" |
7 | 7 | ||
8 | MACHINEOVERRIDES =. "qoriq-arm:" | 8 | MACHINEOVERRIDES =. "qoriq-arm:" |
9 | 9 | ||