diff options
Diffstat (limited to 'rbutil')
-rw-r--r-- | rbutil/mkimxboot/main.c | 1 | ||||
-rw-r--r-- | rbutil/mkimxboot/mkimxboot.c | 19 | ||||
-rw-r--r-- | rbutil/mkimxboot/mkimxboot.h | 3 |
3 files changed, 23 insertions, 0 deletions
diff --git a/rbutil/mkimxboot/main.c b/rbutil/mkimxboot/main.c index ed88d3e1ff..b775242b10 100644 --- a/rbutil/mkimxboot/main.c +++ b/rbutil/mkimxboot/main.c | |||
@@ -37,6 +37,7 @@ struct imx_variant_t imx_variants[] = | |||
37 | { "zenxfi2-recovery", VARIANT_ZENXFI2_RECOVERY }, | 37 | { "zenxfi2-recovery", VARIANT_ZENXFI2_RECOVERY }, |
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 | }; | 41 | }; |
41 | 42 | ||
42 | #define NR_VARIANTS sizeof(imx_variants) / sizeof(imx_variants[0]) | 43 | #define NR_VARIANTS sizeof(imx_variants) / sizeof(imx_variants[0]) |
diff --git a/rbutil/mkimxboot/mkimxboot.c b/rbutil/mkimxboot/mkimxboot.c index 8c9ccdbd8e..3135c7ce55 100644 --- a/rbutil/mkimxboot/mkimxboot.c +++ b/rbutil/mkimxboot/mkimxboot.c | |||
@@ -76,6 +76,7 @@ static const char *imx_fw_variant[] = | |||
76 | [VARIANT_ZENXFI2_RECOVERY] = "ZEN X-Fi2 Recovery", | 76 | [VARIANT_ZENXFI2_RECOVERY] = "ZEN X-Fi2 Recovery", |
77 | [VARIANT_ZENXFI2_NAND] = "ZEN X-Fi2 NAND", | 77 | [VARIANT_ZENXFI2_NAND] = "ZEN X-Fi2 NAND", |
78 | [VARIANT_ZENXFI2_SD] = "ZEN X-Fi2 eMMC/SD", | 78 | [VARIANT_ZENXFI2_SD] = "ZEN X-Fi2 eMMC/SD", |
79 | [VARIANT_ZENXFISTYLE_RECOVERY] = "ZEN X-Fi Style Recovery", | ||
79 | }; | 80 | }; |
80 | 81 | ||
81 | static const struct imx_md5sum_t imx_sums[] = | 82 | static const struct imx_md5sum_t imx_sums[] = |
@@ -108,6 +109,22 @@ static const struct imx_md5sum_t imx_sums[] = | |||
108 | MODEL_ZENXFI3, "a5114cd45ea4554ec221f51a71083862", "1.00.22e", | 109 | MODEL_ZENXFI3, "a5114cd45ea4554ec221f51a71083862", "1.00.22e", |
109 | { [VARIANT_DEFAULT] = {0, 18110576} } | 110 | { [VARIANT_DEFAULT] = {0, 18110576} } |
110 | }, | 111 | }, |
112 | { | ||
113 | /* Version 1.03.04e */ | ||
114 | MODEL_ZENXFISTYLE, "32a731b7f714e9f99a95991003759c98", "1.03.04", | ||
115 | { | ||
116 | [VARIANT_DEFAULT] = {842960, 29876944}, | ||
117 | [VARIANT_ZENXFISTYLE_RECOVERY] = {610272, 232688}, | ||
118 | } | ||
119 | }, | ||
120 | { | ||
121 | /* Version 1.03.04e */ | ||
122 | MODEL_ZENXFISTYLE, "2c7ee52d9984d85dd39aa49b3331e66c", "1.03.04e", | ||
123 | { | ||
124 | [VARIANT_DEFAULT] = {842960, 29876944}, | ||
125 | [VARIANT_ZENXFISTYLE_RECOVERY] = {610272, 232688}, | ||
126 | } | ||
127 | }, | ||
111 | }; | 128 | }; |
112 | 129 | ||
113 | static struct crypto_key_t zero_key = | 130 | static struct crypto_key_t zero_key = |
@@ -124,6 +141,8 @@ static const struct imx_model_desc_t imx_models[] = | |||
124 | 1, &zero_key, 0, 0x40000000 }, | 141 | 1, &zero_key, 0, 0x40000000 }, |
125 | [MODEL_ZENXFI3] = {"Zen X-Fi3", dualboot_zenxfi3, sizeof(dualboot_zenxfi3), "zxf3", 83, | 142 | [MODEL_ZENXFI3] = {"Zen X-Fi3", dualboot_zenxfi3, sizeof(dualboot_zenxfi3), "zxf3", 83, |
126 | 1, &zero_key, 0, 0x40000000 }, | 143 | 1, &zero_key, 0, 0x40000000 }, |
144 | [MODEL_ZENXFISTYLE] = {"Zen X-Fi Style", NULL, 0, "", -1, | ||
145 | 1, &zero_key, 0, 0x40000000 }, | ||
127 | }; | 146 | }; |
128 | 147 | ||
129 | #define NR_IMX_SUMS (sizeof(imx_sums) / sizeof(imx_sums[0])) | 148 | #define NR_IMX_SUMS (sizeof(imx_sums) / sizeof(imx_sums[0])) |
diff --git a/rbutil/mkimxboot/mkimxboot.h b/rbutil/mkimxboot/mkimxboot.h index 1c3711023c..9551b11f4c 100644 --- a/rbutil/mkimxboot/mkimxboot.h +++ b/rbutil/mkimxboot/mkimxboot.h | |||
@@ -58,6 +58,7 @@ enum imx_model_t | |||
58 | MODEL_FUZEPLUS = 0, | 58 | MODEL_FUZEPLUS = 0, |
59 | MODEL_ZENXFI2 = 1, | 59 | MODEL_ZENXFI2 = 1, |
60 | MODEL_ZENXFI3 = 2, | 60 | MODEL_ZENXFI3 = 2, |
61 | MODEL_ZENXFISTYLE = 3, | ||
61 | /* new models go here */ | 62 | /* new models go here */ |
62 | 63 | ||
63 | NUM_MODELS | 64 | NUM_MODELS |
@@ -71,6 +72,8 @@ enum imx_firmware_variant_t | |||
71 | VARIANT_ZENXFI2_NAND, | 72 | VARIANT_ZENXFI2_NAND, |
72 | VARIANT_ZENXFI2_SD, | 73 | VARIANT_ZENXFI2_SD, |
73 | VARIANT_ZENXFI2_RECOVERY, | 74 | VARIANT_ZENXFI2_RECOVERY, |
75 | /* For the Creative X-Fi Style */ | ||
76 | VARIANT_ZENXFISTYLE_RECOVERY, | ||
74 | /* Last */ | 77 | /* Last */ |
75 | VARIANT_COUNT | 78 | VARIANT_COUNT |
76 | }; | 79 | }; |