URL
https://opencores.org/ocsvn/minsoc/minsoc/trunk
Subversion Repositories minsoc
Compare Revisions
- This comparison shows the changes necessary to convert path
/minsoc/trunk/sw/support
- from Rev 64 to Rev 61
- ↔ Reverse comparison
Rev 64 → Rev 61
/common.mk
File deleted
common.mk
Property changes :
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: Makefile
===================================================================
--- Makefile (revision 64)
+++ Makefile (revision 61)
@@ -1,5 +1,31 @@
-include Makefile.inc
+all: libsupport.a reset-nocache.o reset-ic.o reset-dc.o reset-icdc.o except.o
-all_internal: $(RESET_NOCACHE) $(RESET_ICDC) $(EXCPT_HNDLR) $(LIB_SUPPORT)
+libsupport.a: support.o tick.o int.o
+ $(OR32_TOOL_PREFIX)-ar cru libsupport.a support.o tick.o int.o
+ $(OR32_TOOL_PREFIX)-ranlib libsupport.a
-include common.mk
\ No newline at end of file
+support.o: support.c
+ $(OR32_TOOL_PREFIX)-gcc $(GCC_OPT) -c -o $@ $?
+
+reset-nocache.o: reset.S
+ $(OR32_TOOL_PREFIX)-gcc $(GCC_OPT) -c -DIC=0 -DDC=0 -o $@ $?
+
+reset-dc.o: reset.S
+ $(OR32_TOOL_PREFIX)-gcc $(GCC_OPT) -c -DIC=0 -DDC=1 -o $@ $?
+
+reset-ic.o: reset.S
+ $(OR32_TOOL_PREFIX)-gcc $(GCC_OPT) -c -DIC=1 -DDC=0 -o $@ $?
+
+reset-icdc.o: reset.S
+ $(OR32_TOOL_PREFIX)-gcc $(GCC_OPT) -c -DIC=1 -DDC=1 -o $@ $?
+
+except.o: except.S
+ $(OR32_TOOL_PREFIX)-gcc $(GCC_OPT) -c -o $@ $?
+
+int.o: int.c
+ $(OR32_TOOL_PREFIX)-gcc $(GCC_OPT) -c -o $@ $?
+
+tick.o: tick.c
+ $(OR32_TOOL_PREFIX)-gcc $(GCC_OPT) -c -o $@ $?
+
+include Makefile.inc
Makefile
Property changes :
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: reset.S
===================================================================
--- reset.S (revision 64)
+++ reset.S (revision 61)
@@ -1,6 +1,6 @@
/* Support file for c based tests */
#include "or1200.h"
-#include "../../backend/board.h"
+#include "board.h"
.section .stack
.space STACK_SIZE
/tick.c
1,5 → 1,5
#include "or1200.h" |
#include "support.h" |
#include "../support/or1200.h" |
#include "../support/support.h" |
#include "tick.h" |
|
int tick_int; |
/board.h
0,0 → 1,40
#ifndef _BOARD_H_ |
#define _BOARD_H_ |
|
#define MC_ENABLED 0 |
|
#define IC_ENABLE 0 |
#define IC_SIZE 8192 |
#define DC_ENABLE 0 |
#define DC_SIZE 8192 |
|
|
#define IN_CLK 25000000 |
|
|
#define STACK_SIZE 0x01000 |
|
#define UART_BAUD_RATE 115200 |
|
#define UART_BASE 0x90000000 |
#define UART_IRQ 2 |
#define ETH_BASE 0x92000000 |
#define ETH_IRQ 4 |
#define I2C_BASE 0x9D000000 |
#define I2C_IRQ 3 |
#define CAN_BASE 0x94000000 |
#define CAN_IRQ 5 |
|
#define MC_BASE_ADDR 0x60000000 |
#define SPI_BASE 0xa0000000 |
|
#define ETH_DATA_BASE 0xa8000000 /* Address for ETH_DATA */ |
|
#define ETH_MACADDR0 0x00 |
#define ETH_MACADDR1 0x12 |
#define ETH_MACADDR2 0x34 |
#define ETH_MACADDR3 0x56 |
#define ETH_MACADDR4 0x78 |
#define ETH_MACADDR5 0x9a |
|
#endif |
board.h
Property changes :
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: Makefile.inc
===================================================================
--- Makefile.inc (revision 64)
+++ Makefile.inc (revision 61)
@@ -1,42 +1,20 @@
# File to be included in all makefiles
-ROOTDIR = ..
-
-BACKEND_DIR := $(ROOTDIR)/../backend
-SUPPORT_DIR := $(ROOTDIR)/support
-DRIVERS_DIR := $(ROOTDIR)/drivers
-UTILS_DIR := $(ROOTDIR)/utils
-
-OR1200_HDR := $(SUPPORT_DIR)/or1200.h
-BOARD_HDR := $(BACKEND_DIR)/board.h
-SUPPORT_HDR := $(SUPPORT_DIR)/support.h
-UART_HDR := $(DRIVERS_DIR)/uart.h
-ETH_HDR := $(DRIVERS_DIR)/eth.h
-
-RESET_NOCACHE := $(SUPPORT_DIR)/reset-nocache.o
-RESET_ICDC := $(SUPPORT_DIR)/reset-icdc.o
-
-EXCPT_HNDLR := $(SUPPORT_DIR)/except.o
-LIB_SUPPORT := $(SUPPORT_DIR)/libsupport.a
-
-SUPPORT := $(EXCPT_HNDLR) $(LIB_SUPPORT)
-DRIVERS := $(DRIVERS_DIR)/libdrivers.a
-
-LINKER_SCRIPT := $(BACKEND_DIR)/orp.ld
-
OR32_TOOL_PREFIX=or32-elf
-GCC_OPT=-mhard-mul -mhard-div -g -nostdlib
+#GCC_LIB_OPTS= -lgcc -liberty
-BIN2HEX = $(UTILS_DIR)/bin2hex
+GCC_OPT=-mhard-mul -g -nostdlib
ifdef UART_PRINTF
GCC_OPT += -DUART_PRINTF
endif
-all: all_internal
+FLASH_MEM_HEX_FILE_SUFFIX=-twobyte-sizefirst
+SRAM_MEM_HEX_FILE_SUFFIX=-fourbyte
+
# Global clean rule
clean:
@echo "Cleaning `pwd`"
- @rm -f *.o *.or32 *.log *.bin *.srec *.hex *.log stdout.txt *.vmem *.asm *.a stdout.txt
\ No newline at end of file
+ @rm -f *.o *.or32 *.log *.bin *.srec *.hex *.log stdout.txt *.vmem *.asm *.a stdout.txt
/orp.ld
0,0 → 1,69
/* |
MEMORY |
{ |
vectors : ORIGIN = 0x00000000, LENGTH = 0x00002000 |
flash : ORIGIN = 0x04000000, LENGTH = 0x00200000 |
ram : ORIGIN = 0x00002000, LENGTH = 0x001fe000 |
icm : ORIGIN = 0x00800000, LENGTH = 0x00004000 |
} |
*/ |
MEMORY |
{ |
reset : ORIGIN = 0x00000000, LENGTH = 0x00000200 |
vectors : ORIGIN = 0x00000200, LENGTH = 0x00001000 |
ram : ORIGIN = 0x00001200, LENGTH = 0x00006E00 /*0x8000 total*/ |
} |
|
SECTIONS |
{ |
.reset : |
{ |
*(.reset) |
} > reset |
|
|
|
.vectors : |
{ |
_vec_start = .; |
*(.vectors) |
_vec_end = .; |
} > vectors |
|
.text : |
{ |
*(.text) |
} > ram |
|
.rodata : |
{ |
*(.rodata) |
*(.rodata.*) |
} > ram |
|
.icm : |
{ |
_icm_start = .; |
*(.icm) |
_icm_end = .; |
} > ram |
|
.data : |
{ |
_dst_beg = .; |
*(.data) |
_dst_end = .; |
} > ram |
|
.bss : |
{ |
*(.bss) |
} > ram |
|
.stack (NOLOAD) : |
{ |
*(.stack) |
_src_addr = .; |
} > ram |
|
} |
orp.ld
Property changes :
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property