From: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Tue, 17 Nov 2020 09:59:13 +0000 (+0100)
Subject: tizen: amlogic: automatically set "dfu_device" env
X-Git-Tag: submit/tizen/20201208.071016~55
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=af24d8a82c93f8a51f2d4c47a2fb5a300849f128;p=platform%2Fkernel%2Fu-boot.git

tizen: amlogic: automatically set "dfu_device" env

Automatically set "dfu_device" to the current boot MMC device number. This
allows to call dfu/thor/ums commands without any parameters for the default
storage device.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: I4378161c3ebf5377d50e1e28dd57d3d1511f3648
---

diff --git a/arch/arm/mach-meson/board-common.c b/arch/arm/mach-meson/board-common.c
index b0f6c6886b..b1d1fb9557 100644
--- a/arch/arm/mach-meson/board-common.c
+++ b/arch/arm/mach-meson/board-common.c
@@ -115,6 +115,7 @@ static void meson_set_boot_source(void)
 	case BOOT_DEVICE_EMMC:
 		source = "emmc";
 #ifdef CONFIG_TIZEN
+		env_set("dfu_device", "1");
 		env_set("devnum", "1");
 		env_set("mmcbootdev", "1");
 		env_set("mmcrootdev", "1");
@@ -132,6 +133,7 @@ static void meson_set_boot_source(void)
 	case BOOT_DEVICE_SD:
 		source = "sd";
 #ifdef CONFIG_TIZEN
+		env_set("dfu_device", "0");
 		env_set("devnum", "0");
 		env_set("mmcbootdev", "0");
 		env_set("mmcrootdev", "0");
diff --git a/include/samsung/tizen_amlogic.h b/include/samsung/tizen_amlogic.h
index 725ba4970e..36b3037d1d 100644
--- a/include/samsung/tizen_amlogic.h
+++ b/include/samsung/tizen_amlogic.h
@@ -92,9 +92,6 @@
 #define CONFIG_SYS_DFU_MAX_FILE_SIZE	SZ_2M
 #endif
 
-/* SD/MMC configuration */
-#define CONFIG_MMC_DEFAULT_DEV	1
-
 #ifdef CONFIG_TIZEN_KHADAS_VIM3
 #define TIZEN_BOOT_PREFIX "/vim3/ /\0"
 #elif CONFIG_TIZEN_ODROID_N2
@@ -128,7 +125,6 @@
 	"dfu_usb_con=0\0"			\
 	"dfu_interface=mmc\0"			\
 	"boot_prefixes="TIZEN_BOOT_PREFIX	\
-	"dfu_device=" __stringify(CONFIG_MMC_DEFAULT_DEV) "\0"
 
 #define CONFIG_TIZEN