From ffc8378a52c9b3006d2dc27ea115e8673831b90b Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Fri, 4 Dec 2020 12:11:38 -0600 Subject: imx-base.inc: Fix use-nxp-bsp after rework The use-*-bsp rework renamed use-fsl-bsp to use-nxp-bsp. It also added to MACHINEOVERRIDES automatically, so fix the comment as well. Signed-off-by: Tom Hochstein (cherry picked from commit c9757ea36f8472d75cb5c6d9abbbe5c3ed2e826b) --- conf/machine/include/imx-base.inc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 6295ccd0..1fccf1d8 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -372,17 +372,17 @@ SOC_DEFAULT_WKS_FILE_mxs ?= "imx-uboot-mxs-bootpart.wks.in" WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" -# Certain machines override the default fsl u-boot with the -# fslc u-boot. To restore the fsl u-boot, add use-fsl-bsp like this: -# MACHINEOVERRIDES_prepend_imx6ulevk = "use-fsl-bsp:" -UBOOT_MAKE_TARGET_use-fsl-bsp_mx6 = "u-boot.imx" -UBOOT_SUFFIX_use-fsl-bsp_mx6 = "imx" -SPL_BINARY_use-fsl-bsp_mx6 = "" -WKS_FILE_use-fsl-bsp_mx6 = "imx-uboot-bootpart.wks.in" -UBOOT_MAKE_TARGET_use-fsl-bsp_mx7 = "u-boot.imx" -UBOOT_SUFFIX_use-fsl-bsp_mx7 = "imx" -SPL_BINARY_use-fsl-bsp_mx7 = "" -WKS_FILE_use-fsl-bsp_mx7 = "imx-uboot-bootpart.wks.in" +# Certain machines are set to use the mainline u-boot by default +# to encourage syncronization with mainline. Undo that here for +# machines that don't work with mainline. +UBOOT_MAKE_TARGET_use-nxp-bsp_mx6 = "u-boot.imx" +UBOOT_SUFFIX_use-nxp-bsp_mx6 = "imx" +SPL_BINARY_use-nxp-bsp_mx6 = "" +WKS_FILE_use-nxp-bsp_mx6 = "imx-uboot-bootpart.wks.in" +UBOOT_MAKE_TARGET_use-nxp-bsp_mx7 = "u-boot.imx" +UBOOT_SUFFIX_use-nxp-bsp_mx7 = "imx" +SPL_BINARY_use-nxp-bsp_mx7 = "" +WKS_FILE_use-nxp-bsp_mx7 = "imx-uboot-bootpart.wks.in" SERIAL_CONSOLES = "115200;ttymxc0" SERIAL_CONSOLES_mxs = "115200;ttyAMA0" -- cgit v1.2.3-54-g00ecf