Trats/Trats2: Update Tizen partitions layout and dfu entities

PATCH New Przemyslaw Marczak 4 participants 10 messages Feb 28, 2014 – Mar 13, 2014

lore

Share & tools

lore

Przemyslaw Marczak

author

2014-02-28 17:53 UTC #0 lore raw

PATCH 1/1 Trats/Trats2: Update Tizen partitions layout and dfu entities

Changes:
- update partitions layout
- update dfu entities
to be consistent with Tizen images for trats/trats2

Signed-off-by Przemyslaw Marczak <[email protected]>

Acked-by ?ukasz Majewski <[email protected]>

cc Piotr Wilczek <[email protected]>

cc Minkyu Kang <[email protected]>

---
 include/configs/trats.h  |   19 +++++++++++--------
 include/configs/trats2.h |   14 +++++++++-----
 2 files changed, 20 insertions(+), 13 deletions(-)

include/configs/trats.h +11 -8

index 718107a..eb7f864 100644
@@ -122,29 +122,32 @@
 
 /* Tizen - partitions definitions */
 #define PARTS_CSA		"csa-mmc"
-#define PARTS_BOOTLOADER	"u-boot"
 #define PARTS_BOOT		"boot"
+#define PARTS_QBOOT		"qboot"
+#define PARTS_CSC		"csc"
 #define PARTS_ROOT		"platform"
 #define PARTS_DATA		"data"
-#define PARTS_CSC		"csc"
 #define PARTS_UMS		"ums"
 
 #define PARTS_DEFAULT \
 	"uuid_disk=${uuid_gpt_disk};" \
-	"name="PARTS_CSA",size=8MiB,uuid=${uuid_gpt_"PARTS_CSA"};" \
-	"name="PARTS_BOOTLOADER",size=60MiB," \
-		"uuid=${uuid_gpt_"PARTS_BOOTLOADER"};" \
-	"name="PARTS_BOOT",size=100MiB,uuid=${uuid_gpt_"PARTS_BOOT"};" \
-	"name="PARTS_ROOT",size=1GiB,uuid=${uuid_gpt_"PARTS_ROOT"};" \
-	"name="PARTS_DATA",size=3GiB,uuid=${uuid_gpt_"PARTS_DATA"};" \
+	"name="PARTS_CSA",start=5MiB,size=8MiB,uuid=${uuid_gpt_"PARTS_CSA"};" \
+	"name="PARTS_BOOT",size=60MiB,uuid=${uuid_gpt_"PARTS_BOOT"};" \
+	"name="PARTS_QBOOT",size=100MiB,uuid=${uuid_gpt_"PARTS_QBOOT"};" \
 	"name="PARTS_CSC",size=150MiB,uuid=${uuid_gpt_"PARTS_CSC"};" \
+	"name="PARTS_ROOT",size=1536MiB,uuid=${uuid_gpt_"PARTS_ROOT"};" \
+	"name="PARTS_DATA",size=3000MiB,uuid=${uuid_gpt_"PARTS_DATA"};" \
 	"name="PARTS_UMS",size=-,uuid=${uuid_gpt_"PARTS_UMS"}\0" \
 
 #define CONFIG_DFU_ALT \
 	"u-boot mmc 80 400;" \
 	"uImage ext4 0 2;" \
+	"modem.bin ext4 0 2;" \
 	"exynos4210-trats.dtb ext4 0 2;" \
+	""PARTS_CSA" part 0 1;" \
 	""PARTS_BOOT" part 0 2;" \
+	""PARTS_QBOOT" part 0 3;" \
+	""PARTS_CSC" part 0 4;" \
 	""PARTS_ROOT" part 0 5;" \
 	""PARTS_DATA" part 0 6;" \
 	""PARTS_UMS" part 0 7;" \

include/configs/trats2.h +9 -5

index e30c428..eeebacf 100644
@@ -156,9 +156,9 @@
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 
 /* Tizen - partitions definitions */
-#define PARTS_CSA		"csa"
+#define PARTS_CSA		"csa-mmc"
 #define PARTS_BOOT		"boot"
