From d2a57e90bd9eee7b7bf6c76345197ce946aa356f Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 27 Feb 2019 13:23:49 -0600 Subject: imx-base.inc: Limit use-fsl-bsp u-boot overrides to i.MX 6 and 7 The u-boot overrides are appropriate for i.MX 6 and 7 only and break i.MX 8 builds. Signed-off-by: Tom Hochstein (cherry picked from commit 77e56f3029caab422bd0dbfcc0d559ecf0183e05) --- conf/machine/include/imx-base.inc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 012af537..3af3f5f0 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -313,10 +313,14 @@ 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 = "u-boot.imx" -UBOOT_SUFFIX_use-fsl-bsp = "imx" -SPL_BINARY_use-fsl-bsp = "" -WKS_FILE_use-fsl-bsp = "imx-uboot-bootpart.wks" +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" +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" SERIAL_CONSOLE = "115200 ttymxc0" SERIAL_CONSOLE_mxs = "115200 ttyAMA0" -- cgit v1.2.3-54-g00ecf