Skip to contentSkip to conversation

dfu: allow to autoset configuration

PATCH New Przemyslaw Marczak 3 participants 6 messages Feb 17, 2015 – Feb 23, 2015

lore
Share & tools
lore
#0 lore raw

cover dfu: allow to autoset configuration

Since the dfu supports multiple inferfaces, using a single ${dfu_alt_info} variable, or manually presetting it for various interfaces is uncomfortable.

The interface is given as an argument to the dfu/thor commands, so it can be easy used to set the environment.

The odroid, as an example, can boot from SD and eMMC cards, but the boot binary offsets are little different. Now the proper data in ${dfu_alt_info} is set automatically.

Inha Song (1):
odroid: adjust get_dfu_alt_*() functions to new declarations

Przemyslaw Marczak (1):
dfu: samsung: move call to set_dfu_alt_info() to dfu common code

 board/samsung/common/board.c  |  3 ---
 board/samsung/common/misc.c   |  6 +++---
 board/samsung/odroid/odroid.c | 31 +++++++++++++++++--------------
 drivers/dfu/dfu.c             |  3 +++
 include/dfu.h                 |  3 +++
 include/samsung/misc.h        |  5 ++---
 6 files changed, 28 insertions(+), 23 deletions(-)
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/2 dfu: samsung: move call to set_dfu_alt_info() to dfu common code

This common call can be used for setting proper entities based on dfu command arguments.
The config: CONFIG_SET_DFU_ALT_INFO, was used only for few configs, and now it is common.

The board file should implement:
- set_dfu_alt_info() function

Cc Lukasz Majewski <[email protected]>
Cc Stephen Warren <[email protected]>
Cc Marek Vasut <[email protected]>
---
 board/samsung/common/board.c | 3 ---
 board/samsung/common/misc.c  | 6 +++---
 drivers/dfu/dfu.c            | 3 +++
 include/dfu.h                | 3 +++
 include/samsung/misc.h       | 5 ++---
 5 files changed, 11 insertions(+), 9 deletions(-)
