diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2022-04-12 07:44:40 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-12 07:44:40 -0300 |
| commit | 40a91b314cce6cf9e974e1ddedbea60c64f98b66 (patch) | |
| tree | fc46e173dbf6254d184f0bb77ab27b417044aac4 | |
| parent | 18d4dbdbc8445fd91816caad3b74c4c64776e7fd (diff) | |
| parent | 382b57379c51201af8c951898e1ae4ec98a93454 (diff) | |
| download | meta-freescale-40a91b314cce6cf9e974e1ddedbea60c64f98b66.tar.gz | |
Merge pull request #1045 from niebelm/revert-pr-1039
Revert PR 1039
| -rw-r--r-- | conf/machine/include/qoriq-arm.inc | 8 | ||||
| -rw-r--r-- | conf/machine/include/qoriq-arm64.inc | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/conf/machine/include/qoriq-arm.inc b/conf/machine/include/qoriq-arm.inc index cd6470ca0..89e9c4c0c 100644 --- a/conf/machine/include/qoriq-arm.inc +++ b/conf/machine/include/qoriq-arm.inc | |||
| @@ -1,9 +1,11 @@ | |||
| 1 | # Provides the common settings for QorIQ ARM | 1 | # Provides the common settings for QorIQ ARM |
| 2 | 2 | ||
| 3 | KERNEL_IMAGETYPE ??= "uImage" | 3 | # default assignment to override defaults from kernel.bbclass |
| 4 | # should be assigned by machine if other type needed | ||
| 5 | KERNEL_IMAGETYPE ?= "uImage" | ||
| 4 | 6 | ||
| 5 | SERIAL_CONSOLES ??= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0 115200;ttyAMA0" | 7 | SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0 115200;ttyAMA0" |
| 6 | SERIAL_CONSOLES_CHECK ??= "${SERIAL_CONSOLES}" | 8 | SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}" |
| 7 | 9 | ||
| 8 | MACHINEOVERRIDES =. "qoriq-arm:" | 10 | MACHINEOVERRIDES =. "qoriq-arm:" |
| 9 | 11 | ||
diff --git a/conf/machine/include/qoriq-arm64.inc b/conf/machine/include/qoriq-arm64.inc index 73a7cdcfd..e8d99a6e5 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 | ||