diff options
Diffstat (limited to 'rbutil/mkamsboot/dualboot')
| -rw-r--r-- | rbutil/mkamsboot/dualboot/Makefile | 7 | ||||
| -rw-r--r-- | rbutil/mkamsboot/dualboot/dualboot.S | 8 |
2 files changed, 12 insertions, 3 deletions
diff --git a/rbutil/mkamsboot/dualboot/Makefile b/rbutil/mkamsboot/dualboot/Makefile index 06b90c7fb9..94ec718574 100644 --- a/rbutil/mkamsboot/dualboot/Makefile +++ b/rbutil/mkamsboot/dualboot/Makefile @@ -4,8 +4,8 @@ CC=gcc # adding a new target. mkamsboot.c also needs to be edited to refer to these # new images. -BOOTOBJS = nrv2e_d8.o dualboot_clip.o dualboot_e200v2.o dualboot_c200v2.o dualboot_m200v4.o dualboot_fuze.o dualboot_clipv2.o -BOOTBINS = nrv2e_d8.arm-bin dualboot_clip.arm-bin dualboot_e200v2.arm-bin dualboot_c200v2.arm-bin dualboot_m200v4.arm-bin dualboot_fuze.arm-bin dualboot_clipv2.arm-bin +BOOTOBJS = nrv2e_d8.o dualboot_clip.o dualboot_e200v2.o dualboot_c200v2.o dualboot_m200v4.o dualboot_fuze.o dualboot_clipv2.o dualboot_clipplus.o +BOOTBINS = nrv2e_d8.arm-bin dualboot_clip.arm-bin dualboot_e200v2.arm-bin dualboot_c200v2.arm-bin dualboot_m200v4.arm-bin dualboot_fuze.arm-bin dualboot_clipv2.arm-bin dualboot_clipplus.arm-bin all: dualboot.h @@ -31,6 +31,9 @@ dualboot_c200v2.o: dualboot.S dualboot_clipv2.o: dualboot.S arm-elf-gcc -DSANSA_CLIPV2 -c -o dualboot_clipv2.o dualboot.S +dualboot_clipplus.o: dualboot.S + arm-elf-gcc -DSANSA_CLIPPLUS -c -o dualboot_clipplus.o dualboot.S + # Rules for the ucl unpack function nrv2e_d8.o: nrv2e_d8.S arm-elf-gcc -DPURE_THUMB -c -o nrv2e_d8.o nrv2e_d8.S diff --git a/rbutil/mkamsboot/dualboot/dualboot.S b/rbutil/mkamsboot/dualboot/dualboot.S index 5210ba5160..fe1a64befb 100644 --- a/rbutil/mkamsboot/dualboot/dualboot.S +++ b/rbutil/mkamsboot/dualboot/dualboot.S @@ -21,7 +21,7 @@ .text - #if defined(SANSA_CLIPV2) +#if defined(SANSA_CLIPV2) || defined(SANSA_CLIPPLUS) .set RAM_SIZE, 0x100000 /* Use 1MB of SDRAM on v2 firmwares (bigger firmware) */ #else .set RAM_SIZE, 0x50000 /* Use full IRAM on v1 firmwares */ @@ -156,6 +156,12 @@ uclcopy: cmp r1, #0 /* C3 = #0 means button pressed */ beq boot_of +#elif defined(SANSA_CLIPPLUS) + /* TODO */ + mov r0, #0x500000 /* Approximately 5 seconds */ +1: subs r0, r0, #1 /* just to prove we are running */ + bne 1b + b boot_of /* branch to OF */ #elif defined(SANSA_C200V2) /* check for RIGHT on C6, should changed to LEFT as soon as it * known in which pin that is in order for consistency */ |