summaryrefslogtreecommitdiffstats
path: root/conf/machine/include
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2021-01-25 15:53:45 +0100
committerOtavio Salvador <otavio@ossystems.com.br>2021-01-26 08:24:15 -0300
commitb6e910abdea72f9cd6336c4eeecdf8646e3543c2 (patch)
tree9acb4e06a4544a6055ac319ddf13dd006f74c23b /conf/machine/include
parent67dbd8b8d7d4dd00e91d8c82e0118746e7a0eb8b (diff)
downloadmeta-freescale-b6e910abdea72f9cd6336c4eeecdf8646e3543c2.tar.gz
machines: imx-base.inc: fix failing u-boot builds
If using a fsl-xxx distro the prefered provider of U-Boot is u-boot-imx. That U-Boot didn't make the switch to a unified dl/q/qp binary and does not use an spl. For the imx6ulevk it does not use an spl. The below commits try to address that, however the change is not limited to - the fsl distro but rather uses use-nxp-bsp which can be used with any distro - some machines which do not use u-boot-imx, e.g. colibri-imx6 now fail. Fix this by moving the configuration into the affected distro in meta-freescale-distro and the machines. Fixes: c9757ea3 ("imx-base.inc: Fix use-nxp-bsp after rework") 77e56f30 ("imx-base.inc: Limit use-fsl-bsp u-boot overrides to i.MX 6 and 7") e5cd33c9 ("u-boot.imx: Add u-boot configuration for fsl") Build tested with fsl-xwayland & use-nxp-bsp for imx6qdlsabreauto, imx6qdlsabresd, and imx6ulevk. Build tested with the fslc-xwayland & use-nxp-bsp for imx6qdlsabreauto, imx6qdlsabresd, imx6ulevk, and colibri-imx6. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'conf/machine/include')
-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