From: Max Krummenacher max.krummenacher@toradex.com

Synchronizing the device tree with linux introduced a regression. The U-Boot specific dtsi mustn't override the alias settings for the eMMC/SD interfaces.

Without this U-Boot cannot access the eMMC and boot the kernel.

Fixes: c21b61bff15 ("colibri-imx6ull/-emmc: synchronise device tree with linux") Signed-off-by: Max Krummenacher max.krummenacher@toradex.com ---

arch/arm/dts/imx6ull-colibri-eval-v3-u-boot.dtsi | 1 - 1 file changed, 1 deletion(-)

diff --git a/arch/arm/dts/imx6ull-colibri-eval-v3-u-boot.dtsi b/arch/arm/dts/imx6ull-colibri-eval-v3-u-boot.dtsi index 65dfeab5bb2..0a732269bab 100644 --- a/arch/arm/dts/imx6ull-colibri-eval-v3-u-boot.dtsi +++ b/arch/arm/dts/imx6ull-colibri-eval-v3-u-boot.dtsi @@ -6,7 +6,6 @@ / { aliases { u-boot,dm-pre-reloc; - mmc0 = &usdhc1; usb0 = &usbotg1; /* required for ums */ display0 = &lcdif; };