diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2022-04-06 09:04:33 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-06 09:04:33 -0300 |
| commit | 1ff0b6f266e305f951c2aaba28afe2c6a9d99f97 (patch) | |
| tree | 0cc795e32cdfee7299366521fb25edad6d95aee5 | |
| parent | 9326568f273b4932dcc40a841708011819cf20f0 (diff) | |
| parent | 4e0062baa6c9be1c9ec3061e8888421406596912 (diff) | |
| download | meta-freescale-1ff0b6f266e305f951c2aaba28afe2c6a9d99f97.tar.gz | |
Merge pull request #1040 from niebelm/backport-qoriq-weak-console-default
Backport qoriq weak console default
| -rw-r--r-- | conf/machine/include/qoriq-arm.inc | 6 | ||||
| -rw-r--r-- | conf/machine/include/qoriq-arm64.inc | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/conf/machine/include/qoriq-arm.inc b/conf/machine/include/qoriq-arm.inc index eb03af43..cd6470ca 100644 --- a/conf/machine/include/qoriq-arm.inc +++ b/conf/machine/include/qoriq-arm.inc | |||
| @@ -1,9 +1,9 @@ | |||
| 1 | # Provides the common settings for QorIQ ARM | 1 | # Provides the common settings for QorIQ ARM |
| 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 | ||
diff --git a/conf/machine/include/qoriq-arm64.inc b/conf/machine/include/qoriq-arm64.inc index e8d99a6e..73a7cdcf 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 | ||