diff options
Diffstat (limited to 'conf/machine/include/imx-base.inc')
-rw-r--r-- | conf/machine/include/imx-base.inc | 12 |
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 | ||
373 | WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" | 373 | WKS_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. | ||
378 | UBOOT_MAKE_TARGET_use-nxp-bsp_mx6 = "u-boot.imx" | ||
379 | UBOOT_SUFFIX_use-nxp-bsp_mx6 = "imx" | ||
380 | SPL_BINARY_use-nxp-bsp_mx6 = "" | ||
381 | WKS_FILE_use-nxp-bsp_mx6 = "imx-uboot-bootpart.wks.in" | ||
382 | UBOOT_MAKE_TARGET_use-nxp-bsp_mx7 = "u-boot.imx" | ||
383 | UBOOT_SUFFIX_use-nxp-bsp_mx7 = "imx" | ||
384 | SPL_BINARY_use-nxp-bsp_mx7 = "" | ||
385 | WKS_FILE_use-nxp-bsp_mx7 = "imx-uboot-bootpart.wks.in" | ||
386 | |||
387 | SERIAL_CONSOLES = "115200;ttymxc0" | 375 | SERIAL_CONSOLES = "115200;ttymxc0" |
388 | SERIAL_CONSOLES_mxs = "115200;ttyAMA0" | 376 | SERIAL_CONSOLES_mxs = "115200;ttyAMA0" |
389 | 377 | ||