summaryrefslogtreecommitdiffstats
path: root/conf/machine/include/imx-base.inc
diff options
context:
space:
mode:
Diffstat (limited to 'conf/machine/include/imx-base.inc')
-rw-r--r--conf/machine/include/imx-base.inc22
1 files changed, 11 insertions, 11 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index a1a6a8d6..3800ede0 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -380,17 +380,17 @@ SOC_DEFAULT_WKS_FILE_mxs ?= "imx-uboot-mxs-bootpart.wks.in"
380 380
381WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" 381WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}"
382 382
383# Certain machines override the default fsl u-boot with the 383# Certain machines are set to use the mainline u-boot by default
384# fslc u-boot. To restore the fsl u-boot, add use-fsl-bsp like this: 384# to encourage syncronization with mainline. Undo that here for
385# MACHINEOVERRIDES_prepend_imx6ulevk = "use-fsl-bsp:" 385# machines that don't work with mainline.
386UBOOT_MAKE_TARGET_use-fsl-bsp_mx6 = "u-boot.imx" 386UBOOT_MAKE_TARGET_use-nxp-bsp_mx6 = "u-boot.imx"
387UBOOT_SUFFIX_use-fsl-bsp_mx6 = "imx" 387UBOOT_SUFFIX_use-nxp-bsp_mx6 = "imx"
388SPL_BINARY_use-fsl-bsp_mx6 = "" 388SPL_BINARY_use-nxp-bsp_mx6 = ""
389WKS_FILE_use-fsl-bsp_mx6 = "imx-uboot-bootpart.wks.in" 389WKS_FILE_use-nxp-bsp_mx6 = "imx-uboot-bootpart.wks.in"
390UBOOT_MAKE_TARGET_use-fsl-bsp_mx7 = "u-boot.imx" 390UBOOT_MAKE_TARGET_use-nxp-bsp_mx7 = "u-boot.imx"
391UBOOT_SUFFIX_use-fsl-bsp_mx7 = "imx" 391UBOOT_SUFFIX_use-nxp-bsp_mx7 = "imx"
392SPL_BINARY_use-fsl-bsp_mx7 = "" 392SPL_BINARY_use-nxp-bsp_mx7 = ""
393WKS_FILE_use-fsl-bsp_mx7 = "imx-uboot-bootpart.wks.in" 393WKS_FILE_use-nxp-bsp_mx7 = "imx-uboot-bootpart.wks.in"
394 394
395SERIAL_CONSOLES = "115200;ttymxc0" 395SERIAL_CONSOLES = "115200;ttymxc0"
396SERIAL_CONSOLES_mxs = "115200;ttyAMA0" 396SERIAL_CONSOLES_mxs = "115200;ttyAMA0"