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.inc12
1 files changed, 0 insertions, 12 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 1fccf1d8..16f2f509 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -372,18 +372,6 @@ SOC_DEFAULT_WKS_FILE_mxs ?= "imx-uboot-mxs-bootpart.wks.in"
372 372
373WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" 373WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}"
374 374
375# Certain machines are set to use the mainline u-boot by default
376# to encourage syncronization with mainline. Undo that here for
377# machines that don't work with mainline.
378UBOOT_MAKE_TARGET_use-nxp-bsp_mx6 = "u-boot.imx"
379UBOOT_SUFFIX_use-nxp-bsp_mx6 = "imx"
380SPL_BINARY_use-nxp-bsp_mx6 = ""
381WKS_FILE_use-nxp-bsp_mx6 = "imx-uboot-bootpart.wks.in"
382UBOOT_MAKE_TARGET_use-nxp-bsp_mx7 = "u-boot.imx"
383UBOOT_SUFFIX_use-nxp-bsp_mx7 = "imx"
384SPL_BINARY_use-nxp-bsp_mx7 = ""
385WKS_FILE_use-nxp-bsp_mx7 = "imx-uboot-bootpart.wks.in"
386
387SERIAL_CONSOLES = "115200;ttymxc0" 375SERIAL_CONSOLES = "115200;ttymxc0"
388SERIAL_CONSOLES_mxs = "115200;ttyAMA0" 376SERIAL_CONSOLES_mxs = "115200;ttyAMA0"
389 377