[U-Boot] [PATCH] rockchip: miniarm: remove eMMC support

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

Signed-off-by: Ziyuan Xu <redacted>
---

 arch/arm/dts/rk3288-miniarm.dtsi               | 12 ------------
 board/rockchip/miniarm_rk3288/miniarm-rk3288.c |  8 --------
 include/configs/miniarm_rk3288.h               |  7 ++++++-
 3 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/arch/arm/dts/rk3288-miniarm.dtsi b/arch/arm/dts/rk3288-miniarm.dtsi
index b889875..ceb4e2b 100644
--- 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 aad74ef..79541a3 100644
--- 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 342557f..4f251cc 100644
--- a/include/configs/miniarm_rk3288.h
+++ b/include/configs/miniarm_rk3288.h

@@ -12,8 +12,13 @@
 
 #define CONFIG_SPL_MMC_SUPPORT
 
+#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

-- 
2.9.2

On 9 September 2016 at 07:44, Ziyuan Xu [off-list ref] wrote:

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

Signed-off-by: Ziyuan Xu <redacted>
---

 arch/arm/dts/rk3288-miniarm.dtsi               | 12 ------------
 board/rockchip/miniarm_rk3288/miniarm-rk3288.c |  8 --------
 include/configs/miniarm_rk3288.h               |  7 ++++++-
 3 files changed, 6 insertions(+), 21 deletions(-)

Acked-by: Simon Glass <sjg@chromium.org>

On 18 September 2016 at 18:57, Simon Glass [off-list ref] wrote:

On 9 September 2016 at 07:44, Ziyuan Xu [off-list ref] wrote:

quoted

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

Signed-off-by: Ziyuan Xu <redacted>
---

 arch/arm/dts/rk3288-miniarm.dtsi               | 12 ------------
 board/rockchip/miniarm_rk3288/miniarm-rk3288.c |  8 --------
 include/configs/miniarm_rk3288.h               |  7 ++++++-
 3 files changed, 6 insertions(+), 21 deletions(-)

Acked-by: Simon Glass <sjg@chromium.org>

Applied to u-boot-rockchip, thanks!