Renamed cpu/i386/reset.S to resetvec.S

Brings i386 in line with other CPUs with a reset vector and frees up reset.c
for CPU reset functions

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>

diff --git a/Makefile b/Makefile
index b992521..b859bcb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -197,7 +197,7 @@ include $(TOPDIR)/config.mk
 OBJS  = cpu/$(CPU)/start.o
 ifeq ($(CPU),i386)
 OBJS += cpu/$(CPU)/start16.o
-OBJS += cpu/$(CPU)/reset.o
+OBJS += cpu/$(CPU)/resetvec.o
 endif
 ifeq ($(CPU),ppc4xx)
 OBJS += cpu/$(CPU)/resetvec.o

diff --git a/board/eNET/u-boot.lds b/board/eNET/u-boot.lds
index f3d28ef..671305a 100644 (file)
--- a/board/eNET/u-boot.lds
+++ b/board/eNET/u-boot.lds
@@ -75,7 +75,7 @@ SECTIONS
         * The fe00 and ff00 offsets of the start32 and start16
         * segments are arbitrary, the just have to be mapped
         * at reset and the code have to fit.
-        * The fff0 offset of reset is important, however.
+        * The fff0 offset of resetvec is important, however.
         */
 
        . = 0xfffffe00;
@@ -85,6 +85,6 @@ SECTIONS
        .start16 : AT (0x3807f800) { *(.start16); }
 
        . = 0xfff0;
-       .reset : AT (0x3807fff0) { *(.reset); }
-       _i386boot_end = (LOADADDR(.reset) + SIZEOF(.reset) );
+       .resetvec : AT (0x3807fff0) { *(.resetvec); }
+       _i386boot_end = (LOADADDR(.resetvec) + SIZEOF(.resetvec) );
 }

diff --git a/board/sc520_cdp/u-boot.lds b/board/sc520_cdp/u-boot.lds
index 719ecba..0f5011a 100644 (file)
--- a/board/sc520_cdp/u-boot.lds
+++ b/board/sc520_cdp/u-boot.lds
@@ -75,7 +75,7 @@ SECTIONS
         * The fe00 and ff00 offsets of the start32 and start16
         * segments are arbitrary, the just have to be mapped
         * at reset and the code have to fit.
-        * The fff0 offset of reset is important, however.
+        * The fff0 offset of resetvec is important, however.
         */
 
 
@@ -86,6 +86,6 @@ SECTIONS
        .start16 : AT (0x387fff00) { *(.start16); }
 
        . = 0xfff0;
-       .reset : AT (0x387ffff0) { *(.reset); }
-       _i386boot_end = (LOADADDR(.reset) + SIZEOF(.reset) );
+       .resetvec : AT (0x387ffff0) { *(.resetvec); }
+       _i386boot_end = (LOADADDR(.resetvec) + SIZEOF(.resetvec) );
 }

diff --git a/board/sc520_spunk/u-boot.lds b/board/sc520_spunk/u-boot.lds
index 4d6603c..d2436bc 100644 (file)
--- a/board/sc520_spunk/u-boot.lds
+++ b/board/sc520_spunk/u-boot.lds
@@ -76,7 +76,7 @@ SECTIONS
         * The fe00 and ff00 offsets of the start32 and start16
         * segments are arbitrary, the just have to be mapped
         * at reset and the code have to fit.
-        * The fff0 offset of reset is important, however.
+        * The fff0 offset of resetvec is important, however.
         */
 
 
@@ -87,6 +87,6 @@ SECTIONS
        .start16 : AT (0x387fff00) { *(.start16); }
 
        . = 0xfff0;
-       .reset : AT (0x387ffff0) { *(.reset); }
-       _i386boot_end = (LOADADDR(.reset) + SIZEOF(.reset) );
+       .resetvec : AT (0x387ffff0) { *(.resetvec); }
+       _i386boot_end = (LOADADDR(.resetvec) + SIZEOF(.resetvec) );
 }

diff --git a/cpu/i386/Makefile b/cpu/i386/Makefile
index 50534b6..f20675a 100644 (file)
--- a/cpu/i386/Makefile
+++ b/cpu/i386/Makefile
@@ -28,7 +28,7 @@ include $(TOPDIR)/config.mk
 
 LIB    = $(obj)lib$(CPU).a
 
-START  = start.o start16.o reset.o
+START  = start.o start16.o resetvec.o
 COBJS  = serial.o interrupts.o cpu.o timer.o sc520.o
 SOBJS  = sc520_asm.o
 

diff --git a/cpu/i386/reset.S b/cpu/i386/resetvec.S
similarity index 97%
rename from cpu/i386/reset.S
rename to cpu/i386/resetvec.S
index 07a7384..d9222dd 100644 (file)
--- a/cpu/i386/reset.S
+++ b/cpu/i386/resetvec.S
@@ -26,7 +26,7 @@
 
 .extern start16
 
-.section .reset, "ax"
+.section .resetvec, "ax"
 .code16
 reset_vector:
        cli