summaryrefslogtreecommitdiffstats
path: root/rbutil/mkimxboot
diff options
context:
space:
mode:
authorAmaury Pouly <amaury.pouly@gmail.com>2013-01-26 18:37:12 +0000
committerAmaury Pouly <amaury.pouly@gmail.com>2013-01-26 18:37:12 +0000
commitf2dfc847603794665af781377223782dfa6d17d0 (patch)
tree434a682f58267750b7395c0018f5265f68c1265c /rbutil/mkimxboot
parent2c36c82a8993561d7b4ff0a9f2f8d9f128ccb2bf (diff)
downloadrockbox-f2dfc847603794665af781377223782dfa6d17d0.tar.gz
rockbox-f2dfc847603794665af781377223782dfa6d17d0.tar.bz2
rockbox-f2dfc847603794665af781377223782dfa6d17d0.zip
mkimxboot: add partial support for the Zen X-Fi Style
Change-Id: I3428a398959dfd7fc46175d87fc67acce6a75171
Diffstat (limited to 'rbutil/mkimxboot')
-rw-r--r--rbutil/mkimxboot/main.c1
-rw-r--r--rbutil/mkimxboot/mkimxboot.c19
-rw-r--r--rbutil/mkimxboot/mkimxboot.h3
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[] =
{ "zenxfi2-recovery", VARIANT_ZENXFI2_RECOVERY },
{ "zenxfi2-nand", VARIANT_ZENXFI2_NAND },
{ "zenxfi2-sd", VARIANT_ZENXFI2_SD },
+ { "zenxfistyle-recovery", VARIANT_ZENXFISTYLE_RECOVERY },
};
#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[] =
[VARIANT_ZENXFI2_RECOVERY] = "ZEN X-Fi2 Recovery",
[VARIANT_ZENXFI2_NAND] = "ZEN X-Fi2 NAND",
[VARIANT_ZENXFI2_SD] = "ZEN X-Fi2 eMMC/SD",
+ [VARIANT_ZENXFISTYLE_RECOVERY] = "ZEN X-Fi Style Recovery",
};
static const struct imx_md5sum_t imx_sums[] =
@@ -108,6 +109,22 @@ static const struct imx_md5sum_t imx_sums[] =
MODEL_ZENXFI3, "a5114cd45ea4554ec221f51a71083862", "1.00.22e",
{ [VARIANT_DEFAULT] = {0, 18110576} }
},
+ {
+ /* Version 1.03.04e */
+ MODEL_ZENXFISTYLE, "32a731b7f714e9f99a95991003759c98", "1.03.04",
+ {
+ [VARIANT_DEFAULT] = {842960, 29876944},
+ [VARIANT_ZENXFISTYLE_RECOVERY] = {610272, 232688},
+ }
+ },
+ {
+ /* Version 1.03.04e */
+ MODEL_ZENXFISTYLE, "2c7ee52d9984d85dd39aa49b3331e66c", "1.03.04e",
+ {
+ [VARIANT_DEFAULT] = {842960, 29876944},
+ [VARIANT_ZENXFISTYLE_RECOVERY] = {610272, 232688},
+ }
+ },
};
static struct crypto_key_t zero_key =
@@ -124,6 +141,8 @@ static const struct imx_model_desc_t imx_models[] =
1, &zero_key, 0, 0x40000000 },
[MODEL_ZENXFI3] = {"Zen X-Fi3", dualboot_zenxfi3, sizeof(dualboot_zenxfi3), "zxf3", 83,
1, &zero_key, 0, 0x40000000 },
+ [MODEL_ZENXFISTYLE] = {"Zen X-Fi Style", NULL, 0, "", -1,
+ 1, &zero_key, 0, 0x40000000 },
};
#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
MODEL_FUZEPLUS = 0,
MODEL_ZENXFI2 = 1,
MODEL_ZENXFI3 = 2,
+ MODEL_ZENXFISTYLE = 3,
/* new models go here */
NUM_MODELS
@@ -71,6 +72,8 @@ enum imx_firmware_variant_t
VARIANT_ZENXFI2_NAND,
VARIANT_ZENXFI2_SD,
VARIANT_ZENXFI2_RECOVERY,
+ /* For the Creative X-Fi Style */
+ VARIANT_ZENXFISTYLE_RECOVERY,
/* Last */
VARIANT_COUNT
};