diff options
Diffstat (limited to 'rbutil/mkimxboot/mkimxboot.c')
-rw-r--r-- | rbutil/mkimxboot/mkimxboot.c | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/rbutil/mkimxboot/mkimxboot.c b/rbutil/mkimxboot/mkimxboot.c index c33c0404c0..f6afd0cf0d 100644 --- a/rbutil/mkimxboot/mkimxboot.c +++ b/rbutil/mkimxboot/mkimxboot.c | |||
@@ -40,6 +40,8 @@ struct imx_md5sum_t | |||
40 | enum imx_model_t model; | 40 | enum imx_model_t model; |
41 | /* md5sum of the file */ | 41 | /* md5sum of the file */ |
42 | char *md5sum; | 42 | char *md5sum; |
43 | /* Version string */ | ||
44 | const char *version; | ||
43 | /* Variant descriptions */ | 45 | /* Variant descriptions */ |
44 | struct imx_fw_variant_desc_t fw_variants[VARIANT_COUNT]; | 46 | struct imx_fw_variant_desc_t fw_variants[VARIANT_COUNT]; |
45 | }; | 47 | }; |
@@ -80,24 +82,29 @@ static const struct imx_md5sum_t imx_sums[] = | |||
80 | { | 82 | { |
81 | { | 83 | { |
82 | /* Version 2.38.6 */ | 84 | /* Version 2.38.6 */ |
83 | MODEL_FUZEPLUS, "c3e27620a877dc6b200b97dcb3e0ecc7", | 85 | MODEL_FUZEPLUS, "c3e27620a877dc6b200b97dcb3e0ecc7", "2.38.6", |
84 | { [VARIANT_DEFAULT] = { 0, 34652624 } } | 86 | { [VARIANT_DEFAULT] = { 0, 34652624 } } |
85 | }, | 87 | }, |
86 | { | 88 | { |
87 | /* Version 1.23.01e */ | 89 | /* Version 1.23.01e */ |
88 | MODEL_ZENXFI2, "e37e2c24abdff8e624d0a29f79157850", | 90 | MODEL_ZENXFI2, "e37e2c24abdff8e624d0a29f79157850", "1.23.01e", |
89 | }, | 91 | }, |
90 | { | 92 | { |
91 | /* Version 1.23.01e */ | 93 | /* Version 1.23.01e */ |
92 | MODEL_ZENXFI2, "2beff2168212d332f13cfc36ca46989d", | 94 | MODEL_ZENXFI2, "2beff2168212d332f13cfc36ca46989d", "1.23.01e", |
93 | { [VARIANT_ZENXFI2_RECOVERY] = { 0x93010, 684192}, | 95 | { [VARIANT_ZENXFI2_RECOVERY] = { 0x93010, 684192}, |
94 | [VARIANT_ZENXFI2_NAND] = { 0x13a0b0, 42410704 }, | 96 | [VARIANT_ZENXFI2_NAND] = { 0x13a0b0, 42410704 }, |
95 | [VARIANT_ZENXFI2_SD] = { 0x29ac380, 42304208 } | 97 | [VARIANT_ZENXFI2_SD] = { 0x29ac380, 42304208 } |
96 | } | 98 | } |
97 | }, | 99 | }, |
98 | { | 100 | { |
101 | /* Version 1.00.15e */ | ||
102 | MODEL_ZENXFI3, "658a24eeef5f7186ca731085d8822a87", "1.00.15e", | ||
103 | { [VARIANT_DEFAULT] = {0, 18110576} } | ||
104 | }, | ||
105 | { | ||
99 | /* Version 1.00.22e */ | 106 | /* Version 1.00.22e */ |
100 | MODEL_ZENXFI3, "658a24eeef5f7186ca731085d8822a87", | 107 | MODEL_ZENXFI3, "a5114cd45ea4554ec221f51a71083862", "1.00.22e", |
101 | { [VARIANT_DEFAULT] = {0, 18110576} } | 108 | { [VARIANT_DEFAULT] = {0, 18110576} } |
102 | }, | 109 | }, |
103 | }; | 110 | }; |
@@ -317,8 +324,8 @@ void dump_imx_dev_info(const char *prefix) | |||
317 | printf("%smkimxboot mapping:\n", prefix); | 324 | printf("%smkimxboot mapping:\n", prefix); |
318 | for(int i = 0; i < NR_IMX_SUMS; i++) | 325 | for(int i = 0; i < NR_IMX_SUMS; i++) |
319 | { | 326 | { |
320 | printf("%s md5sum=%s -> idx=%d\n", prefix, imx_sums[i].md5sum, | 327 | printf("%s md5sum=%s -> idx=%d, ver=%s\n", prefix, imx_sums[i].md5sum, |
321 | imx_sums[i].model); | 328 | imx_sums[i].model, imx_sums[i].version); |
322 | for(int j = 0; j < VARIANT_COUNT; j++) | 329 | for(int j = 0; j < VARIANT_COUNT; j++) |
323 | if(imx_sums[i].fw_variants[j].size) | 330 | if(imx_sums[i].fw_variants[j].size) |
324 | printf("%s variant=%d -> offset=%#x size=%#x\n", prefix, | 331 | printf("%s variant=%d -> offset=%#x size=%#x\n", prefix, |
@@ -398,7 +405,8 @@ enum imx_error_t mkimxboot(const char *infile, const char *bootfile, | |||
398 | model = imx_sums[i].model; | 405 | model = imx_sums[i].model; |
399 | md5_idx = i; | 406 | md5_idx = i; |
400 | }while(0); | 407 | }while(0); |
401 | printf("[INFO] File is for model %d (%s)\n", model, imx_models[model].model_name); | 408 | printf("[INFO] File is for model %d (%s, version %s)\n", model, |
409 | imx_models[model].model_name, imx_sums[md5_idx].version); | ||
402 | /* load rockbox file */ | 410 | /* load rockbox file */ |
403 | uint8_t *boot; | 411 | uint8_t *boot; |
404 | size_t boot_size; | 412 | size_t boot_size; |