diff options
-rw-r--r-- | conf/machine/imx6qdlsabreauto.conf | 4 | ||||
-rw-r--r-- | conf/machine/imx6qdlsabresd.conf | 4 | ||||
-rw-r--r-- | conf/machine/include/imx-base.inc | 12 |
3 files changed, 8 insertions, 12 deletions
diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf index 16c1dcb6..a6d5908b 100644 --- a/conf/machine/imx6qdlsabreauto.conf +++ b/conf/machine/imx6qdlsabreauto.conf | |||
@@ -40,6 +40,10 @@ UBOOT_SUFFIX = "img" | |||
40 | SPL_BINARY = "SPL" | 40 | SPL_BINARY = "SPL" |
41 | WKS_FILE = "imx-uboot-spl-bootpart.wks.in" | 41 | WKS_FILE = "imx-uboot-spl-bootpart.wks.in" |
42 | 42 | ||
43 | # The fsl distro uses u-boot-imx which does not provide unified functionality | ||
44 | # for dl/q/qp SoC variants. Change the defconfig to the targeted SoC variant. | ||
45 | UBOOT_MACHINE_fsl = "mx6qsabreauto_defconfig" | ||
46 | |||
43 | SERIAL_CONSOLES = "115200;ttymxc3" | 47 | SERIAL_CONSOLES = "115200;ttymxc3" |
44 | 48 | ||
45 | MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k" | 49 | MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k" |
diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf index 2fe95dc6..406ad7d7 100644 --- a/conf/machine/imx6qdlsabresd.conf +++ b/conf/machine/imx6qdlsabresd.conf | |||
@@ -49,6 +49,10 @@ UBOOT_SUFFIX = "img" | |||
49 | SPL_BINARY = "SPL" | 49 | SPL_BINARY = "SPL" |
50 | WKS_FILE = "imx-uboot-spl-bootpart.wks.in" | 50 | WKS_FILE = "imx-uboot-spl-bootpart.wks.in" |
51 | 51 | ||
52 | # The fsl distro uses u-boot-imx which does not provide unified functionality | ||
53 | # for dl/q/qp SoC variants. Change the defconfig to the targeted SoC variant. | ||
54 | UBOOT_MACHINE_fsl = "mx6qsabresd_defconfig" | ||
55 | |||
52 | SERIAL_CONSOLES = "115200;ttymxc0" | 56 | SERIAL_CONSOLES = "115200;ttymxc0" |
53 | 57 | ||
54 | MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k" | 58 | MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k" |
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 | ||