diff options
| author | isiora <none@example.com> | 2018-02-27 00:19:19 +0000 |
|---|---|---|
| committer | isiora <none@example.com> | 2018-02-27 00:19:19 +0000 |
| commit | fd8f6287118b696656a9363556403fb98d6a59ff (patch) | |
| tree | 901afe48ea1dca214b4f6799969096015fb94f3e /os/common | |
| parent | d7cd4283068b0974b2ed54f1c3aad07add5b44d5 (diff) | |
| download | ChibiOS-fd8f6287118b696656a9363556403fb98d6a59ff.tar.gz ChibiOS-fd8f6287118b696656a9363556403fb98d6a59ff.tar.bz2 ChibiOS-fd8f6287118b696656a9363556403fb98d6a59ff.zip | |
Cleanup interworking code.
git-svn-id: https://svn.code.sf.net/p/chibios/svn2/trunk@11576 110e8d01-0319-4d1e-a829-52ad28d1bb01
Diffstat (limited to 'os/common')
| -rw-r--r-- | os/common/startup/ARMCAx-TZ/compilers/GCC/crt0.S | 31 | ||||
| -rwxr-xr-x | os/common/startup/ARMCAx-TZ/compilers/GCC/ld/SAMA5D2.ld | 3 | ||||
| -rw-r--r-- | os/common/startup/ARMCAx-TZ/compilers/GCC/ld/SAMA5D2ddr.ld | 3 |
3 files changed, 6 insertions, 31 deletions
diff --git a/os/common/startup/ARMCAx-TZ/compilers/GCC/crt0.S b/os/common/startup/ARMCAx-TZ/compilers/GCC/crt0.S index 368978006..4810ea0f6 100644 --- a/os/common/startup/ARMCAx-TZ/compilers/GCC/crt0.S +++ b/os/common/startup/ARMCAx-TZ/compilers/GCC/crt0.S @@ -87,17 +87,7 @@ Reset_Handler: /*
* Early initialization.
*/
-#if !defined(THUMB_NO_INTERWORKING)
bl __early_init
-#else /* defined(THUMB_NO_INTERWORKING) */
- add r0, pc, #1
- bx r0
- .code 16
- bl __early_init
- mov r0, pc
- bx r0
- .code 32
-#endif /* defined(THUMB_NO_INTERWORKING) */
/*
* Data initialization.
@@ -125,34 +115,13 @@ bssloop: /*
* Late initialization.
*/
-#if !defined(THUMB_NO_INTERWORKING)
bl __core_init
bl __late_init
-#else /* defined(THUMB_NO_INTERWORKING) */
- add r0, pc, #1
- bx r0
- .code 16
- bl __late_init
- mov r0, pc
- bx r0
- .code 32
-#endif /* defined(THUMB_NO_INTERWORKING) */
-
/*
* Main program invocation.
*/
-#if defined(THUMB_NO_INTERWORKING)
- add r0, pc, #1
- bx r0
- .code 16
- bl main
- ldr r1, =__default_exit
- bx r1
- .code 32
-#else /* !defined(THUMB_NO_INTERWORKING) */
bl main
b __default_exit
-#endif /* !defined(THUMB_NO_INTERWORKING) */
#endif /* !defined(__DOXYGEN__) */
diff --git a/os/common/startup/ARMCAx-TZ/compilers/GCC/ld/SAMA5D2.ld b/os/common/startup/ARMCAx-TZ/compilers/GCC/ld/SAMA5D2.ld index fbbe88f55..1005239aa 100755 --- a/os/common/startup/ARMCAx-TZ/compilers/GCC/ld/SAMA5D2.ld +++ b/os/common/startup/ARMCAx-TZ/compilers/GCC/ld/SAMA5D2.ld @@ -41,3 +41,6 @@ REGION_ALIAS("DATA_RAM", ram0); REGION_ALIAS("BSS_RAM", ram0);
INCLUDE rules.ld
+
+ENTRY(Boot_Handler);
+
diff --git a/os/common/startup/ARMCAx-TZ/compilers/GCC/ld/SAMA5D2ddr.ld b/os/common/startup/ARMCAx-TZ/compilers/GCC/ld/SAMA5D2ddr.ld index ea3f8dd13..1246d183c 100644 --- a/os/common/startup/ARMCAx-TZ/compilers/GCC/ld/SAMA5D2ddr.ld +++ b/os/common/startup/ARMCAx-TZ/compilers/GCC/ld/SAMA5D2ddr.ld @@ -41,3 +41,6 @@ REGION_ALIAS("DATA_RAM", ram0); REGION_ALIAS("BSS_RAM", ram0);
INCLUDE rules.ld
+
+ENTRY(Boot_Handler);
+
|