Fixed compile error in start.S with new IO device defines

t-crest · Jun 24, 2015 · e46d020 · e46d020
1 parent 0b58689
commit e46d020
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 13 deletions.
diff --git a/c/src/lib/libbsp/patmos/pasim/include/pasim.h b/c/src/lib/libbsp/patmos/pasim/include/pasim.h
@@ -29,6 +29,11 @@ extern "C" {
 #define _shadow_stack_base 0x4000000
 #define _stack_cache_base 0x3000000
 
+#define __PATMOS_CPUINFO_BASE  0xF0000000
+#define __PATMOS_UART_BASE     0xF0080000
+#define __PATMOS_TIMER_BASE    0xF0020000
+#define __PATMOS_EXCUNIT_BASE  0xF0010000
+
 #ifndef ASM
 
 #define _IODEV __attribute__((address_space(1)))
@@ -39,7 +44,6 @@ typedef _IODEV unsigned int volatile * const _iodev_ptr_t;
 /*
  * CPU Info Management
  */
-#define __PATMOS_CPUINFO_BASE  0xF0000000
 
 /* Address to access the CPU id */
 #define __PATMOS_CPU_ID_ADDR (__PATMOS_CPUINFO_BASE + 0x00)
@@ -61,7 +65,6 @@ typedef _IODEV unsigned int volatile * const _iodev_ptr_t;
 /*
  * UART Management
  */
-#define __PATMOS_UART_BASE  0xF0080000
 
 /*
  *  The following defines the bits in the PASIM UART Status Registers.
@@ -107,8 +110,6 @@ typedef _IODEV unsigned int volatile * const _iodev_ptr_t;
 /*
  * RTC Management
  */
-#define __PATMOS_TIMER_BASE    0xF0020000
-#define __PATMOS_EXCUNIT_BASE  0xF0010000
 
 extern uint64_t get_cpu_usecs (void);
 

diff --git a/c/src/lib/libbsp/patmos/tcrest/include/bsp.h b/c/src/lib/libbsp/patmos/tcrest/include/bsp.h
@@ -37,6 +37,11 @@ extern "C" {
 #define PROM_SIZE 0K
 #define PROM_END PROM_START + PROM_SIZE
 
+#define __PATMOS_CPUINFO_BASE   0xF0000000
+#define __PATMOS_UART_BASE      0xF0080000
+#define __PATMOS_TIMER_BASE     0xF0020000
+#define __PATMOS_EXCUNIT_BASE   0xF0010000
+
 #ifndef ASM
 
 #include <bspopts.h>

diff --git a/c/src/lib/libbsp/patmos/tcrest/include/tcrest.h b/c/src/lib/libbsp/patmos/tcrest/include/tcrest.h
@@ -29,6 +29,11 @@ extern "C" {
 #define _shadow_stack_base 0x00100000
 #define _stack_cache_base 0x000f0000
 
+#define __PATMOS_CPUINFO_BASE   0xF0000000
+#define __PATMOS_UART_BASE      0xF0080000
+#define __PATMOS_TIMER_BASE     0xF0020000
+#define __PATMOS_EXCUNIT_BASE   0xF0010000
+
 #ifndef ASM
 
 #define _IODEV __attribute__((address_space(1)))
@@ -55,8 +60,6 @@ typedef volatile int (*entrypoint_t)(void);
 /*
  * CPU Info Management
  */
-#define __PATMOS_CPUINFO_BASE   0xF0000000
-
 /* Address to access the CPU id */
 #define __PATMOS_CPU_ID_ADDR (__PATMOS_CPUINFO_BASE + 0x00)
 
@@ -77,7 +80,6 @@ typedef volatile int (*entrypoint_t)(void);
 /*
  * UART Management
  */
-#define __PATMOS_UART_BASE     0xF0080000
 
 /*
  *  The following defines the bits in the TCREST UART Status Registers.
@@ -123,8 +125,6 @@ typedef volatile int (*entrypoint_t)(void);
 /*
  * RTC Management
  */
-#define __PATMOS_TIMER_BASE   0xF0020000
-#define __PATMOS_EXCUNIT_BASE  0xF0010000
 
 extern uint64_t get_cpu_usecs (void);
 

diff --git a/c/src/lib/libbsp/patmos/tcrestmp/include/tcrestmp.h b/c/src/lib/libbsp/patmos/tcrestmp/include/tcrestmp.h
@@ -29,6 +29,11 @@ extern "C" {
 #define _shadow_stack_base 0x00200000
 #define _stack_cache_base 0x001f8000
 
+#define __PATMOS_CPUINFO_BASE    0xF0000000
+#define __PATMOS_UART_BASE       0xF0080000
+#define __PATMOS_TIMER_BASE      0xF0020000
+#define __PATMOS_EXCUNIT_BASE    0xF0010000
+
 #ifndef ASM
 
 #define _IODEV __attribute__((address_space(1)))
@@ -55,7 +60,6 @@ typedef volatile int (*entrypoint_t)(void);
 /*
  * CPU Info Management
  */
-#define __PATMOS_CPUINFO_BASE     0xF0000000
 
 /* Address to access the CPU id */
 #define __PATMOS_CPU_ID_ADDR (__PATMOS_CPUINFO_BASE + 0x00)
@@ -77,7 +81,6 @@ typedef volatile int (*entrypoint_t)(void);
 /*
  * UART Management
  */
-#define __PATMOS_UART_BASE     0xF0080000
 
 /*
  *  The following defines the bits in the TCREST UART Status Registers.
@@ -124,8 +127,6 @@ typedef volatile int (*entrypoint_t)(void);
  * RTC Management
  */
 
-#define __PATMOS_TIMER_BASE    0xF0020000
-#define __PATMOS_EXCUNIT_BASE  0xF0010000
 
 extern uint64_t get_cpu_usecs (void);