From a99bfd038e09ee16e28ce95e0925594005ed9c06 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 13 Dec 2022 08:54:29 -0300 Subject: u-boot-fslc: Bump revision to cbd7eb17ac1 Apply following changes: cbd7eb17ac1 imx8mn-venice-u-boot: Fix broken boot f463aeddbbf imx8mn-ddr4-evk-u-boot: Fix broken boot d1920093874 imx6qdl-sabresd: Pass mmc alias 047ac33f481 wandboard: Pass mmc aliases Fixes: #1324, #1267 Signed-off-by: Otavio Salvador (cherry picked from commit 37efa65108d367fd28cb0aa6ae789670e7358ae7) --- recipes-bsp/u-boot/u-boot-fslc-common_2022.10.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-bsp/u-boot/u-boot-fslc-common_2022.10.inc b/recipes-bsp/u-boot/u-boot-fslc-common_2022.10.inc index dcc5a481..9e5cfe5e 100644 --- a/recipes-bsp/u-boot/u-boot-fslc-common_2022.10.inc +++ b/recipes-bsp/u-boot/u-boot-fslc-common_2022.10.inc @@ -10,7 +10,7 @@ DEPENDS += "flex-native bison-native" SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH};protocol=https" -SRCREV = "2c2dc1affbccd87625d77e3e6fce437c31f2d708" +SRCREV = "cbd7eb17ac1f781b9c511982e43d52f4304f0fd5" SRCBRANCH = "2022.10+fslc" PV = "2022.10+git${SRCPV}" -- cgit v1.2.3-54-g00ecf From bfc9a925d6f8c401f3c97c5601b0b1acceebb217 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 (cherry picked from commit 1323b81259d2cf7c1d943658320a5f7128830aac) --- 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 355ecaac..d5458165 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