[U-Boot] [PATCH] 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 p.marczak@samsung.com Acked-by: Łukasz Majewski l.majewski@samsung.com cc: Piotr Wilczek p.wilczek@samsung.com cc: Minkyu Kang mk7.kang@samsung.com --- include/configs/trats.h | 19 +++++++++++-------- include/configs/trats2.h | 14 +++++++++----- 2 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/include/configs/trats.h b/include/configs/trats.h index 718107a..eb7f864 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -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;" \ diff --git a/include/configs/trats2.h b/include/configs/trats2.h index e30c428..eeebacf 100644 --- a/include/configs/trats2.h +++ b/include/configs/trats2.h @@ -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;" \
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 p.marczak@samsung.com Acked-by: Łukasz Majewski l.majewski@samsung.com --- drivers/dfu/dfu.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c index 07011e9..56e69fd 100644 --- a/drivers/dfu/dfu.c +++ b/drivers/dfu/dfu.c @@ -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;
Hi Heiko,
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.
Signed-off-by: Przemyslaw Marczak p.marczak@samsung.com Acked-by: Łukasz Majewski l.majewski@samsung.com
drivers/dfu/dfu.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c index 07011e9..56e69fd 100644 --- a/drivers/dfu/dfu.c +++ b/drivers/dfu/dfu.c @@ -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;
Hello Lukasz,
Am 04.03.2014 12:33, schrieb Lukasz Majewski:
Hi Heiko,
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
Hi Heiko,
Hello Lukasz,
Am 04.03.2014 12:33, schrieb Lukasz Majewski:
Hi Heiko,
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. :-)
bye, Heiko
Hello Lukasz,
Am 04.03.2014 12:33, schrieb Lukasz Majewski:
Hi Heiko,
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 in advance.
Signed-off-by: Przemyslaw Marczakp.marczak@samsung.com Acked-by: Łukasz Majewskil.majewski@samsung.com
drivers/dfu/dfu.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
Tested on the dxr2 board.
Tested-by: Heiko Schocher hs@denx.de
bye, Heiko
Hi Heiko,
Am 04.03.2014 12:33, schrieb Lukasz Majewski:
Hi Heiko,
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.
Hi Tom,
Hello Lukasz,
Am 04.03.2014 12:33, schrieb Lukasz Majewski:
Hi Heiko,
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/
Thanks in advance.
Signed-off-by: Przemyslaw Marczakp.marczak@samsung.com Acked-by: Łukasz Majewskil.majewski@samsung.com
drivers/dfu/dfu.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
Tested on the dxr2 board.
Tested-by: Heiko Schocher hs@denx.de
bye, Heiko
On 12/03/14 17:00, Lukasz Majewski wrote:
Hi Tom,
Hello Lukasz,
Am 04.03.2014 12:33, schrieb Lukasz Majewski:
Hi Heiko,
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/
Thanks in advance.
Signed-off-by: Przemyslaw Marczakp.marczak@samsung.com Acked-by: Łukasz Majewskil.majewski@samsung.com
drivers/dfu/dfu.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
Tested on the dxr2 board.
Tested-by: Heiko Schocher hs@denx.de
bye, Heiko
applied to u-boot-samsung.
Thanks, Minkyu Kang.
On 01/03/14 02:53, Przemyslaw Marczak wrote:
Changes:
- update partitions layout
- update dfu entities
to be consistent with Tizen images for trats/trats2
Signed-off-by: Przemyslaw Marczak p.marczak@samsung.com Acked-by: Łukasz Majewski l.majewski@samsung.com cc: Piotr Wilczek p.wilczek@samsung.com cc: Minkyu Kang mk7.kang@samsung.com
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.
participants (4)
-
Heiko Schocher -
Lukasz Majewski -
Minkyu Kang -
Przemyslaw Marczak