From 31667ec5f498f4905f14eb19336720218764a57e Mon Sep 17 00:00:00 2001 From: Vinicius Aquino Date: Wed, 13 Apr 2022 11:14:58 -0300 Subject: 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 (cherry picked from commit 36aaa03a481806c63f116f1c3e9138eb5cb2fa5f) --- conf/machine/include/qoriq-base.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" -- cgit v1.2.3-54-g00ecf