imx6: Re-add mmc aliases

In commit d0399a46e7cda63c07e3eb8558bef84cfb068028, the device tree was synchronized from linux and the aliases were dropped.

They need to be kept so that the mmc cards are in the right order. Without the aliases, u-boot reports: MMC: FSL_SDHC: 2, FSL_SDHC: 3

With the aliases, u-boot reports: MMC: FSL_SDHC: 0, FSL_SDHC: 1

The upstream linux device tree does not contain the same aliases than u-boot (It keeps the devices order with /dev/mmcblk2 and /dev/mmcblk3). Because this board has been using different aliases in u-boot and linux, a imx6q-sabrelite-u-boot.dtsi file is added to be automatically included in imx6q-sabrelite.dts.

This way, linux and u-boot each keep their own aliases and there is no breakage and current installations.

This should never be done for new boards as we want to keep linux and u-boot with the same aliases as much as possible. This patch is only necessary to avoid breaking existing setups.

https://phabricator.apertis.org/T9333

assigned to @detlev

mentioned in issue infrastructure/apertis-issues#214 (closed)

requested review from @adalessandro

@detlev the fix LGTM. Could you explain a little bit more about the issue on the commit and patch? So the reason is clear on the description.

Pushed a version upstream. Let's wait a bit for their comments: http://patchwork.ozlabs.org/project/uboot/patch/20221027152252.46552-1-detlev.casanova@collabora.com/

added 2 commits

• b4da7b26 - imx6: Re-add mmc aliases
• d408d787 - Release u-boot version 2022.10+dfsg-1+apertis4

Compare with previous version

changed the description

added 6 commits

• 82620e17 - d/targets: Enable support for am625-sk
• 8ed26069 - Remove openssl check
• 1ed1cb3b - Don't always build tiboot3.bin
• 0b60910e - Release u-boot version 2022.10+dfsg-1+apertis4
• 57bafe2b - imx6: Re-add mmc aliases
• cdb7e0fe - Release u-boot version 2022.10+dfsg-1+apertis5

Compare with previous version

marked this merge request as ready

changed the description

changed target branch from apertis/v2023pre to apertis/v2023

marked this merge request as draft

changed the description

added 2 commits

• 21b69694 - imx6: Re-add mmc aliases
• 052afd23 - Release u-boot version 2022.10+dfsg-1+apertis5

Compare with previous version

added 1 commit

• e1f0b53f - Refresh the automatically detected licensing information

Compare with previous version

marked this merge request as ready

changed the description

added 2 commits

• 17c6adfd - imx6: Re-add mmc aliases
• 58196c50 - Release u-boot version 2022.10+dfsg-1+apertis5

Compare with previous version

added 1 commit

• d403f61c - Refresh the automatically detected licensing information

Compare with previous version