]> code.ossystems Code Review - meta-freescale.git/commit
imx6*.conf: Rework machine assignments for u-boot variables
authorTom Hochstein <tom.hochstein@nxp.com>
Sat, 13 Mar 2021 05:21:43 +0000 (23:21 -0600)
committerOtavio Salvador <otavio@ossystems.com.br>
Sat, 13 Mar 2021 16:17:03 +0000 (13:17 -0300)
commitcc4b91bf3a3cf5c2034372c607783048aae44b65
tree863d0c89dec3d9d80c9c6a547d6ef6b2e1f3270e
parentacefa6862884d1c8d06ead73e4088bc91e54b3ce
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>
conf/machine/imx6qdlsabreauto.conf
conf/machine/imx6qdlsabresd.conf
conf/machine/imx6ulevk.conf