diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2022-04-13 11:56:16 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-13 11:56:16 -0300 |
| commit | 8aa0cac47b390f127e46d1eac541e5ef1ecf711f (patch) | |
| tree | 8f1a88cd1f15846947b634f3b08732d935f78fb8 | |
| parent | 08c9507c6ac3930f4ef9cc18df37360b4995234a (diff) | |
| parent | 36aaa03a481806c63f116f1c3e9138eb5cb2fa5f (diff) | |
| download | meta-freescale-8aa0cac47b390f127e46d1eac541e5ef1ecf711f.tar.gz | |
Merge pull request #1049 from Ossanes/topic/revert-wks-file-assigment
Revert "qoriq-base: weak defaults for WKS_FILE"
| -rw-r--r-- | conf/machine/include/qoriq-base.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/machine/include/qoriq-base.inc b/conf/machine/include/qoriq-base.inc index f6e96baf..35b7d82e 100644 --- a/conf/machine/include/qoriq-base.inc +++ b/conf/machine/include/qoriq-base.inc | |||
| @@ -34,7 +34,7 @@ SOC_DEFAULT_WKS_FILE ?= "" | |||
| 34 | SOC_DEFAULT_WKS_FILE:ls1043a ?= "ls104x-uboot-bootpart.wks.in" | 34 | SOC_DEFAULT_WKS_FILE:ls1043a ?= "ls104x-uboot-bootpart.wks.in" |
| 35 | SOC_DEFAULT_WKS_FILE:ls1046a ?= "ls104x-uboot-bootpart.wks.in" | 35 | SOC_DEFAULT_WKS_FILE:ls1046a ?= "ls104x-uboot-bootpart.wks.in" |
| 36 | 36 | ||
| 37 | WKS_FILE ??= "${SOC_DEFAULT_WKS_FILE}" | 37 | WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" |
| 38 | 38 | ||
| 39 | MACHINE_FEATURES ?= "pci ext2 ext3 serial" | 39 | MACHINE_FEATURES ?= "pci ext2 ext3 serial" |
| 40 | MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf udev-rules-qoriq kernel-modules" | 40 | MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf udev-rules-qoriq kernel-modules" |