diff options
Diffstat (limited to 'conf/machine/include')
-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 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 | ||
383 | WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" | 383 | WKS_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. | ||
388 | UBOOT_MAKE_TARGET_use-nxp-bsp_mx6 = "u-boot.imx" | ||
389 | UBOOT_SUFFIX_use-nxp-bsp_mx6 = "imx" | ||
390 | SPL_BINARY_use-nxp-bsp_mx6 = "" | ||
391 | WKS_FILE_use-nxp-bsp_mx6 = "imx-uboot-bootpart.wks.in" | ||
392 | UBOOT_MAKE_TARGET_use-nxp-bsp_mx7 = "u-boot.imx" | ||
393 | UBOOT_SUFFIX_use-nxp-bsp_mx7 = "imx" | ||
394 | SPL_BINARY_use-nxp-bsp_mx7 = "" | ||
395 | WKS_FILE_use-nxp-bsp_mx7 = "imx-uboot-bootpart.wks.in" | ||
396 | |||
397 | SERIAL_CONSOLES = "115200;ttymxc0" | 385 | SERIAL_CONSOLES = "115200;ttymxc0" |
398 | SERIAL_CONSOLES_mxs = "115200;ttyAMA0" | 386 | SERIAL_CONSOLES_mxs = "115200;ttyAMA0" |
399 | 387 | ||