diff options
-rw-r--r-- | rbutil/mkimxboot/main.c | 1 | ||||
-rw-r--r-- | rbutil/mkimxboot/mkimxboot.c | 11 | ||||
-rw-r--r-- | rbutil/mkimxboot/mkimxboot.h | 3 |
3 files changed, 15 insertions, 0 deletions
diff --git a/rbutil/mkimxboot/main.c b/rbutil/mkimxboot/main.c index 8e7eb2901a..9a62133086 100644 --- a/rbutil/mkimxboot/main.c +++ b/rbutil/mkimxboot/main.c | |||
@@ -38,6 +38,7 @@ struct imx_variant_t imx_variants[] = | |||
38 | { "zenxfi2-nand", VARIANT_ZENXFI2_NAND }, | 38 | { "zenxfi2-nand", VARIANT_ZENXFI2_NAND }, |
39 | { "zenxfi2-sd", VARIANT_ZENXFI2_SD }, | 39 | { "zenxfi2-sd", VARIANT_ZENXFI2_SD }, |
40 | { "zenxfistyle-recovery", VARIANT_ZENXFISTYLE_RECOVERY }, | 40 | { "zenxfistyle-recovery", VARIANT_ZENXFISTYLE_RECOVERY }, |
41 | { "zenstyle-recovery", VARIANT_ZENSTYLE_RECOVERY }, | ||
41 | }; | 42 | }; |
42 | 43 | ||
43 | #define NR_VARIANTS sizeof(imx_variants) / sizeof(imx_variants[0]) | 44 | #define NR_VARIANTS sizeof(imx_variants) / sizeof(imx_variants[0]) |
diff --git a/rbutil/mkimxboot/mkimxboot.c b/rbutil/mkimxboot/mkimxboot.c index 64df2ca02c..5f9a1e1ed9 100644 --- a/rbutil/mkimxboot/mkimxboot.c +++ b/rbutil/mkimxboot/mkimxboot.c | |||
@@ -89,6 +89,7 @@ static const char *imx_fw_variant[] = | |||
89 | [VARIANT_ZENXFI2_NAND] = "ZEN X-Fi2 NAND", | 89 | [VARIANT_ZENXFI2_NAND] = "ZEN X-Fi2 NAND", |
90 | [VARIANT_ZENXFI2_SD] = "ZEN X-Fi2 eMMC/SD", | 90 | [VARIANT_ZENXFI2_SD] = "ZEN X-Fi2 eMMC/SD", |
91 | [VARIANT_ZENXFISTYLE_RECOVERY] = "ZEN X-Fi Style Recovery", | 91 | [VARIANT_ZENXFISTYLE_RECOVERY] = "ZEN X-Fi Style Recovery", |
92 | [VARIANT_ZENSTYLE_RECOVERY] = "ZEN Style 100/300 Recovery", | ||
92 | }; | 93 | }; |
93 | 94 | ||
94 | static const struct imx_md5sum_t imx_sums[] = | 95 | static const struct imx_md5sum_t imx_sums[] = |
@@ -142,6 +143,14 @@ static const struct imx_md5sum_t imx_sums[] = | |||
142 | [VARIANT_ZENXFISTYLE_RECOVERY] = {610272, 232688}, | 143 | [VARIANT_ZENXFISTYLE_RECOVERY] = {610272, 232688}, |
143 | } | 144 | } |
144 | }, | 145 | }, |
146 | { | ||
147 | /* Version 1.03.04e */ | ||
148 | MODEL_ZENSTYLE, "dbebec8fe666412061d9740ff68605dd", "1.03.04e", | ||
149 | { | ||
150 | [VARIANT_DEFAULT] = {758848, 6641344}, | ||
151 | [VARIANT_ZENSTYLE_RECOVERY] = {610272, 148576}, | ||
152 | } | ||
153 | }, | ||
145 | }; | 154 | }; |
146 | 155 | ||
147 | static struct crypto_key_t zero_key = | 156 | static struct crypto_key_t zero_key = |
@@ -160,6 +169,8 @@ static const struct imx_model_desc_t imx_models[] = | |||
160 | 1, &zero_key, 0, 0x40000000 }, | 169 | 1, &zero_key, 0, 0x40000000 }, |
161 | [MODEL_ZENXFISTYLE] = {"Zen X-Fi Style", NULL, 0, "", -1, | 170 | [MODEL_ZENXFISTYLE] = {"Zen X-Fi Style", NULL, 0, "", -1, |
162 | 1, &zero_key, 0, 0x40000000 }, | 171 | 1, &zero_key, 0, 0x40000000 }, |
172 | [MODEL_ZENSTYLE] = {"Zen Style 100/300", NULL, 0, "", -1, | ||
173 | 1, &zero_key, 0, 0x40000000 }, | ||
163 | }; | 174 | }; |
164 | 175 | ||
165 | #define NR_IMX_SUMS (sizeof(imx_sums) / sizeof(imx_sums[0])) | 176 | #define NR_IMX_SUMS (sizeof(imx_sums) / sizeof(imx_sums[0])) |
diff --git a/rbutil/mkimxboot/mkimxboot.h b/rbutil/mkimxboot/mkimxboot.h index de564dc5d4..4440f200ec 100644 --- a/rbutil/mkimxboot/mkimxboot.h +++ b/rbutil/mkimxboot/mkimxboot.h | |||
@@ -60,6 +60,7 @@ enum imx_model_t | |||
60 | MODEL_ZENXFI2 = 1, | 60 | MODEL_ZENXFI2 = 1, |
61 | MODEL_ZENXFI3 = 2, | 61 | MODEL_ZENXFI3 = 2, |
62 | MODEL_ZENXFISTYLE = 3, | 62 | MODEL_ZENXFISTYLE = 3, |
63 | MODEL_ZENSTYLE = 4, /* Style 100 and Style 300 */ | ||
63 | /* new models go here */ | 64 | /* new models go here */ |
64 | 65 | ||
65 | NUM_MODELS | 66 | NUM_MODELS |
@@ -75,6 +76,8 @@ enum imx_firmware_variant_t | |||
75 | VARIANT_ZENXFI2_RECOVERY, | 76 | VARIANT_ZENXFI2_RECOVERY, |
76 | /* For the Creative X-Fi Style */ | 77 | /* For the Creative X-Fi Style */ |
77 | VARIANT_ZENXFISTYLE_RECOVERY, | 78 | VARIANT_ZENXFISTYLE_RECOVERY, |
79 | /* For the Creative Zen Style 100/300 */ | ||
80 | VARIANT_ZENSTYLE_RECOVERY, | ||
78 | /* Last */ | 81 | /* Last */ |
79 | VARIANT_COUNT | 82 | VARIANT_COUNT |
80 | }; | 83 | }; |