summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2022-12-13 20:54:32 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2022-12-13 20:59:26 -0300
commit1323b81259d2cf7c1d943658320a5f7128830aac (patch)
tree72e0a50e180389b70cfa5297e83bafe0f1a05f14
parent37efa65108d367fd28cb0aa6ae789670e7358ae7 (diff)
downloadmeta-freescale-topic/u-boot-upgrade.tar.gz
imx-base.inc: Use generic-bsp to define the WKS_FILE for mx8 devicestopic/u-boot-upgrade
The bootloader support is generic however the override in use was nxp-bsp and causing the wrong wks file being used in the mainline BSP case. This commit changes the override and also remove the mx8m specific setting as it is redundant. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r--conf/machine/include/imx-base.inc4
1 files changed, 1 insertions, 3 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index e3b6dc76..771b6f29 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -543,9 +543,7 @@ WKS_FILE_DEPENDS:append:imx-generic-bsp:aarch64 = " \
543" 543"
544 544
545SOC_DEFAULT_WKS_FILE ?= "imx-uboot-bootpart.wks.in" 545SOC_DEFAULT_WKS_FILE ?= "imx-uboot-bootpart.wks.in"
546SOC_DEFAULT_WKS_FILE:mx8m-nxp-bsp ?= "imx-imx-boot-bootpart.wks.in" 546SOC_DEFAULT_WKS_FILE:mx8-generic-bsp ?= "imx-imx-boot-bootpart.wks.in"
547
548SOC_DEFAULT_WKS_FILE:mx8-nxp-bsp ?= "imx-imx-boot-bootpart.wks.in"
549SOC_DEFAULT_WKS_FILE:mxs-generic-bsp ?= "imx-uboot-mxs-bootpart.wks.in" 547SOC_DEFAULT_WKS_FILE:mxs-generic-bsp ?= "imx-uboot-mxs-bootpart.wks.in"
550 548
551WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" 549WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}"