configs: tizen_bpif3: Replace BOOT_TARGET_DEVICE to use MMC

Replace BOOT_TARGET_DEVICE to use MMC device, not QEMU.

Change-Id: Ib2fa3d4d06193b384dca60e5ca3c369310b8d5ef
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>

diff --git a/include/configs/k1-x.h b/include/configs/k1-x.h
index df3a57dc43634cb98de27c438758e0a7898cdcc3..999a65c12ea88f371f3f97087dd80b43f994848e 100644 (file)
--- a/include/configs/k1-x.h
+++ b/include/configs/k1-x.h
@@ -8,10 +8,6 @@
 
 #include <linux/sizes.h>
 
-#ifdef CONFIG_TIZEN_K1_X
-#include <samsung/tizen_bpif3.h>
-#endif
-
 #define SYS_DRAM_OFFS          0x00000000
 #define SZ_1MB                 0x00100000
 #define SZ_2GB                 0x80000000
@@ -129,6 +125,9 @@ struct boot_storage_op
        func(QEMU, qemu, na)
 
 #include <config_distro_bootcmd.h>
+#ifdef CONFIG_TIZEN_K1_X
+#include <samsung/tizen_bpif3.h>
+#endif
 
 #define BOOTENV_DEV_QEMU(devtypeu, devtypel, instance) \
        "bootcmd_qemu=" \

diff --git a/include/samsung/tizen_bpif3.h b/include/samsung/tizen_bpif3.h
index 12c36dc9aef6a26732a3ba9ef18575ab392eaab1..0d59cec92273ebb2fb70c3116c432538d7b812e3 100644 (file)
--- a/include/samsung/tizen_bpif3.h
+++ b/include/samsung/tizen_bpif3.h
@@ -21,6 +21,20 @@
        "mw.l ${rebootparam_addr} ${normal_val} ; "                                             \
        "ext4write ${devtype} ${devnum}:${informpart} ${rebootparam_addr} /${rebootparamfile} 8; "
 
+#if CONFIG_IS_ENABLED(CMD_MMC)
+       #define BOOT_TARGET_MMC(func) \
+               func(MMC, mmc, 0) \
+               func(MMC, mmc, 2)
+#else
+       #define BOOT_TARGET_MMC(func)
+#endif
+
+#ifdef BOOT_TARGET_DEVICES
+#undef BOOT_TARGET_DEVICES
+#endif
+
+#define BOOT_TARGET_DEVICES(func) \
+       BOOT_TARGET_MMC(func)
 
 /* SD/MMC configuration */
 #define CONFIG_MMC_DEFAULT_DEV 0