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/imx6qdlsabresd.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/imx6qdlsabresd.conf')
| -rw-r--r-- | conf/machine/imx6qdlsabresd.conf | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf index 406ad7d7..a2b959e3 100644 --- a/conf/machine/imx6qdlsabresd.conf +++ b/conf/machine/imx6qdlsabresd.conf | |||
| @@ -43,11 +43,12 @@ KERNEL_DEVICETREE_use-mainline-bsp = " \ | |||
| 43 | 43 | ||
| 44 | UBOOT_MACHINE ?= "mx6sabresd_defconfig" | 44 | UBOOT_MACHINE ?= "mx6sabresd_defconfig" |
| 45 | 45 | ||
| 46 | # Use fslc u-boot by default. See also imx-base.inc. | 46 | # These u-boot variables default to the correct settings for u-boot-imx. |
| 47 | UBOOT_MAKE_TARGET = "all" | 47 | # Set overrides for u-boot-fslc. |
| 48 | UBOOT_SUFFIX = "img" | 48 | UBOOT_MAKE_TARGET_pn-u-boot-fslc = "all" |
| 49 | SPL_BINARY = "SPL" | 49 | UBOOT_SUFFIX_pn-u-boot-fslc = "img" |
| 50 | WKS_FILE = "imx-uboot-spl-bootpart.wks.in" | 50 | SPL_BINARY_pn-u-boot-fslc = "SPL" |
| 51 | WKS_FILE_pn-u-boot-fslc = "imx-uboot-spl-bootpart.wks.in" | ||
| 51 | 52 | ||
| 52 | # The fsl distro uses u-boot-imx which does not provide unified functionality | 53 | # 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 | # for dl/q/qp SoC variants. Change the defconfig to the targeted SoC variant. |