rockchip: miniarm: remove eMMC support

The latest rk3288-miniarm board doesn't have eMMC device, so remove it.

Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Acked-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/arm/dts/rk3288-miniarm.dtsi b/arch/arm/dts/rk3288-miniarm.dtsi
index b88987557a601938c222beb334dde9d5c890a28e..ceb4e2bdb191c8961dae04a06e25e63f1dc2b8a8 100644 (file)
--- a/arch/arm/dts/rk3288-miniarm.dtsi
+++ b/arch/arm/dts/rk3288-miniarm.dtsi
@@ -116,18 +116,6 @@
        cpu0-supply = <&vdd_cpu>;
 };
 
-&emmc {
-       broken-cd;
-       bus-width = <8>;
-       cap-mmc-highspeed;
-       disable-wp;
-       non-removable;
-       num-slots = <1>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_pwr &emmc_bus8>;
-       status = "okay";
-};
-
 &sdmmc {
        bus-width = <4>;
        cap-mmc-highspeed;

diff --git a/board/rockchip/miniarm_rk3288/miniarm-rk3288.c b/board/rockchip/miniarm_rk3288/miniarm-rk3288.c
index aad74ef1095adecc7ae5c100db2876f0568e8012..79541a393945957497cebeb6526b5f02096c50d8 100644 (file)
--- a/board/rockchip/miniarm_rk3288/miniarm-rk3288.c
+++ b/board/rockchip/miniarm_rk3288/miniarm-rk3288.c
@@ -5,11 +5,3 @@
  */
 
 #include <common.h>
-#include <spl.h>
-
-void board_boot_order(u32 *spl_boot_list)
-{
-       /* eMMC prior to sdcard */
-       spl_boot_list[0] = BOOT_DEVICE_MMC2;
-       spl_boot_list[1] = BOOT_DEVICE_MMC1;
-}

diff --git a/include/configs/miniarm_rk3288.h b/include/configs/miniarm_rk3288.h
index 390c243cae76ae3dc4b69472287587eaf15d683b..aa259dbefd3754e4a747eb769fe0631f2d67f9d7 100644 (file)
--- a/include/configs/miniarm_rk3288.h
+++ b/include/configs/miniarm_rk3288.h
@@ -10,8 +10,13 @@
 #define ROCKCHIP_DEVICE_SETTINGS
 #include <configs/rk3288_common.h>
 
+#undef BOOT_TARGET_DEVICES
+
+#define BOOT_TARGET_DEVICES(func) \
+       func(MMC, mmc, 0)
+
 #define CONFIG_ENV_IS_IN_MMC
-#define CONFIG_SYS_MMC_ENV_DEV 1
+#define CONFIG_SYS_MMC_ENV_DEV 0
 /* SPL @ 32k for ~36k
  * ENV @ 96k
  * u-boot @ 128K