diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2022-04-05 09:39:46 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-05 09:39:46 -0300 |
| commit | 9326568f273b4932dcc40a841708011819cf20f0 (patch) | |
| tree | 6ea1fabe3efe23faa251d5ccaeb90784d412e76e | |
| parent | e07e3775c15b185898ff1dfc8a4f4b027bd05113 (diff) | |
| parent | 72205af93516f2644c61120744b63465bbef1607 (diff) | |
| download | meta-freescale-9326568f273b4932dcc40a841708011819cf20f0.tar.gz | |
Merge pull request #1034 from niebelm/backport-qoriq-weak-wks-default
backport 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 16142bd8..15ec502d 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" |