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 6314a20e..8ade0cac 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -382,18 +382,6 @@ SOC_DEFAULT_WKS_FILE_mxs ?= "imx-uboot-mxs-bootpart.wks.in"
382 382
383WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" 383WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}"
384 384
385# Certain machines are set to use the mainline u-boot by default
386# to encourage syncronization with mainline. Undo that here for
387# machines that don't work with mainline.
388UBOOT_MAKE_TARGET_use-nxp-bsp_mx6 = "u-boot.imx"
389UBOOT_SUFFIX_use-nxp-bsp_mx6 = "imx"
390SPL_BINARY_use-nxp-bsp_mx6 = ""
391WKS_FILE_use-nxp-bsp_mx6 = "imx-uboot-bootpart.wks.in"
392UBOOT_MAKE_TARGET_use-nxp-bsp_mx7 = "u-boot.imx"
393UBOOT_SUFFIX_use-nxp-bsp_mx7 = "imx"
394SPL_BINARY_use-nxp-bsp_mx7 = ""
395WKS_FILE_use-nxp-bsp_mx7 = "imx-uboot-bootpart.wks.in"
396
397SERIAL_CONSOLES = "115200;ttymxc0" 385SERIAL_CONSOLES = "115200;ttymxc0"
398SERIAL_CONSOLES_mxs = "115200;ttyAMA0" 386SERIAL_CONSOLES_mxs = "115200;ttyAMA0"
399 387