diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2019-02-27 18:12:14 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-27 18:12:14 -0300 |
| commit | 02619f5a98486f63b03a72e692ca3895244a197a (patch) | |
| tree | 69ebad9b79abe12ea6b4940bbdf4e9812a7f24a7 /conf/machine | |
| parent | 44db9c85e5ae9ed6be8dd2b0ff32badc62521b6e (diff) | |
| parent | 34045a0f6982d112a13b407a7abb1d4c06f006e1 (diff) | |
| download | meta-freescale-02619f5a98486f63b03a72e692ca3895244a197a.tar.gz | |
Merge pull request #50 from thochstein/pr0227
Pr0227
Diffstat (limited to 'conf/machine')
| -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" |