diff options
Diffstat (limited to 'conf')
-rw-r--r-- | conf/machine/include/imx-base.inc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 4221321f..d17fee1c 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
@@ -371,17 +371,17 @@ SOC_DEFAULT_WKS_FILE_mxs ?= "imx-uboot-mxs-bootpart.wks.in" | |||
371 | 371 | ||
372 | WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" | 372 | WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" |
373 | 373 | ||
374 | # Certain machines override the default fsl u-boot with the | 374 | # Certain machines are set to use the mainline u-boot by default |
375 | # fslc u-boot. To restore the fsl u-boot, add use-fsl-bsp like this: | 375 | # to encourage syncronization with mainline. Undo that here for |
376 | # MACHINEOVERRIDES_prepend_imx6ulevk = "use-fsl-bsp:" | 376 | # machines that don't work with mainline. |
377 | UBOOT_MAKE_TARGET_use-fsl-bsp_mx6 = "u-boot.imx" | 377 | UBOOT_MAKE_TARGET_use-nxp-bsp_mx6 = "u-boot.imx" |
378 | UBOOT_SUFFIX_use-fsl-bsp_mx6 = "imx" | 378 | UBOOT_SUFFIX_use-nxp-bsp_mx6 = "imx" |
379 | SPL_BINARY_use-fsl-bsp_mx6 = "" | 379 | SPL_BINARY_use-nxp-bsp_mx6 = "" |
380 | WKS_FILE_use-fsl-bsp_mx6 = "imx-uboot-bootpart.wks.in" | 380 | WKS_FILE_use-nxp-bsp_mx6 = "imx-uboot-bootpart.wks.in" |
381 | UBOOT_MAKE_TARGET_use-fsl-bsp_mx7 = "u-boot.imx" | 381 | UBOOT_MAKE_TARGET_use-nxp-bsp_mx7 = "u-boot.imx" |
382 | UBOOT_SUFFIX_use-fsl-bsp_mx7 = "imx" | 382 | UBOOT_SUFFIX_use-nxp-bsp_mx7 = "imx" |
383 | SPL_BINARY_use-fsl-bsp_mx7 = "" | 383 | SPL_BINARY_use-nxp-bsp_mx7 = "" |
384 | WKS_FILE_use-fsl-bsp_mx7 = "imx-uboot-bootpart.wks.in" | 384 | WKS_FILE_use-nxp-bsp_mx7 = "imx-uboot-bootpart.wks.in" |
385 | 385 | ||
386 | SERIAL_CONSOLES = "115200;ttymxc0" | 386 | SERIAL_CONSOLES = "115200;ttymxc0" |
387 | SERIAL_CONSOLES_mxs = "115200;ttyAMA0" | 387 | SERIAL_CONSOLES_mxs = "115200;ttyAMA0" |