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 b99252100306cac235df1166ee562b9ed5acbc76..b859bcbd0d6f9f3ac37355b7ad83f26ec84bfc0c 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 f3d28ef9450ce06083739087bae00a50d2e78830..671305ac9ae0a8da533ac27af5dcec1605a33af8 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 719ecbaa101d131cc7b3d8afffc2505283b6f28d..0f5011ae36c76855f5be5c3d56ab5064b758f478 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 4d6603cb5ec07a56894f96e9a4ec13fe16df4821..d2436bce417221c00f4204c6a6dd2e060b5ce149 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 50534b615b941326247a09455bf368fdbd0ebfc1..f20675af19c86c16ab426ef691027992b4b25f21 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/reset.S
deleted file mode 100644 (file)
index 07a7384..0000000
--- a/cpu/i386/reset.S
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *  U-boot - i386 Startup Code
- *
- *  Copyright (c) 2002 Omicron Ceti AB, Daniel Engström <denaiel@omicron.se>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * 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., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-/* Reset vector, jumps to start16.S */
-
-.extern start16
-
-.section .reset, "ax"
-.code16
-reset_vector:
-       cli
-       cld
-       jmp start16
-
-       .org 0xf
-       nop

diff --git a/cpu/i386/resetvec.S b/cpu/i386/resetvec.S
new file mode 100644 (file)
index 0000000..d9222dd
--- /dev/null
+++ b/cpu/i386/resetvec.S
@@ -0,0 +1,37 @@
+/*
+ *  U-boot - i386 Startup Code
+ *
+ *  Copyright (c) 2002 Omicron Ceti AB, Daniel Engström <denaiel@omicron.se>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * 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., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+/* Reset vector, jumps to start16.S */
+
+.extern start16
+
+.section .resetvec, "ax"
+.code16
+reset_vector:
+       cli
+       cld
+       jmp start16
+
+       .org 0xf
+       nop