diff options
| author | Vinicius Aquino <vinicius.aquino@ossystems.com.br> | 2022-04-13 11:14:58 -0300 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-04-13 15:26:47 +0000 |
| commit | 31667ec5f498f4905f14eb19336720218764a57e (patch) | |
| tree | c4ebf5ffbfe9dcd61a0862c40be858eafc7cddc7 | |
| parent | 106657d1a44616ebfb0481762925953a3c823c68 (diff) | |
| download | meta-freescale-31667ec5f498f4905f14eb19336720218764a57e.tar.gz | |
Revert "qoriq-base: weak defaults for WKS_FILE"
This reverts commit 451bafe6d6e0523d0f6143f6862bb6c5b42ac8f6.
This is necessary to follow the pattern used by imx-base.inc.
Also prevents the following error: "No kickstart files from
WKS_FILES were found"
It happens because WKS_FILE was already assigned and can't be
reassigned by SOC_DEFAULT_WKS_FILE due to a weaker assignment
(??=).
Signed-off-by: Vinicius Aquino <vinicius.aquino@ossystems.com.br>
(cherry picked from commit 36aaa03a481806c63f116f1c3e9138eb5cb2fa5f)
| -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 ?= "" | |||
| 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" |