board/samsung/common/board.c +0 -3
index 8b4c8e9..d28fed9 100644
@@ -338,9 +338,6 @@ int arch_early_init_r(void)
 #ifdef CONFIG_MISC_INIT_R
 int misc_init_r(void)
 {
-#ifdef CONFIG_SET_DFU_ALT_INFO
-	set_dfu_alt_info();
-#endif
 #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 	set_board_info();
 #endif
board/samsung/common/misc.c +3 -3
index 4538ac7..1a77c82 100644
@@ -22,7 +22,7 @@
 DECLARE_GLOBAL_DATA_PTR;
 
 #ifdef CONFIG_SET_DFU_ALT_INFO
-void set_dfu_alt_info(void)
+void set_dfu_alt_info(char *interface, char *devstr)
 {
 	size_t buf_size = CONFIG_SET_DFU_ALT_BUF_LEN;
 	ALLOC_CACHE_ALIGN_BUFFER(char, buf, buf_size);
@@ -34,13 +34,13 @@ void set_dfu_alt_info(void)
 
 	puts("DFU alt info setting: ");
 
-	alt_setting = get_dfu_alt_boot();
+	alt_setting = get_dfu_alt_boot(interface, devstr);
 	if (alt_setting) {
 		setenv("dfu_alt_boot", alt_setting);
 		offset = snprintf(buf, buf_size, "%s", alt_setting);
 	}
 
-	alt_setting = get_dfu_alt_system();
+	alt_setting = get_dfu_alt_system(interface, devstr);
 	if (alt_setting) {
 		if (offset)
 			alt_sep = ";";
drivers/dfu/dfu.c +3 -0
index ad0a7e7..0560afa 100644
@@ -55,6 +55,9 @@ int dfu_init_env_entities(char *interface, char *devstr)
 	char *env_bkp;
 	int ret;
 
+#ifdef CONFIG_SET_DFU_ALT_INFO
+	set_dfu_alt_info(interface, devstr);
+#endif
 	str_env = getenv("dfu_alt_info");
 	if (!str_env) {
 		error("\"dfu_alt_info\" env variable not defined!\n");
include/dfu.h +3 -0
index c27856c..7d31abd 100644
@@ -140,6 +140,9 @@ struct dfu_entity {
 	unsigned int inited:1;
 };
 
+#ifdef CONFIG_SET_DFU_ALT_INFO
+void set_dfu_alt_info(char *interface, char *devstr);
+#endif
 int dfu_config_entities(char *s, char *interface, char *devstr);
 void dfu_free_entities(void);
 void dfu_show_entities(void);
include/samsung/misc.h +2 -3
index 607e8d4..0f957dc 100644
@@ -29,9 +29,8 @@ void draw_logo(void);
 #endif
 
 #ifdef CONFIG_SET_DFU_ALT_INFO
-char *get_dfu_alt_system(void);
-char *get_dfu_alt_boot(void);
-void set_dfu_alt_info(void);
+char *get_dfu_alt_system(char *interface, char *devstr);
+char *get_dfu_alt_boot(char *interface, char *devstr);
 #endif
 #ifdef CONFIG_BOARD_TYPES
 void set_board_type(void);
Signature · 1 line
1.9.1
#2 lore raw

PATCH 1/2 dfu: samsung: move call to set_dfu_alt_info() to dfu common code

Hi Przemyslaw,

Quoted 97 lines

This common call can be used for setting proper entities based on dfu command arguments.
The config: CONFIG_SET_DFU_ALT_INFO, was used only for few configs, and now it is common.

The board file should implement:
- set_dfu_alt_info() function

Cc Lukasz Majewski <[email protected]>
Cc Stephen Warren <[email protected]>
Cc Marek Vasut <[email protected]>
---
 board/samsung/common/board.c | 3 ---
 board/samsung/common/misc.c  | 6 +++---
 drivers/dfu/dfu.c            | 3 +++
 include/dfu.h                | 3 +++
 include/samsung/misc.h       | 5 ++---
 5 files changed, 11 insertions(+), 9 deletions(-)
(quoted diff) +0 -0

b/board/samsung/common/board.c index 8b4c8e9..d28fed9 100644

board/samsung/common/board.c +0 -3
@@ -338,9 +338,6 @@ int arch_early_init_r(void)
 #ifdef CONFIG_MISC_INIT_R
 int misc_init_r(void)
 {
-#ifdef CONFIG_SET_DFU_ALT_INFO
-	set_dfu_alt_info();
-#endif
 #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 	set_board_info();
 #endif
board/samsung/common/misc.c +3 -3
index 4538ac7..1a77c82 100644
@@ -22,7 +22,7 @@
 DECLARE_GLOBAL_DATA_PTR;
 
 #ifdef CONFIG_SET_DFU_ALT_INFO
-void set_dfu_alt_info(void)
+void set_dfu_alt_info(char *interface, char *devstr)
 {
 	size_t buf_size = CONFIG_SET_DFU_ALT_BUF_LEN;
 	ALLOC_CACHE_ALIGN_BUFFER(char, buf, buf_size);
@@ -34,13 +34,13 @@ void set_dfu_alt_info(void)
 
 	puts("DFU alt info setting: ");
 
-	alt_setting = get_dfu_alt_boot();
+	alt_setting = get_dfu_alt_boot(interface, devstr);
 	if (alt_setting) {
 		setenv("dfu_alt_boot", alt_setting);
 		offset = snprintf(buf, buf_size, "%s", alt_setting);
 	}
 
-	alt_setting = get_dfu_alt_system();
+	alt_setting = get_dfu_alt_system(interface, devstr);
 	if (alt_setting) {
 		if (offset)
 			alt_sep = ";";
drivers/dfu/dfu.c +3 -0
index ad0a7e7..0560afa 100644
@@ -55,6 +55,9 @@ int dfu_init_env_entities(char *interface, char
 *devstr) char *env_bkp;
 	int ret;
 
+#ifdef CONFIG_SET_DFU_ALT_INFO
+	set_dfu_alt_info(interface, devstr);
+#endif
 	str_env = getenv("dfu_alt_info");
 	if (!str_env) {
 		error("\"dfu_alt_info\" env variable not

defined!\n"); diff --git a/include/dfu.h b/include/dfu.h index c27856c..7d31abd 100644

include/dfu.h +3 -0
@@ -140,6 +140,9 @@ struct dfu_entity {
 	unsigned int inited:1;
 };
 
+#ifdef CONFIG_SET_DFU_ALT_INFO
+void set_dfu_alt_info(char *interface, char *devstr);
+#endif
 int dfu_config_entities(char *s, char *interface, char *devstr);
 void dfu_free_entities(void);
 void dfu_show_entities(void);
include/samsung/misc.h +0 -0
index 607e8d4..0f957dc 100644
@@ -29,9 +29,8 @@ void draw_logo(void);
 #endif

include/samsung/misc.h void draw_logo(void); · line 36

Quoted 10 lines
include/samsung/misc.h +2 -3
 
 #ifdef CONFIG_SET_DFU_ALT_INFO
-char *get_dfu_alt_system(void);
-char *get_dfu_alt_boot(void);
-void set_dfu_alt_info(void);
+char *get_dfu_alt_system(char *interface, char *devstr);
+char *get_dfu_alt_boot(char *interface, char *devstr);
 #endif
 #ifdef CONFIG_BOARD_TYPES
 void set_board_type(void);

Test HW: Odroid U3 (Exynos 4412)

Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#3 lore raw

PATCH 2/2 odroid: adjust get_dfu_alt_*() functions to new declarations

In reply to Przemyslaw Marczak

From: Inha Song <[email protected]>

This change is required after updated dfu_alt_system/boot declarations.

Cc Lukasz Majewski <[email protected]>
Cc Stephen Warren <[email protected]>
Cc Marek Vasut <[email protected]>
---
 board/samsung/odroid/odroid.c | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)
board/samsung/odroid/odroid.c +17 -14
index b7d2381..e3f90bd 100644
@@ -15,6 +15,7 @@
 #include <power/pmic.h>
 #include <power/max77686_pmic.h>
 #include <errno.h>
+#include <mmc.h>
 #include <usb.h>
 #include <usb/s3c_udc.h>
 #include <samsung/misc.h>
@@ -61,27 +62,29 @@ const char *get_board_type(void)
 #endif
 
 #ifdef CONFIG_SET_DFU_ALT_INFO
-char *get_dfu_alt_system(void)
+char *get_dfu_alt_system(char *interface, char *devstr)
 {
 	return getenv("dfu_alt_system");
 }
 
-char *get_dfu_alt_boot(void)
+char *get_dfu_alt_boot(char *interface, char *devstr)
 {
+	struct mmc *mmc;
 	char *alt_boot;
+	int dev_num;
+
+	dev_num = simple_strtoul(devstr, NULL, 10);
+
+	mmc = find_mmc_device(dev_num);
+	if (!mmc)
+		return NULL;
+
+	if (mmc_init(mmc))
+		return NULL;
+
+	alt_boot = IS_SD(mmc) ? CONFIG_DFU_ALT_BOOT_SD :
+				CONFIG_DFU_ALT_BOOT_EMMC;
 
-	switch (get_boot_mode()) {
-	case BOOT_MODE_SD:
-		alt_boot = CONFIG_DFU_ALT_BOOT_SD;
-		break;
-	case BOOT_MODE_EMMC:
-	case BOOT_MODE_EMMC_SD:
-		alt_boot = CONFIG_DFU_ALT_BOOT_EMMC;
-		break;
-	default:
-		alt_boot = NULL;
-		break;
-	}
 	return alt_boot;
 }
 #endif
Signature · 1 line
1.9.1
#4 lore raw

PATCH 2/2 odroid: adjust get_dfu_alt_*() functions to new declarations

Hi Przemyslaw, Minkyu

Quoted 59 lines

From: Inha Song <[email protected]>

This change is required after updated dfu_alt_system/boot declarations.

Cc Lukasz Majewski <[email protected]>
Cc Stephen Warren <[email protected]>
Cc Marek Vasut <[email protected]>
---
 board/samsung/odroid/odroid.c | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)
(quoted diff) +0 -0

b/board/samsung/odroid/odroid.c index b7d2381..e3f90bd 100644

board/samsung/odroid/odroid.c +17 -7
@@ -15,6 +15,7 @@
 #include <power/pmic.h>
 #include <power/max77686_pmic.h>
 #include <errno.h>
+#include <mmc.h>
 #include <usb.h>
 #include <usb/s3c_udc.h>
 #include <samsung/misc.h>
@@ -61,27 +62,29 @@ const char *get_board_type(void)
 #endif
 
 #ifdef CONFIG_SET_DFU_ALT_INFO
-char *get_dfu_alt_system(void)
+char *get_dfu_alt_system(char *interface, char *devstr)
 {
 	return getenv("dfu_alt_system");
 }
 
-char *get_dfu_alt_boot(void)
+char *get_dfu_alt_boot(char *interface, char *devstr)
 {
+	struct mmc *mmc;
 	char *alt_boot;
+	int dev_num;
+
+	dev_num = simple_strtoul(devstr, NULL, 10);
+
+	mmc = find_mmc_device(dev_num);
+	if (!mmc)
+		return NULL;
+
+	if (mmc_init(mmc))
+		return NULL;
+
+	alt_boot = IS_SD(mmc) ? CONFIG_DFU_ALT_BOOT_SD :
+				CONFIG_DFU_ALT_BOOT_EMMC;
 
-	switch (get_boot_mode()) {
-	case BOOT_MODE_SD:
-		alt_boot = CONFIG_DFU_ALT_BOOT_SD;
-		break;
-	case BOOT_MODE_EMMC:

board/samsung/odroid/odroid.c const char *get_board_type(void) · line 90

Quoted 10 lines
board/samsung/odroid/odroid.c +0 -7
-	case BOOT_MODE_EMMC_SD:
-		alt_boot = CONFIG_DFU_ALT_BOOT_EMMC;
-		break;
-	default:
-		alt_boot = NULL;
-		break;
-	}
 	return alt_boot;
 }
 #endif

Test HW: Odroid U3 (Exynos 4412)

Minkyu - I would prefer to take this patch to -dfu tree since it deals with dfu_alt_info env variable. Do you mind if I take it?

Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#5 lore raw

PATCH 2/2 odroid: adjust get_dfu_alt_*() functions to new declarations

Hi,

Quoted 14 lines · Lukasz Majewski

Hi Przemyslaw, Minkyu

Quoted 10 lines

From: Inha Song <[email protected]>

This change is required after updated dfu_alt_system/boot declarations.

Cc Lukasz Majewski <[email protected]>
Cc Stephen Warren <[email protected]>
Cc Marek Vasut <[email protected]>

---

Quoted 8 lines

Test HW: Odroid U3 (Exynos 4412)

Minkyu - I would prefer to take this patch to -dfu tree since it deals with dfu_alt_info env variable. Do you mind if I take it?

It's OK.

Thanks,
Minkyu Kang.