mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-10 23:24:38 +00:00
dfu: mmc: change offset base handling
Previously offsets handled by dfu_fill_entity_mmc(), defined in boards' CONFIG_DFU_ALT were treated as hexadecimal regardless of their prefix, which sometimes led to confusion. This patch forces usage of explicit numerical base prefixes. Signed-off-by: Mateusz Zalega <m.zalega@samsung.com> Acked-by: Lukasz Majewski <l.majewski@samsung.com> Cc: Tom Rini <trini@ti.com> Cc: Minkyu Kang <mk7.kang@samsung.com>
This commit is contained in:
parent
711b931f90
commit
b7d4259af2
4 changed files with 14 additions and 10 deletions
|
@ -215,8 +215,12 @@ int dfu_fill_entity_mmc(struct dfu_entity *dfu, char *s)
|
|||
}
|
||||
|
||||
entity_type = argv[0];
|
||||
second_arg = simple_strtoul(argv[1], NULL, 16);
|
||||
third_arg = simple_strtoul(argv[2], NULL, 16);
|
||||
/*
|
||||
* Base 0 means we'll accept (prefixed with 0x or 0) base 16, 8,
|
||||
* with default 10.
|
||||
*/
|
||||
second_arg = simple_strtoul(argv[1], NULL, 0);
|
||||
third_arg = simple_strtoul(argv[2], NULL, 0);
|
||||
|
||||
mmc = find_mmc_device(dfu->dev_num);
|
||||
if (mmc == NULL) {
|
||||
|
|
|
@ -320,10 +320,10 @@
|
|||
"boot part 0 1;" \
|
||||
"rootfs part 0 2;" \
|
||||
"MLO fat 0 1;" \
|
||||
"MLO.raw mmc 100 100;" \
|
||||
"u-boot.img.raw mmc 300 400;" \
|
||||
"spl-os-args.raw mmc 80 80;" \
|
||||
"spl-os-image.raw mmc 900 2000;" \
|
||||
"MLO.raw mmc 0x100 0x100;" \
|
||||
"u-boot.img.raw mmc 0x300 0x400;" \
|
||||
"spl-os-args.raw mmc 0x80 0x80;" \
|
||||
"spl-os-image.raw mmc 0x900 0x2000;" \
|
||||
"spl-os-args fat 0 1;" \
|
||||
"spl-os-image fat 0 1;" \
|
||||
"u-boot.img fat 0 1;" \
|
||||
|
|
|
@ -101,7 +101,7 @@
|
|||
"name="PARTS_UMS",size=-,uuid=${uuid_gpt_"PARTS_UMS"}\0" \
|
||||
|
||||
#define CONFIG_DFU_ALT \
|
||||
"u-boot mmc 80 400;" \
|
||||
"u-boot raw 0x80 0x400;" \
|
||||
"uImage ext4 0 2;" \
|
||||
"modem.bin ext4 0 2;" \
|
||||
"exynos4210-trats.dtb ext4 0 2;" \
|
||||
|
@ -112,7 +112,7 @@
|
|||
""PARTS_ROOT" part 0 5;" \
|
||||
""PARTS_DATA" part 0 6;" \
|
||||
""PARTS_UMS" part 0 7;" \
|
||||
"params.bin mmc 0x38 0x8\0"
|
||||
"params.bin raw 0x38 0x8\0"
|
||||
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||
"bootk=" \
|
||||
|
|
|
@ -91,7 +91,7 @@
|
|||
"name="PARTS_UMS",size=-,uuid=${uuid_gpt_"PARTS_UMS"}\0" \
|
||||
|
||||
#define CONFIG_DFU_ALT \
|
||||
"u-boot mmc 80 800;" \
|
||||
"u-boot raw 0x80 0x800;" \
|
||||
"uImage ext4 0 2;" \
|
||||
"modem.bin ext4 0 2;" \
|
||||
"exynos4412-trats2.dtb ext4 0 2;" \
|
||||
|
@ -102,7 +102,7 @@
|
|||
""PARTS_ROOT" part 0 5;" \
|
||||
""PARTS_DATA" part 0 6;" \
|
||||
""PARTS_UMS" part 0 7;" \
|
||||
"params.bin mmc 0x38 0x8\0"
|
||||
"params.bin raw 0x38 0x8\0"
|
||||
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||
"bootk=" \
|
||||
|
|
Loading…
Reference in a new issue