-#define PARTS_MODEM		"modem"
+#define PARTS_QBOOT		"qboot"
 #define PARTS_CSC		"csc"
 #define PARTS_ROOT		"platform"
 #define PARTS_DATA		"data"

@@ -167,18 +167,22 @@
 #define PARTS_DEFAULT \
 	"uuid_disk=${uuid_gpt_disk};" \
 	"name="PARTS_CSA",start=5MiB,size=8MiB,uuid=${uuid_gpt_"PARTS_CSA"};" \
-	"name="PARTS_BOOT",size=64MiB,uuid=${uuid_gpt_"PARTS_BOOT"};" \
-	"name="PARTS_MODEM",size=100MiB,uuid=${uuid_gpt_"PARTS_MODEM"};" \
+	"name="PARTS_BOOT",size=60MiB,uuid=${uuid_gpt_"PARTS_BOOT"};" \
+	"name="PARTS_QBOOT",size=100MiB,uuid=${uuid_gpt_"PARTS_QBOOT"};" \
 	"name="PARTS_CSC",size=150MiB,uuid=${uuid_gpt_"PARTS_CSC"};" \
 	"name="PARTS_ROOT",size=1536MiB,uuid=${uuid_gpt_"PARTS_ROOT"};" \
-	"name="PARTS_DATA",size=512MiB,uuid=${uuid_gpt_"PARTS_DATA"};" \
+	"name="PARTS_DATA",size=3000MiB,uuid=${uuid_gpt_"PARTS_DATA"};" \
 	"name="PARTS_UMS",size=-,uuid=${uuid_gpt_"PARTS_UMS"}\0" \
 
 #define CONFIG_DFU_ALT \
 	"u-boot mmc 80 800;" \
 	"uImage ext4 0 2;" \
+	"modem.bin ext4 0 2;" \
 	"exynos4412-trats2.dtb ext4 0 2;" \
+	""PARTS_CSA" part 0 1;" \
 	""PARTS_BOOT" part 0 2;" \
+	""PARTS_QBOOT" part 0 3;" \
+	""PARTS_CSC" part 0 4;" \
 	""PARTS_ROOT" part 0 5;" \
 	""PARTS_DATA" part 0 6;" \
 	""PARTS_UMS" part 0 7;" \

Signature · 1 line

1.7.9.5

Przemyslaw Marczak

author

2014-02-28 17:53 UTC #1 lore raw

PATCH 1/1 usb: dfu: add static alt num count in dfu_config_entities()

Thanks to this multiple call of function dfu_config_entities() gives continuous dfu alt numbering until call dfu_free_entities().

This allows to store dfu entities in multiple variables.

Signed-off-by Przemyslaw Marczak <[email protected]>

Acked-by ?ukasz Majewski <[email protected]>

---
 drivers/dfu/dfu.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

drivers/dfu/dfu.c +5 -1

index 07011e9..56e69fd 100644
@@ -19,6 +19,7 @@
 static bool dfu_reset_request;
 static LIST_HEAD(dfu_list);
 static int dfu_alt_num;
+static int alt_num_cnt;
 
 bool dfu_reset(void)
 {

@@ -377,6 +378,8 @@ void dfu_free_entities(void)
 	if (t)
 		free(t);
 	INIT_LIST_HEAD(&dfu_list);
+
+	alt_num_cnt = 0;
 }
 
 int dfu_config_entities(char *env, char *interface, int num)

@@ -394,11 +397,12 @@ int dfu_config_entities(char *env, char *interface, int num)
 	for (i = 0; i < dfu_alt_num; i++) {
 
 		s = strsep(&env, ";");
-		ret = dfu_fill_entity(&dfu[i], s, i, interface, num);
+		ret = dfu_fill_entity(&dfu[i], s, alt_num_cnt, interface, num);
 		if (ret)
 			return -1;
 
 		list_add_tail(&dfu[i].list, &dfu_list);
+		alt_num_cnt++;
 	}
 
 	return 0;

Signature · 1 line

1.7.9.5

Lukasz Majewski

2014-03-04 11:33 UTC #2 lore raw

PATCH 1/1 usb: dfu: add static alt num count in dfu_config_entities()

