7D2: correct CFLAG_USER, allow Thumb

This fixes #88
reticulatedpines · Mar 1, 2023 · da1d4dd · da1d4dd
1 parent fb7d62b
commit da1d4dd
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/platform/7D2.112/Makefile.platform.default b/platform/7D2.112/Makefile.platform.default
@@ -17,7 +17,7 @@ RESTARTSTART    = 0x00299e00
 
 
 # Cortex R4
-CFLAG_USER += -mlong-calls
+CFLAG_USER += -mthumb -mlong-calls
 PLATFORM_ARCH = armv7-r
 
 # these should be removed when porting starts

diff --git a/platform/7D2.112/stubs.S b/platform/7D2.112/stubs.S
@@ -33,9 +33,6 @@ NSTUB( ROMBASEADDR, firmware_entry )
 THUMB_FN(0xfe0a0af8,  pre_cstart_func) // needed to easily patch for compacting firmware_entry and cstart regions
 THUMB_FN(0xfe0a0b18,  cstart)
 ARM32_FN(0x8000a3a4,  bzero32)
-//ARM32_FN(0xfe6510d0,  create_init_task) // Using this instead of the thunk target below,
-                                          // triggers a hang.  Cause unknown, but concerning.
-                                          // See https://github.com/reticulatedpines/magiclantern_simplified/issues/88
 THUMB_FN(0x80000f78,  create_init_task)
 THUMB_FN(0xfe0a1980,  init_task)