diff options
| author | Markus Niebel <Markus.Niebel@ew.tq-group.com> | 2022-04-12 09:47:32 +0200 |
|---|---|---|
| committer | Markus Niebel <Markus.Niebel@ew.tq-group.com> | 2022-04-12 14:30:31 +0200 |
| commit | a2dbffc4e8bb52a9693eabd801e8c87ab56e6f71 (patch) | |
| tree | 90f134dc74f7c8b0ef6da79940497671efa46bc0 | |
| parent | 1ff0b6f266e305f951c2aaba28afe2c6a9d99f97 (diff) | |
| download | meta-freescale-a2dbffc4e8bb52a9693eabd801e8c87ab56e6f71.tar.gz | |
Revert "qoriq-arm64.inc: use weak defaults"
This reverts commit 9d5c49f8c604f117da0995f8946ff04c17caada9.
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 to bring old behaviour back.
Signed-off-by: Markus Niebel <Markus.Niebel@ew.tq-group.com>
(cherry picked from commit 50ba80364cf6d34226100049e42a8b7b0be545ba)
| -rw-r--r-- | conf/machine/include/qoriq-arm64.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/conf/machine/include/qoriq-arm64.inc b/conf/machine/include/qoriq-arm64.inc index 73a7cdcf..e8d99a6e 100644 --- a/conf/machine/include/qoriq-arm64.inc +++ b/conf/machine/include/qoriq-arm64.inc | |||
| @@ -2,8 +2,8 @@ | |||
| 2 | 2 | ||
| 3 | KERNEL_IMAGETYPE ?= "Image" | 3 | KERNEL_IMAGETYPE ?= "Image" |
| 4 | 4 | ||
| 5 | SERIAL_CONSOLES ??= "115200;ttyS0 115200;ttyS1 115200;ttyAMA0" | 5 | SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyAMA0" |
| 6 | SERIAL_CONSOLES_CHECK ??= "${SERIAL_CONSOLES}" | 6 | SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}" |
| 7 | 7 | ||
| 8 | MACHINEOVERRIDES =. "qoriq-arm64:" | 8 | MACHINEOVERRIDES =. "qoriq-arm64:" |
| 9 | 9 | ||