summaryrefslogtreecommitdiffstats
path: root/conf/machine/include/imx-base.inc
diff options
context:
space:
mode:
authorTom Hochstein <tom.hochstein@nxp.com>2019-02-27 13:23:49 -0600
committerTom Hochstein <tom.hochstein@nxp.com>2019-02-27 15:01:35 -0600
commit77e56f3029caab422bd0dbfcc0d559ecf0183e05 (patch)
tree4a592a0f85699d9719869c4a1bce63b9c9cfdb28 /conf/machine/include/imx-base.inc
parent44db9c85e5ae9ed6be8dd2b0ff32badc62521b6e (diff)
downloadmeta-freescale-77e56f3029caab422bd0dbfcc0d559ecf0183e05.tar.gz
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 <tom.hochstein@nxp.com>
Diffstat (limited to 'conf/machine/include/imx-base.inc')
-rw-r--r--conf/machine/include/imx-base.inc12
1 files changed, 8 insertions, 4 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index b95bee9e..59dd41ae 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}"
313# Certain machines override the default fsl u-boot with the 313# Certain machines override the default fsl u-boot with the
314# fslc u-boot. To restore the fsl u-boot, add use-fsl-bsp like this: 314# fslc u-boot. To restore the fsl u-boot, add use-fsl-bsp like this:
315# MACHINEOVERRIDES_prepend_imx6ulevk = "use-fsl-bsp:" 315# MACHINEOVERRIDES_prepend_imx6ulevk = "use-fsl-bsp:"
316UBOOT_MAKE_TARGET_use-fsl-bsp = "u-boot.imx" 316UBOOT_MAKE_TARGET_use-fsl-bsp_mx6 = "u-boot.imx"
317UBOOT_SUFFIX_use-fsl-bsp = "imx" 317UBOOT_SUFFIX_use-fsl-bsp_mx6 = "imx"
318SPL_BINARY_use-fsl-bsp = "" 318SPL_BINARY_use-fsl-bsp_mx6 = ""
319WKS_FILE_use-fsl-bsp = "imx-uboot-bootpart.wks" 319WKS_FILE_use-fsl-bsp_mx6 = "imx-uboot-bootpart.wks"
320UBOOT_MAKE_TARGET_use-fsl-bsp_mx7 = "u-boot.imx"
321UBOOT_SUFFIX_use-fsl-bsp_mx7 = "imx"
322SPL_BINARY_use-fsl-bsp_mx7 = ""
323WKS_FILE_use-fsl-bsp_mx7 = "imx-uboot-bootpart.wks"
320 324
321SERIAL_CONSOLES = "115200;ttymxc0" 325SERIAL_CONSOLES = "115200;ttymxc0"
322SERIAL_CONSOLES_mxs = "115200;ttyAMA0" 326SERIAL_CONSOLES_mxs = "115200;ttyAMA0"