mkimxboot: add partial support for the Zen X-Fi Style

Change-Id: I3428a398959dfd7fc46175d87fc67acce6a75171
This commit is contained in:
Amaury Pouly 2013-01-26 18:37:12 +00:00
parent 2c36c82a89
commit f2dfc84760
3 changed files with 23 additions and 0 deletions

View file

@ -37,6 +37,7 @@ struct imx_variant_t imx_variants[] =
{ "zenxfi2-recovery", VARIANT_ZENXFI2_RECOVERY }, { "zenxfi2-recovery", VARIANT_ZENXFI2_RECOVERY },
{ "zenxfi2-nand", VARIANT_ZENXFI2_NAND }, { "zenxfi2-nand", VARIANT_ZENXFI2_NAND },
{ "zenxfi2-sd", VARIANT_ZENXFI2_SD }, { "zenxfi2-sd", VARIANT_ZENXFI2_SD },
{ "zenxfistyle-recovery", VARIANT_ZENXFISTYLE_RECOVERY },
}; };
#define NR_VARIANTS sizeof(imx_variants) / sizeof(imx_variants[0]) #define NR_VARIANTS sizeof(imx_variants) / sizeof(imx_variants[0])

View file

@ -76,6 +76,7 @@ static const char *imx_fw_variant[] =
[VARIANT_ZENXFI2_RECOVERY] = "ZEN X-Fi2 Recovery", [VARIANT_ZENXFI2_RECOVERY] = "ZEN X-Fi2 Recovery",
[VARIANT_ZENXFI2_NAND] = "ZEN X-Fi2 NAND", [VARIANT_ZENXFI2_NAND] = "ZEN X-Fi2 NAND",
[VARIANT_ZENXFI2_SD] = "ZEN X-Fi2 eMMC/SD", [VARIANT_ZENXFI2_SD] = "ZEN X-Fi2 eMMC/SD",
[VARIANT_ZENXFISTYLE_RECOVERY] = "ZEN X-Fi Style Recovery",
}; };
static const struct imx_md5sum_t imx_sums[] = 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", MODEL_ZENXFI3, "a5114cd45ea4554ec221f51a71083862", "1.00.22e",
{ [VARIANT_DEFAULT] = {0, 18110576} } { [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 = 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 }, 1, &zero_key, 0, 0x40000000 },
[MODEL_ZENXFI3] = {"Zen X-Fi3", dualboot_zenxfi3, sizeof(dualboot_zenxfi3), "zxf3", 83, [MODEL_ZENXFI3] = {"Zen X-Fi3", dualboot_zenxfi3, sizeof(dualboot_zenxfi3), "zxf3", 83,
1, &zero_key, 0, 0x40000000 }, 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])) #define NR_IMX_SUMS (sizeof(imx_sums) / sizeof(imx_sums[0]))

View file

@ -58,6 +58,7 @@ enum imx_model_t
MODEL_FUZEPLUS = 0, MODEL_FUZEPLUS = 0,
MODEL_ZENXFI2 = 1, MODEL_ZENXFI2 = 1,
MODEL_ZENXFI3 = 2, MODEL_ZENXFI3 = 2,
MODEL_ZENXFISTYLE = 3,
/* new models go here */ /* new models go here */
NUM_MODELS NUM_MODELS
@ -71,6 +72,8 @@ enum imx_firmware_variant_t
VARIANT_ZENXFI2_NAND, VARIANT_ZENXFI2_NAND,
VARIANT_ZENXFI2_SD, VARIANT_ZENXFI2_SD,
VARIANT_ZENXFI2_RECOVERY, VARIANT_ZENXFI2_RECOVERY,
/* For the Creative X-Fi Style */
VARIANT_ZENXFISTYLE_RECOVERY,
/* Last */ /* Last */
VARIANT_COUNT VARIANT_COUNT
}; };