x86: coral: Put the eMMC first

At present the eMMC device does not have an alias so it appears after
the SD card which is device 1. There is no device 0 which is odd.

Make the eMMC device be the first one. Update the boot script to use the
new device.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>

diff --git a/arch/x86/dts/chromebook_coral.dts b/arch/x86/dts/chromebook_coral.dts
index d109a387597093dd18542ef3a2665d8dc84d3f06..4cadfd198d079e9fa8a88b54309b01b5576e0975 100644 (file)
--- a/arch/x86/dts/chromebook_coral.dts
+++ b/arch/x86/dts/chromebook_coral.dts
@@ -47,6 +47,7 @@
                i2c5 = &i2c_5;
                i2c6 = &i2c_6;
                i2c7 = &i2c_7;
+               mmc0 = &emmc;
                mmc1 = &sdmmc;
        };
 

diff --git a/include/configs/chromebook_coral.h b/include/configs/chromebook_coral.h
index 6e8e8ec17093d9228eacbdfeaad8c0cda55eb299..00760b8a30769cd8fa7e9754ba96c6107affa887 100644 (file)
--- a/include/configs/chromebook_coral.h
+++ b/include/configs/chromebook_coral.h
@@ -12,13 +12,13 @@
 
 #define CONFIG_BOOTCOMMAND     \
        "tpm init; tpm startup TPM2_SU_CLEAR; " \
-       "read mmc 2:2 100000 0 80; setexpr loader *001004f0; " \
+       "read mmc 0:2 100000 0 80; setexpr loader *001004f0; " \
        "setexpr size *00100518; setexpr blocks $size / 200; " \
-       "read mmc 2:2 100000 80 $blocks; setexpr setup $loader - 1000; " \
+       "read mmc 0:2 100000 80 $blocks; setexpr setup $loader - 1000; " \
        "setexpr cmdline_ptr $loader - 2000; " \
        "setexpr.s cmdline *$cmdline_ptr; " \
        "setexpr cmdline gsub %U \\\\${uuid}; " \
-       "if part uuid mmc 2:2 uuid; then " \
+       "if part uuid mmc 0:2 uuid; then " \
        "zboot start 100000 0 0 0 $setup cmdline; " \
        "zboot load; zboot setup; zboot dump; zboot go;" \
        "fi"