diff options
author | Tom Hochstein <tom.hochstein@nxp.com> | 2021-03-12 23:21:43 -0600 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2021-03-13 13:17:03 -0300 |
commit | cc4b91bf3a3cf5c2034372c607783048aae44b65 (patch) | |
tree | 863d0c89dec3d9d80c9c6a547d6ef6b2e1f3270e /conf/machine/imx6ulevk.conf | |
parent | acefa6862884d1c8d06ead73e4088bc91e54b3ce (diff) | |
download | meta-freescale-cc4b91bf3a3cf5c2034372c607783048aae44b65.tar.gz |
imx6*.conf: Rework machine assignments for u-boot variables
The u-boot settings in imx6qdlsabresd, imx6qdlsabreauto, and imx6ulevk are
set to values that are correct for u-boot-fslc. Attempts to override these
settings to fix u-boot-imx builds have broken u-boot-fslc builds, and
vice versa. The u-boot-imx build is currently broken:
```
| install: cannot stat '/opt/work/upstream/fsl-xwayland/tmp/work/imx6qdlsabresd-fsl-linux-gnueabi/u-boot-imx/2020.04-r0/build/u-boot.img': No such file or directory
```
Rework the u-boot-fslc-specific overrides so they are used conditionally
only for u-boot-fslc. The default settings are correct for u-boot-imx.
Fixes: 880dbf2 ("fsl-base.inc: use conditional assignment for base variables")
Fixes: e83f54d ("machines: imx-base.inc: fix failing u-boot builds")
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Diffstat (limited to 'conf/machine/imx6ulevk.conf')
-rw-r--r-- | conf/machine/imx6ulevk.conf | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf index a8acb43d..63047d02 100644 --- a/conf/machine/imx6ulevk.conf +++ b/conf/machine/imx6ulevk.conf | |||
@@ -23,11 +23,12 @@ KERNEL_DEVICETREE = " \ | |||
23 | " | 23 | " |
24 | KERNEL_DEVICETREE_use-mainline-bsp = "imx6ul-14x14-evk.dtb" | 24 | KERNEL_DEVICETREE_use-mainline-bsp = "imx6ul-14x14-evk.dtb" |
25 | 25 | ||
26 | # Use fslc u-boot by default. See also imx-base.inc. | 26 | # These u-boot variables default to the correct settings for u-boot-imx. |
27 | UBOOT_MAKE_TARGET = "" | 27 | # Set overrides for u-boot-fslc. |
28 | UBOOT_SUFFIX = "img" | 28 | UBOOT_MAKE_TARGET_pn-u-boot-fslc = "" |
29 | SPL_BINARY = "SPL" | 29 | UBOOT_SUFFIX_pn-u-boot-fslc = "img" |
30 | WKS_FILE = "imx-uboot-spl-bootpart.wks.in" | 30 | SPL_BINARY_pn-u-boot-fslc = "SPL" |
31 | WKS_FILE_pn-u-boot-fslc = "imx-uboot-spl-bootpart.wks.in" | ||
31 | 32 | ||
32 | UBOOT_CONFIG ??= " \ | 33 | UBOOT_CONFIG ??= " \ |
33 | sd \ | 34 | sd \ |