From 1323b81259d2cf7c1d943658320a5f7128830aac Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 13 Dec 2022 20:54:32 -0300 Subject: imx-base.inc: Use generic-bsp to define the WKS_FILE for mx8 devices 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 --- conf/machine/include/imx-base.inc | 4 +--- 1 file changed, 1 insertion(+), 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 = " \ " SOC_DEFAULT_WKS_FILE ?= "imx-uboot-bootpart.wks.in" -SOC_DEFAULT_WKS_FILE:mx8m-nxp-bsp ?= "imx-imx-boot-bootpart.wks.in" - -SOC_DEFAULT_WKS_FILE:mx8-nxp-bsp ?= "imx-imx-boot-bootpart.wks.in" +SOC_DEFAULT_WKS_FILE:mx8-generic-bsp ?= "imx-imx-boot-bootpart.wks.in" SOC_DEFAULT_WKS_FILE:mxs-generic-bsp ?= "imx-uboot-mxs-bootpart.wks.in" WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" -- cgit v1.2.3-54-g00ecf