Browse Source

[libcpu][arm][arm926] Using C header file to define stack and heap size.

ArdaFu 7 years ago
parent
commit
7a1f8ee1c4

+ 0 - 31
bsp/asm9260t/platform/rt_low_level_gcc.inc

@@ -1,31 +0,0 @@
-/*
- * File      : rt_low_level_gcc.inc
- * This file is part of RT-Thread RTOS
- * COPYRIGHT (C) 2006 - 2015, RT-Thread Development Team
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Change Logs:
- * Date           Author       Notes
- * 2015-04-14     ArdaFu      first version
- */
-
-/*--------- Stack size of CPU modes ------------------------------------------*/
-.equ UND_STK_SIZE,    2048
-.equ SVC_STK_SIZE,    4096
-.equ ABT_STK_SIZE,    2048
-.equ IRQ_STK_SIZE,    4096
-.equ FIQ_STK_SIZE,    4096
-.equ SYS_STK_SIZE,    2048

+ 6 - 2
bsp/asm9260t/platform/rt_low_level_iar.inc → bsp/asm9260t/platform/rt_low_level_init.h

@@ -1,5 +1,5 @@
 /*
- * File      : rt_low_level_iar.inc
+ * File      : rt_low_level_init.h
  * This file is part of RT-Thread RTOS
  * COPYRIGHT (C) 2006 - 2015, RT-Thread Development Team
  *
@@ -19,8 +19,10 @@
  *
  * Change Logs:
  * Date           Author       Notes
- * 2015-04-14     ArdaFu      first version
+ * 2018-06-04     ArdaFu      first version
  */
+#ifndef __RT_LOW_LEVEL_INIT_H__
+#define __RT_LOW_LEVEL_INIT_H__
  
 /*-------- Stack size of CPU modes -------------------------------------------*/
 #define UND_STK_SIZE 512
@@ -29,3 +31,5 @@
 #define IRQ_STK_SIZE 1024
 #define FIQ_STK_SIZE 1024
 #define SYS_STK_SIZE 512
+#define Heap_Size    512
+#endif

+ 0 - 33
bsp/asm9260t/platform/rt_low_level_keil.inc

@@ -1,33 +0,0 @@
-;/*
-; * File      : rt_low_level_keil.inc
-; * This file is part of RT-Thread RTOS
-; * COPYRIGHT (C) 2006 - 2015, RT-Thread Development Team
-; *
-; *  This program is free software; you can redistribute it and/or modify
-; *  it under the terms of the GNU General Public License as published by
-; *  the Free Software Foundation; either version 2 of the License, or
-; *  (at your option) any later version.
-; *
-; *  This program is distributed in the hope that it will be useful,
-; *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-; *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-; *  GNU General Public License for more details.
-; *
-; *  You should have received a copy of the GNU General Public License along
-; *  with this program; if not, write to the Free Software Foundation, Inc.,
-; *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-; *
-; * Change Logs:
-; * Date           Author       Notes
-; * 2015-04-14     ArdaFu      first version
-; */
-
-;/*-------- Stack size of CPU modes ------------------------------------------*/
-UND_STK_SIZE EQU 512
-SVC_STK_SIZE EQU 4096
-ABT_STK_SIZE EQU 512
-IRQ_STK_SIZE EQU 1024
-FIQ_STK_SIZE EQU 1024
-SYS_STK_SIZE EQU 512
-Heap_Size    EQU 512
-    END

+ 0 - 31
bsp/at91sam9260/platform/rt_low_level_gcc.inc

@@ -1,31 +0,0 @@
-/*
- * File      : rt_low_level_gcc.inc
- * This file is part of RT-Thread RTOS
- * COPYRIGHT (C) 2006 - 2015, RT-Thread Development Team
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Change Logs:
- * Date           Author       Notes
- * 2015-04-14     ArdaFu      first version
- */
-
-/*--------- Stack size of CPU modes ------------------------------------------*/
-.equ UND_STK_SIZE,    2048
-.equ SVC_STK_SIZE,    4096
-.equ ABT_STK_SIZE,    2048
-.equ IRQ_STK_SIZE,    4096
-.equ FIQ_STK_SIZE,    4096
-.equ SYS_STK_SIZE,    2048

+ 6 - 2
bsp/at91sam9260/platform/rt_low_level_iar.inc → bsp/at91sam9260/platform/rt_low_level_init.h

@@ -1,5 +1,5 @@
 /*
- * File      : rt_low_level_iar.inc
+ * File      : rt_low_level_init.h
  * This file is part of RT-Thread RTOS
  * COPYRIGHT (C) 2006 - 2015, RT-Thread Development Team
  *
@@ -19,8 +19,10 @@
  *
  * Change Logs:
  * Date           Author       Notes
- * 2015-04-14     ArdaFu      first version
+ * 2018-06-04     ArdaFu      first version
  */
+#ifndef __RT_LOW_LEVEL_INIT_H__
+#define __RT_LOW_LEVEL_INIT_H__
  
 /*-------- Stack size of CPU modes -------------------------------------------*/
 #define UND_STK_SIZE 512
@@ -29,3 +31,5 @@
 #define IRQ_STK_SIZE 1024
 #define FIQ_STK_SIZE 1024
 #define SYS_STK_SIZE 512
+#define Heap_Size    512
+#endif

+ 0 - 32
bsp/at91sam9260/platform/rt_low_level_keil.inc

@@ -1,32 +0,0 @@
-;/*
-; * File      : rt_low_level_keil.inc
-; * This file is part of RT-Thread RTOS
-; * COPYRIGHT (C) 2006 - 2015, RT-Thread Development Team
-; *
-; *  This program is free software; you can redistribute it and/or modify
-; *  it under the terms of the GNU General Public License as published by
-; *  the Free Software Foundation; either version 2 of the License, or
-; *  (at your option) any later version.
-; *
-; *  This program is distributed in the hope that it will be useful,
-; *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-; *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-; *  GNU General Public License for more details.
-; *
-; *  You should have received a copy of the GNU General Public License along
-; *  with this program; if not, write to the Free Software Foundation, Inc.,
-; *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-; *
-; * Change Logs:
-; * Date           Author       Notes
-; * 2015-04-14     ArdaFu      first version
-; */
-
-;/*-------- Stack size of CPU modes ------------------------------------------*/
-UND_STK_SIZE EQU 512
-SVC_STK_SIZE EQU 4096
-ABT_STK_SIZE EQU 512
-IRQ_STK_SIZE EQU 1024
-FIQ_STK_SIZE EQU 1024
-SYS_STK_SIZE EQU 512
-    END

+ 4 - 3
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"

+ 4 - 3
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

+ 2 - 3
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