Hi Heiko,

Quoted 4 lines

Thanks to this multiple call of function dfu_config_entities() gives continuous dfu alt numbering until call dfu_free_entities().
This allows to store dfu entities in multiple variables.

Could you test this patch on your boards, which are using DFU?

Thanks in advance.

Quoted 42 lines

Signed-off-by Przemyslaw Marczak <[email protected]>

Acked-by ?ukasz Majewski <[email protected]>

---
 drivers/dfu/dfu.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

drivers/dfu/dfu.c +5 -1

index 07011e9..56e69fd 100644
@@ -19,6 +19,7 @@
 static bool dfu_reset_request;
 static LIST_HEAD(dfu_list);
 static int dfu_alt_num;
+static int alt_num_cnt;
 
 bool dfu_reset(void)
 {

@@ -377,6 +378,8 @@ void dfu_free_entities(void)
 	if (t)
 		free(t);
 	INIT_LIST_HEAD(&dfu_list);
+
+	alt_num_cnt = 0;
 }
 
 int dfu_config_entities(char *env, char *interface, int num)

@@ -394,11 +397,12 @@ int dfu_config_entities(char *env, char
 *interface, int num) for (i = 0; i < dfu_alt_num; i++) {
 
 		s = strsep(&env, ";");
-		ret = dfu_fill_entity(&dfu[i], s, i, interface, num);
+		ret = dfu_fill_entity(&dfu[i], s, alt_num_cnt,
 interface, num); if (ret)
 			return -1;
 
 		list_add_tail(&dfu[i].list, &dfu_list);
+		alt_num_cnt++;
 	}
 
 	return 0;

Signature · 5 lines

Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group

Heiko Schocher

2014-03-04 11:45 UTC #3 lore raw

PATCH 1/1 usb: dfu: add static alt num count in dfu_config_entities()

Hello Lukasz,

Am 04.03.2014 12:33, schrieb Lukasz Majewski:

Quoted 8 lines

Hi Heiko,
Quoted 4 lines
Thanks to this multiple call of function dfu_config_entities() gives continuous dfu alt numbering until call dfu_free_entities().
This allows to store dfu entities in multiple variables.
Could you test this patch on your boards, which are using DFU?

Of course, but not before next week ...

bye,
Heiko

Signature · 2 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Lukasz Majewski

2014-03-04 11:58 UTC #4 lore raw

PATCH 1/1 usb: dfu: add static alt num count in dfu_config_entities()

Hi Heiko,

Quoted 5 lines

Hello Lukasz,
Am 04.03.2014 12:33, schrieb Lukasz Majewski:
Quoted 2 lines
Hi Heiko,

Quoted 8 lines

Quoted 6 lines
Quoted 4 lines
Thanks to this multiple call of function dfu_config_entities() gives continuous dfu alt numbering until call dfu_free_entities().
This allows to store dfu entities in multiple variables.
Could you test this patch on your boards, which are using DFU?
Of course, but not before next week ...

Ok. Thanks. :-)

Quoted 3 lines

bye,
Heiko

Signature · 5 lines

Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group

Heiko Schocher

2014-03-11 07:03 UTC #5 lore raw

PATCH 1/1 usb: dfu: add static alt num count in dfu_config_entities()

In reply to Lukasz Majewski

Hello Lukasz,

Am 04.03.2014 12:33, schrieb Lukasz Majewski:

Quoted 8 lines

Hi Heiko,
Quoted 4 lines
Thanks to this multiple call of function dfu_config_entities() gives continuous dfu alt numbering until call dfu_free_entities().
This allows to store dfu entities in multiple variables.
Could you test this patch on your boards, which are using DFU?

Done on the dxr2 board. All works as before.

Quoted 8 lines

Thanks in advance.
Quoted 6 lines
Signed-off-by Przemyslaw Marczak<[email protected]>
Acked-by ?ukasz Majewski<[email protected]>
---
  drivers/dfu/dfu.c |    6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)

Tested on the dxr2 board.

Tested-by Heiko Schocher <[email protected]>

bye,
Heiko

Signature · 2 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Lukasz Majewski

