From 433d408b9d1f391b9dcb721449a90e0dc39f5ba8 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sat, 31 Jan 2004 15:27:43 +0000 Subject: 2004-01-31 Ralf Corsepius * Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am, start/Makefile.am, startup/Makefile.am, timer/Makefile.am, wrapup/Makefile.am. Use automake compilation rules. * clock/Makefile.am, console/Makefile.am, start/Makefile.am, startup/Makefile.am, timer/Makefile.am, wrapup/Makefile.am: Remove. * configure.ac: Reflect changes above. --- c/src/lib/libbsp/mips/jmr3904/start/.cvsignore | 2 -- c/src/lib/libbsp/mips/jmr3904/start/Makefile.am | 37 ------------------------- c/src/lib/libbsp/mips/jmr3904/start/regs.S | 2 +- c/src/lib/libbsp/mips/jmr3904/start/start.S | 20 ++++++------- 4 files changed, 11 insertions(+), 50 deletions(-) delete mode 100644 c/src/lib/libbsp/mips/jmr3904/start/.cvsignore delete mode 100644 c/src/lib/libbsp/mips/jmr3904/start/Makefile.am (limited to 'c/src/lib/libbsp/mips/jmr3904/start') diff --git a/c/src/lib/libbsp/mips/jmr3904/start/.cvsignore b/c/src/lib/libbsp/mips/jmr3904/start/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/mips/jmr3904/start/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/mips/jmr3904/start/Makefile.am b/c/src/lib/libbsp/mips/jmr3904/start/Makefile.am deleted file mode 100644 index 8e096cebcd..0000000000 --- a/c/src/lib/libbsp/mips/jmr3904/start/Makefile.am +++ /dev/null @@ -1,37 +0,0 @@ -## -## $Id$ -## - -S_FILES = start.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(S_O_FILES) - -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am -include $(top_srcdir)/../../bspstart.am - -# -# (OPTIONAL) Add local stuff here using += -# - -project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) - -all-local: $(TMPINSTALL_FILES) - -EXTRA_DIST = start.S - -TMPINSTALL_FILES = - -$(PROJECT_LIB)/$(dirstamp): - @$(mkdir_p) $(PROJECT_LIB) - @: > $(PROJECT_LIB)/$(dirstamp) -TMPINSTALL_FILES += $(PROJECT_LIB)/$(dirstamp) - -$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) -TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) - -CLEANFILES = $(TMPINSTALL_FILES) - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/mips/jmr3904/start/regs.S b/c/src/lib/libbsp/mips/jmr3904/start/regs.S index c673e5e1c9..07ab06ad92 100644 --- a/c/src/lib/libbsp/mips/jmr3904/start/regs.S +++ b/c/src/lib/libbsp/mips/jmr3904/start/regs.S @@ -63,7 +63,7 @@ #define PHYS_TO_K1(a) ((unsigned)(a) | K1BASE) -/* Standard Co-Processor 0 register numbers: +/* Standard Co-Processor 0 register numbers: */ #define C0_COUNT $9 /* Count Register */ #define C0_SR $12 /* Status Register */ #define C0_CAUSE $13 /* last exception description */ diff --git a/c/src/lib/libbsp/mips/jmr3904/start/start.S b/c/src/lib/libbsp/mips/jmr3904/start/start.S index 525232e2c8..77435d2376 100644 --- a/c/src/lib/libbsp/mips/jmr3904/start/start.S +++ b/c/src/lib/libbsp/mips/jmr3904/start/start.S @@ -50,19 +50,19 @@ .ent _start _start: .set noreorder - # Get the address of start into $5 in a position independent fashion. - # This lets us know whether we have been relocated or not. - + /* Get the address of start into $5 in a position independent fashion. + ** This lets us know whether we have been relocated or not. + */ $LF1 = . + 8 bal $LF1 nop _branch: move $5, $31 # $5 == where are we li $6, 0x8800000c # $6 == where we want to be - #la $6,_branch +/* #la $6,_branch */ beq $5, $6, _start_in_ram nop - # relocate the code from EEPROM to RAM + /* relocate the code from EEPROM to RAM */ la $7, _edata relocate: lw $8, ($5) # $8 = *EEPROM @@ -164,10 +164,10 @@ init: jal boot_card # call the program start function nop - # fall through to the "exit" routine - jal _sys_exit # call libc exit to run the G++ - # destructors - move a0,v0 # pass through the exit code + /* fall through to the "exit" routine */ + jal _sys_exit /* call libc exit to run the G++ */ + /* destructors */ + move a0,v0 /* pass through the exit code */ .end init /* @@ -186,7 +186,7 @@ _sys_exit: jal _mcleanup nop #endif - # break instruction can cope with 0xfffff, but GAS limits the range: + /* break instruction can cope with 0xfffff, but GAS limits the range: */ break 1023 nop b 7b # but loop back just in-case -- cgit v1.2.3