From 62edf8e35eba3fe0fc5f05814853e9dbbf0febef Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Tue, 21 Aug 2001 04:50:37 +0000
Subject: [PATCH] Minor glitch fix for reset16 from last checkin.

---
 src/arch/i386/config/ldscript.base | 5 +++--
 src/arch/i386/config/make.base     | 2 +-
 src/arch/i386/lib/cpu_reset.inc    | 1 +
 src/cpu/i386/reset16.inc           | 6 +++---
 src/cpu/i386/reset16.lds           | 9 +++------
 src/northbridge/intel/440gx/Config | 1 +
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/arch/i386/config/ldscript.base b/src/arch/i386/config/ldscript.base
index 85fc5d2125..a3b8a844a3 100644
--- a/src/arch/i386/config/ldscript.base
+++ b/src/arch/i386/config/ldscript.base
@@ -41,6 +41,7 @@ SECTIONS
 	.text (.) : {
 		_text = .;
 		*(.text);
+		*(.text.*);
 		_etext = .;
 	}
 	.rodata (.) :  {
@@ -92,8 +93,8 @@ SECTIONS
 		_estack = .;
 	}
 
-
 	/DISCARD/ : {
-		*(*)
+		*(.comment)
+		*(.note)
 	}
 }
diff --git a/src/arch/i386/config/make.base b/src/arch/i386/config/make.base
index 9dcbccd225..0ae160c49c 100644
--- a/src/arch/i386/config/make.base
+++ b/src/arch/i386/config/make.base
@@ -27,7 +27,7 @@ addaction linuxbios.rom export size=`ls -l linuxbios.strip | (read p c u g size
 addaction linuxbios.rom echo $$size ; \
 addaction linuxbios.rom dd if=linuxbios.strip of=linuxbios.rom bs=1 seek=`expr $(ROM_IMAGE_SIZE) - $$size`
 
-makerule linuxbios.strip: linuxbios ; objcopy -O binary -R .note -R .comment -S linuxbios linuxbios.strip
+makerule linuxbios.strip: linuxbios ; objcopy -O binary linuxbios linuxbios.strip
 
 makerule linuxbios.o : crt0.o linuxbios.a $(LIBGCC_FILE_NAME)  ; $(CC) -nostdlib -r -o $@ crt0.o linuxbios.a $(LIBGCC_FILE_NAME)
 
diff --git a/src/arch/i386/lib/cpu_reset.inc b/src/arch/i386/lib/cpu_reset.inc
index ad20ceed83..4ea1a03f98 100644
--- a/src/arch/i386/lib/cpu_reset.inc
+++ b/src/arch/i386/lib/cpu_reset.inc
@@ -1,4 +1,5 @@
 jmp cpu_reset_out
+#include <cpu/p6/mtrr.h>
 
 #ifdef DEBUG
 cpu_reset_str:		.string "cpu_reset\r\n";
diff --git a/src/cpu/i386/reset16.inc b/src/cpu/i386/reset16.inc
index 8ad1a77dcb..4138c0cad5 100644
--- a/src/cpu/i386/reset16.inc
+++ b/src/cpu/i386/reset16.inc
@@ -1,4 +1,4 @@
-	.section ".text.reset_vector"
+	.section ".reset"
 	.code16
 .globl	EXT(reset_vector)
 EXT(reset_vector):
@@ -20,5 +20,5 @@ EXT(reset_vector):
 #error	_ROMBASE is an unsupported value
 #endif
 
-	.text
-	.code32	
+	.code32
+	.previous
diff --git a/src/cpu/i386/reset16.lds b/src/cpu/i386/reset16.lds
index e58b8ef2c3..f172e1f9e5 100644
--- a/src/cpu/i386/reset16.lds
+++ b/src/cpu/i386/reset16.lds
@@ -2,16 +2,13 @@
  *      _ROMTOP                 : The top of the rom used where we
  *				  need to put the reset vector.
  */
-	_ROMTOP = (_ROMBASE >= 0xffff0000)? 0xfffffff0 : 0xffff0;
 
 SECTIONS {
+	_ROMTOP = (_ROMBASE >= 0xffff0000)? 0xfffffff0 : 0xffff0;
 	. = _ROMTOP;
-	.text.reset_vector (.): {
-		*(.text.reset_vector)
+	.reset (.): {
+		*(.reset)
 		. = 15 ;
 		BYTE(0x00);
 	} 
-	/DISCARD/ : {
-		*(*)
-	}
 }
diff --git a/src/northbridge/intel/440gx/Config b/src/northbridge/intel/440gx/Config
index f5e041c79d..2c738b0332 100644
--- a/src/northbridge/intel/440gx/Config
+++ b/src/northbridge/intel/440gx/Config
@@ -2,5 +2,6 @@ mainboardinit northbridge/intel/440gx/raminit.inc
 mainboardinit sdram/generic_sdram_enable.inc
 mainboardinit sdram/generic_sdram.inc
 mainboardinit sdram/generic_zero_ecc_sdram.inc
+mainboardinit arch/i386/lib/cpu_reset.inc
 
 object northbridge.o