Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mkamsboot: fix some Clipv2 that we used to brick

Browse source 
On those models the software bootloader is entered through the SWI vector,
not through the reset vector like we thought.

Use put_uint32le() instead of memcpy
Use mov pc, #0x200 instead of b 0x200, so we can use the same instruction
for both vectors.

Tested on Clipv2 and Clip Zip

Change-Id: I99dc24167dde5558d34fe9795c65b44ff91aa665
This commit is contained in:
Rafaël Carré 2012-01-31 14:18:25 -05:00
parent 54044fd6e9
commit 88cda7eb26
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
rbutil/mkamsboot/mkamsboot.c
View file

@ -474,15 +474,15 @@ void patch_firmware(
memcpy(buf + 0x600, ams_identity[model].bootloader, ams_identity[model].bootloader_size); memcpy(buf + 0x600, ams_identity[model].bootloader, ams_identity[model].bootloader_size);
/* Insert vectors, they won't overwrite the OF version string */ /* Insert vectors, they won't overwrite the OF version string */
static const uint32_t goto_start = 0xe3a0fc02; // mov pc, #0x200
/* Reset vector: branch 0x200 bytes away, to our dualboot code */ static const uint32_t infinite_loop = 0xeafffffe; // 1: b 1b
static const uint8_t b_0x200[4] = { 0x7e, 0x00, 0x00, 0xea }; // b 0x200 /* ALL vectors: infinite loop */
memcpy(buf + 0x400, b_0x200, sizeof(b_0x200)); for (i=0; i < 8; i++)
put_uint32le(buf + 0x400 + 4*i, infinite_loop);
/* Other vectors: infinite loops */ /* Now change only the interesting vectors */
static const uint8_t b_1b[4] = { 0xfe, 0xff, 0xff, 0xea }; // 1: b 1b /* Reset/SWI vectors: branch to our dualboot code at 0x200 */
for (i=1; i < 8; i++) put_uint32le(buf + 0x400 + 4*0, goto_start); // Reset
memcpy(buf + 0x400 + 4*i, b_1b, sizeof(b_1b)); put_uint32le(buf + 0x400 + 4*2, goto_start); // SWI
/* We are filling the firmware buffer backwards from the end */ /* We are filling the firmware buffer backwards from the end */
p = buf + 0x400 + firmware_size; p = buf + 0x400 + firmware_size;