diff options
| author |   Otavio Salvador <otavio@ossystems.com.br> | 2022-04-13 12:54:16 -0300 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2022-04-13 12:54:16 -0300 |
| commit | 470da01b34b538d8b2a9bf9da512b89f4f76c7f9 (patch) | |
| tree | c4ebf5ffbfe9dcd61a0862c40be858eafc7cddc7 | |
| parent | 106657d1a44616ebfb0481762925953a3c823c68 (diff) | |
| parent | 31667ec5f498f4905f14eb19336720218764a57e (diff) | |
| download | meta-freescale-hardknott.tar.gz meta-freescale-hardknott.tar.bz2 meta-freescale-hardknott.zip | |
Merge pull request #1050 from Freescale/backport-1049-to-hardknotthardknott
[Backport hardknott] 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 15ec502d..16142bd8 100644 --- a/conf/machine/include/qoriq-base.inc +++ b/conf/machine/include/qoriq-base.inc @@ -34,7 +34,7 @@ SOC_DEFAULT_WKS_FILE ?= "" SOC_DEFAULT_WKS_FILE_ls1043a ?= "ls104x-uboot-bootpart.wks.in" SOC_DEFAULT_WKS_FILE_ls1046a ?= "ls104x-uboot-bootpart.wks.in" -WKS_FILE ??= "${SOC_DEFAULT_WKS_FILE}" +WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" MACHINE_FEATURES ?= "pci ext2 ext3 serial" MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf udev-rules-qoriq kernel-modules" |