diff options
| author | Tom Hochstein <tom.hochstein@nxp.com> | 2019-02-27 13:23:49 -0600 |
|---|---|---|
| committer | Tom Hochstein <tom.hochstein@nxp.com> | 2019-02-27 15:01:35 -0600 |
| commit | 77e56f3029caab422bd0dbfcc0d559ecf0183e05 (patch) | |
| tree | 4a592a0f85699d9719869c4a1bce63b9c9cfdb28 | |
| parent | 44db9c85e5ae9ed6be8dd2b0ff32badc62521b6e (diff) | |
| download | meta-freescale-77e56f3029caab422bd0dbfcc0d559ecf0183e05.tar.gz | |
imx-base.inc: Limit use-fsl-bsp u-boot overrides to i.MX 6 and 7
The u-boot overrides are appropriate for i.MX 6 and 7 only and
break i.MX 8 builds.
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
| -rw-r--r-- | conf/machine/include/imx-base.inc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index b95bee9e1..59dd41aec 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
| @@ -313,10 +313,14 @@ WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" | |||
| 313 | # Certain machines override the default fsl u-boot with the | 313 | # Certain machines override the default fsl u-boot with the |
| 314 | # fslc u-boot. To restore the fsl u-boot, add use-fsl-bsp like this: | 314 | # fslc u-boot. To restore the fsl u-boot, add use-fsl-bsp like this: |
| 315 | # MACHINEOVERRIDES_prepend_imx6ulevk = "use-fsl-bsp:" | 315 | # MACHINEOVERRIDES_prepend_imx6ulevk = "use-fsl-bsp:" |
| 316 | UBOOT_MAKE_TARGET_use-fsl-bsp = "u-boot.imx" | 316 | UBOOT_MAKE_TARGET_use-fsl-bsp_mx6 = "u-boot.imx" |
| 317 | UBOOT_SUFFIX_use-fsl-bsp = "imx" | 317 | UBOOT_SUFFIX_use-fsl-bsp_mx6 = "imx" |
| 318 | SPL_BINARY_use-fsl-bsp = "" | 318 | SPL_BINARY_use-fsl-bsp_mx6 = "" |
| 319 | WKS_FILE_use-fsl-bsp = "imx-uboot-bootpart.wks" | 319 | WKS_FILE_use-fsl-bsp_mx6 = "imx-uboot-bootpart.wks" |
| 320 | UBOOT_MAKE_TARGET_use-fsl-bsp_mx7 = "u-boot.imx" | ||
| 321 | UBOOT_SUFFIX_use-fsl-bsp_mx7 = "imx" | ||
| 322 | SPL_BINARY_use-fsl-bsp_mx7 = "" | ||
| 323 | WKS_FILE_use-fsl-bsp_mx7 = "imx-uboot-bootpart.wks" | ||
| 320 | 324 | ||
| 321 | SERIAL_CONSOLES = "115200;ttymxc0" | 325 | SERIAL_CONSOLES = "115200;ttymxc0" |
| 322 | SERIAL_CONSOLES_mxs = "115200;ttyAMA0" | 326 | SERIAL_CONSOLES_mxs = "115200;ttyAMA0" |
