devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

mkimxboot: fix bootloader load address, replace call by jump on final call to have a clean boot

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30922 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Amaury Pouly 2011-11-06 20:40:54 +00:00
parent 0609bfd9f3
commit d9b7d58fa6
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rbutil/mkimxboot/mkimxboot.c
View file

@ -80,7 +80,7 @@ static struct crypto_key_t zero_key =
static const struct imx_model_desc_t imx_models[] = static const struct imx_model_desc_t imx_models[] =
{ {
[MODEL_FUZEPLUS] = { "Fuze+", dualboot_fuzeplus, sizeof(dualboot_fuzeplus), "fuz+", 72, [MODEL_FUZEPLUS] = { "Fuze+", dualboot_fuzeplus, sizeof(dualboot_fuzeplus), "fuz+", 72,
1, &zero_key }, 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]))
@ -163,7 +163,7 @@ static enum imx_error_t patch_std_zero_host_play(int jump_before, int model,
rock_sec.insts[0].size = boot_sz; rock_sec.insts[0].size = boot_sz;
rock_sec.insts[0].data = memdup(boot, boot_sz); rock_sec.insts[0].data = memdup(boot, boot_sz);
rock_sec.insts[0].addr = imx_models[model].bootloader_addr; rock_sec.insts[0].addr = imx_models[model].bootloader_addr;
rock_sec.insts[1].inst = SB_INST_CALL; rock_sec.insts[1].inst = SB_INST_JUMP;
rock_sec.insts[1].addr = imx_models[model].bootloader_addr; rock_sec.insts[1].addr = imx_models[model].bootloader_addr;
rock_sec.insts[1].argument = MAGIC_NORMAL; rock_sec.insts[1].argument = MAGIC_NORMAL;
@ -187,7 +187,7 @@ static enum imx_error_t patch_std_zero_host_play(int jump_before, int model,
new_insts[jump_idx + 0].size = boot_sz; new_insts[jump_idx + 0].size = boot_sz;
new_insts[jump_idx + 0].data = memdup(boot, boot_sz); new_insts[jump_idx + 0].data = memdup(boot, boot_sz);
new_insts[jump_idx + 0].addr = imx_models[model].bootloader_addr; new_insts[jump_idx + 0].addr = imx_models[model].bootloader_addr;
new_insts[jump_idx + 1].inst = SB_INST_CALL; new_insts[jump_idx + 1].inst = SB_INST_JUMP;
new_insts[jump_idx + 1].addr = imx_models[model].bootloader_addr; new_insts[jump_idx + 1].addr = imx_models[model].bootloader_addr;
new_insts[jump_idx + 1].argument = recovery ? MAGIC_RECOVERY : MAGIC_NORMAL; new_insts[jump_idx + 1].argument = recovery ? MAGIC_RECOVERY : MAGIC_NORMAL;