diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2025-03-28 13:27:48 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-28 13:27:48 -0300 |
| commit | 86b3de153fd15fd12756a744ee4fbfc9d11d057f (patch) | |
| tree | 2593c7b73ba73cbda1b782ecd6b53ed8bd984ce7 | |
| parent | ca922c12f3bb32d7e1d6a500fc7f6325ed3d48b0 (diff) | |
| parent | 896fce3bc4c6a272428d2d9c93bdf462e20ab263 (diff) | |
| download | meta-freescale-86b3de153fd15fd12756a744ee4fbfc9d11d057f.tar.gz | |
Merge pull request #2162 from nxp-upstream/fixup
Machine config fixes for imx6sllevk and mx91-generic-bsp
| -rw-r--r-- | conf/machine/imx6sllevk.conf | 3 | ||||
| -rw-r--r-- | conf/machine/include/imx-base.inc | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/conf/machine/imx6sllevk.conf b/conf/machine/imx6sllevk.conf index 5a1dc666..858699c9 100644 --- a/conf/machine/imx6sllevk.conf +++ b/conf/machine/imx6sllevk.conf | |||
| @@ -33,6 +33,3 @@ MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455 nxp8987-sdio" | |||
| 33 | 33 | ||
| 34 | # MESA DRI library | 34 | # MESA DRI library |
| 35 | XSERVER += "mesa-driver-swrast" | 35 | XSERVER += "mesa-driver-swrast" |
| 36 | |||
| 37 | PREFERRED_PROVIDER_u-boot = "u-boot-fslc" | ||
| 38 | PREFERRED_PROVIDER_virtual/bootloader = "u-boot-fslc" | ||
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 932b1e69..7a3518cd 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
| @@ -184,7 +184,6 @@ IMX_SOC_REV:mx8dx-generic-bsp ??= "C0" | |||
| 184 | IMX_SOC_REV:mx8ulp-generic-bsp ??= \ | 184 | IMX_SOC_REV:mx8ulp-generic-bsp ??= \ |
| 185 | "${@bb.utils.contains('MACHINE_FEATURES', 'soc-reva0', 'A0', \ | 185 | "${@bb.utils.contains('MACHINE_FEATURES', 'soc-reva0', 'A0', \ |
| 186 | 'A2', d)}" | 186 | 'A2', d)}" |
| 187 | IMX_SOC_REV:mx91-generic-bsp ??= "A0" | ||
| 188 | IMX_SOC_REV:mx93-generic-bsp ??= "A1" | 187 | IMX_SOC_REV:mx93-generic-bsp ??= "A1" |
| 189 | 188 | ||
| 190 | IMX_SOC_REV_LOWER = "${@d.getVar('IMX_SOC_REV').lower()}" | 189 | IMX_SOC_REV_LOWER = "${@d.getVar('IMX_SOC_REV').lower()}" |