2014-03-12 07:02 UTC #6 lore raw

PATCH 1/1 usb: dfu: add static alt num count in dfu_config_entities()

Hi Heiko,

Quoted 11 lines

Am 04.03.2014 12:33, schrieb Lukasz Majewski:
Quoted 8 lines
Hi Heiko,
Quoted 4 lines
Thanks to this multiple call of function dfu_config_entities() gives continuous dfu alt numbering until call dfu_free_entities().
This allows to store dfu entities in multiple variables.
Could you test this patch on your boards, which are using DFU?
Done on the dxr2 board. All works as before.

Thanks a lot.

Signature · 5 lines

Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group

Lukasz Majewski

2014-03-12 08:00 UTC #7 lore raw

PATCH 1/1 usb: dfu: add static alt num count in dfu_config_entities()

In reply to Heiko Schocher

Hi Tom,

Quoted 5 lines

Hello Lukasz,
Am 04.03.2014 12:33, schrieb Lukasz Majewski:
Quoted 2 lines
Hi Heiko,

Quoted 8 lines

Quoted 6 lines
Quoted 4 lines
Thanks to this multiple call of function dfu_config_entities() gives continuous dfu alt numbering until call dfu_free_entities().
This allows to store dfu entities in multiple variables.
Could you test this patch on your boards, which are using DFU?
Done on the dxr2 board. All works as before.

Tom, could you apply this patch as a fix before v2014.04 is released?

http://patchwork.ozlabs.org/patch/325309/

Quoted 16 lines

Quoted 9 lines
Thanks in advance.
Quoted 6 lines
Signed-off-by Przemyslaw Marczak<[email protected]>
Acked-by ?ukasz Majewski<[email protected]>
---
  drivers/dfu/dfu.c |    6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
Tested on the dxr2 board.
Tested-by Heiko Schocher <[email protected]>
bye,
Heiko

Signature · 5 lines

Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group

Minkyu Kang

2014-03-13 02:00 UTC #8 lore raw

PATCH 1/1 usb: dfu: add static alt num count in dfu_config_entities()

Quoted 12 lines · Lukasz Majewski

Hi Tom,
Quoted 10 lines
Hello Lukasz,
Am 04.03.2014 12:33, schrieb Lukasz Majewski:
Quoted 7 lines
Hi Heiko,
Quoted 4 lines
Thanks to this multiple call of function dfu_config_entities() gives continuous dfu alt numbering until call dfu_free_entities().
This allows to store dfu entities in multiple variables.

Quoted 27 lines

Quoted 3 lines
Quoted 1 line
Could you test this patch on your boards, which are using DFU?
Done on the dxr2 board. All works as before.
Tom, could you apply this patch as a fix before v2014.04 is released?
http://patchwork.ozlabs.org/patch/325309/
Quoted 16 lines
Quoted 9 lines
Thanks in advance.
Quoted 6 lines
Signed-off-by Przemyslaw Marczak<[email protected]>
Acked-by ?ukasz Majewski<[email protected]>
---
  drivers/dfu/dfu.c |    6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
Tested on the dxr2 board.
Tested-by Heiko Schocher <[email protected]>
bye,
Heiko

applied to u-boot-samsung.

Thanks,
Minkyu Kang.

Minkyu Kang

2014-03-13 01:59 UTC #9 lore raw

PATCH 1/1 Trats/Trats2: Update Tizen partitions layout and dfu entities

In reply to Przemyslaw Marczak

Quoted 5 lines · Przemyslaw Marczak

Changes:
- update partitions layout
- update dfu entities
to be consistent with Tizen images for trats/trats2

Quoted 9 lines

Signed-off-by Przemyslaw Marczak <[email protected]>
Acked-by ?ukasz Majewski <[email protected]>
cc Piotr Wilczek <[email protected]>
cc Minkyu Kang <[email protected]>
---
 include/configs/trats.h  |   19 +++++++++++--------
 include/configs/trats2.h |   14 +++++++++-----
 2 files changed, 20 insertions(+), 13 deletions(-)

applied to u-boot-samsung.

Thanks,
Minkyu Kang.