diff options
| author | Bernard Xiong <[email protected]> | 2018-06-10 18:01:15 +0800 |
|---|---|---|
| committer | Bernard Xiong <[email protected]> | 2018-06-10 18:01:15 +0800 |
| commit | 564df04da1e0d0e7e3ac374fc7c3a51f2b0dba21 (patch) | |
| tree | bf6c7b6d4514f8187d1ba4c87a7afc1ee641d901 /libcpu | |
| parent | 8e67f65688eae1da7c9191de5c983e828fce3c91 (diff) | |
| parent | e1a57f053a4b77cabaf988779c107c54c7995e77 (diff) | |
Merge branch 'master' of https://github.com/RT-Thread/rt-thread
Diffstat (limited to 'libcpu')
| -rw-r--r-- | libcpu/SConscript | 6 | ||||
| -rw-r--r-- | libcpu/arm/arm926/start_gcc.S | 7 | ||||
| -rw-r--r-- | libcpu/arm/arm926/start_iar.S | 7 | ||||
| -rw-r--r-- | libcpu/arm/arm926/start_rvds.S | 5 |
4 files changed, 15 insertions, 10 deletions
diff --git a/libcpu/SConscript b/libcpu/SConscript index 0d00976092..a42909e64c 100644 --- a/libcpu/SConscript +++ b/libcpu/SConscript @@ -4,6 +4,7 @@ from building import * comm = rtconfig.ARCH + '/common' path = rtconfig.ARCH + '/' + rtconfig.CPU +ASFLAGS = '' # The set of source files associated with this SConscript file. if rtconfig.PLATFORM == 'armcc': @@ -21,7 +22,10 @@ if rtconfig.PLATFORM == 'cl': if rtconfig.PLATFORM == 'mingw': src = Glob(path + '/*.c') +if rtconfig.PLATFORM == 'armcc' and rtconfig.ARCH == 'arm' and rtconfig.CPU == 'arm926': + ASFLAGS = ' --cpreproc' + CPPPATH = [RTT_ROOT + '/libcpu/' + rtconfig.ARCH + '/' + rtconfig.CPU, RTT_ROOT + '/libcpu/' + rtconfig.ARCH + '/common'] -group = DefineGroup(rtconfig.CPU.upper(), src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup(rtconfig.CPU.upper(), src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/arm/arm926/start_gcc.S b/libcpu/arm/arm926/start_gcc.S index 1ccff156b0..130bc041f8 100644 --- a/libcpu/arm/arm926/start_gcc.S +++ b/libcpu/arm/arm926/start_gcc.S @@ -24,7 +24,9 @@ * 2015-04-21 ArdaFu Remove remap code. Using mmu to map vector table * 2015-06-04 aozima Align stack address to 8 byte. */ - + +#include "rt_low_level_init.h" + #define S_FRAME_SIZE (18*4) //72 @#define S_SPSR (17*4) //SPSR @@ -54,9 +56,8 @@ #define MODE_ABT 0x17 #define MODE_UND 0x1B #define MODEMASK 0x1F -#define NOINT 0xC0 -.include "rt_low_level_gcc.inc" +#define NOINT 0xC0 @;----------------------- Stack and Heap Definitions --------------------------- .section .nobss, "w" diff --git a/libcpu/arm/arm926/start_iar.S b/libcpu/arm/arm926/start_iar.S index 3494b108d7..880f2d9706 100644 --- a/libcpu/arm/arm926/start_iar.S +++ b/libcpu/arm/arm926/start_iar.S @@ -24,7 +24,9 @@ ; * 2015-04-21 ArdaFu Remove remap code. Using mmu to map vector table ; * 2015-06-04 aozima Align stack address to 8 byte. ; */ - + +#include "rt_low_level_init.h" + #define S_FRAME_SIZE (18*4) ;72 ;#define S_SPSR (17*4) ;SPSR @@ -54,9 +56,8 @@ #define MODE_ABT 0x17 #define MODE_UND 0x1B #define MODEMASK 0x1F -#define NOINT 0xC0 -#include "rt_low_level_iar.inc" +#define NOINT 0xC0 ;----------------------- Stack and Heap Definitions ---------------------------- MODULE ?cstartup diff --git a/libcpu/arm/arm926/start_rvds.S b/libcpu/arm/arm926/start_rvds.S index 1c1e48c07e..9f789b97f7 100644 --- a/libcpu/arm/arm926/start_rvds.S +++ b/libcpu/arm/arm926/start_rvds.S @@ -25,6 +25,8 @@ ; * 2015-06-04 aozima Align stack address to 8 byte. ; */ +#include "rt_low_level_init.h" + S_FRAME_SIZE EQU (18*4) ;72 ;S_SPSR EQU (17*4) ;SPSR ;S_CPSR EQU (16*4) ;CPSR @@ -46,7 +48,6 @@ S_PC EQU (15*4) ;R15 ;S_R1 EQU (1*4) ;S_R0 EQU (0*4) - MODE_USR EQU 0X10 MODE_FIQ EQU 0X11 MODE_IRQ EQU 0X12 @@ -57,8 +58,6 @@ MODE_SYS EQU 0X1F MODEMASK EQU 0X1F NOINT EQU 0xC0 - - GET rt_low_level_keil.inc ;----------------------- Stack and Heap Definitions ---------------------------- AREA STACK, NOINIT, READWRITE, ALIGN=3 |
