See patch.

Uwe.
-- 
http://www.hermann-uwe.de  | http://www.holsham-traders.de
http://www.crazy-hacks.org | http://www.unmaintained-free-software.org
Remove useless udelay() duplication.

Abuild-tested for the boards that are touched.

Signed-off-by: Uwe Hermann <[email protected]>

Index: src/mainboard/supermicro/x6dhe_g/auto.c
===================================================================
--- src/mainboard/supermicro/x6dhe_g/auto.c	(Revision 4758)
+++ src/mainboard/supermicro/x6dhe_g/auto.c	(Arbeitskopie)
@@ -43,13 +43,6 @@
 #define RECVENA_CONFIG  0x0808090a
 #define RECVENB_CONFIG  0x0808090a
 
-//void udelay(int usecs)
-//{
-//        int i;
-//        for(i = 0; i < usecs; i++)
-//                outb(i&0xff, 0x80);
-//}
-
 #if 0
 static void hard_reset(void)
 {
Index: src/mainboard/supermicro/x6dhe_g2/auto.c
===================================================================
--- src/mainboard/supermicro/x6dhe_g2/auto.c	(Revision 4758)
+++ src/mainboard/supermicro/x6dhe_g2/auto.c	(Arbeitskopie)
@@ -43,13 +43,6 @@
 #define RECVENA_CONFIG  0x0708090a
 #define RECVENB_CONFIG  0x0708090a
 
-//void udelay(int usecs)
-//{
-//        int i;
-//        for(i = 0; i < usecs; i++)
-//                outb(i&0xff, 0x80);
-//}
-
 #if 0
 static void hard_reset(void)
 {
Index: src/mainboard/supermicro/x6dhe_g2/auto.updated.c
===================================================================
--- src/mainboard/supermicro/x6dhe_g2/auto.updated.c	(Revision 4758)
+++ src/mainboard/supermicro/x6dhe_g2/auto.updated.c	(Arbeitskopie)
@@ -43,13 +43,6 @@
 #define RECVENA_CONFIG  0x0708090a
 #define RECVENB_CONFIG  0x0708090a
 
-//void udelay(int usecs)
-//{
-//        int i;
-//        for(i = 0; i < usecs; i++)
-//                outb(i&0xff, 0x80);
-//}
-
 #if 0
 static void hard_reset(void)
 {
Index: src/mainboard/supermicro/x6dhr_ig/auto.c
===================================================================
--- src/mainboard/supermicro/x6dhr_ig/auto.c	(Revision 4758)
+++ src/mainboard/supermicro/x6dhr_ig/auto.c	(Arbeitskopie)
@@ -44,13 +44,6 @@
 #define RECVENA_CONFIG  0x0808090a
 #define RECVENB_CONFIG  0x0808090a
 
-//void udelay(int usecs)
-//{
-//        int i;
-//        for(i = 0; i < usecs; i++)
-//                outb(i&0xff, 0x80);
-//}
-
 #if 0
 static void hard_reset(void)
 {
Index: src/mainboard/supermicro/x6dhr_ig2/auto.c
===================================================================
--- src/mainboard/supermicro/x6dhr_ig2/auto.c	(Revision 4758)
+++ src/mainboard/supermicro/x6dhr_ig2/auto.c	(Arbeitskopie)
@@ -44,13 +44,6 @@
 #define RECVENA_CONFIG  0x0808090a
 #define RECVENB_CONFIG  0x0808090a
 
-//void udelay(int usecs)
-//{
-//        int i;
-//        for(i = 0; i < usecs; i++)
-//                outb(i&0xff, 0x80);
-//}
-
 #if 0
 static void hard_reset(void)
 {
Index: src/mainboard/emulation/qemu-x86/auto.c
===================================================================
--- src/mainboard/emulation/qemu-x86/auto.c	(Revision 4758)
+++ src/mainboard/emulation/qemu-x86/auto.c	(Arbeitskopie)
@@ -11,16 +11,7 @@
 #include "pc80/mc146818rtc_early.c"
 #include "pc80/serial.c"
 #include "arch/i386/lib/console.c"
-
-/*
- */
-void udelay(int usecs) 
-{
-	int i;
-	for(i = 0; i < usecs; i++)
-		outb(i&0xff, 0x80);
-}
-
+#include "pc80/udelay_io.c"
 #include "lib/delay.c"
 #include "cpu/x86/lapic/boot_cpu.c"
 
Index: src/mainboard/emulation/qemu-x86/rom.c
===================================================================
--- src/mainboard/emulation/qemu-x86/rom.c	(Revision 4758)
+++ src/mainboard/emulation/qemu-x86/rom.c	(Arbeitskopie)
@@ -7,15 +7,6 @@
 #include <console/console.h>
 #include <cbfs.h>
 
-/*
- */
-void udelay(int usecs) 
-{
-	int i;
-	for(i = 0; i < usecs; i++)
-		outb(i&0xff, 0x80);
-}
-
 void main(void)
 {
 	int i;
@@ -26,5 +17,4 @@
 	uart_init();
 	start_address = cbfs_load_stage("fallback/coreboot_ram");
 	start_address();
-	
 }
Index: src/mainboard/via/epia-m/auto.c
===================================================================
--- src/mainboard/via/epia-m/auto.c	(Revision 4758)
+++ src/mainboard/via/epia-m/auto.c	(Arbeitskopie)
@@ -17,23 +17,13 @@
 #include "northbridge/via/vt8623/raminit.h"
 #include "cpu/x86/mtrr/earlymtrr.c"
 #include "cpu/x86/bist.h"
-
-/*
- */
-void udelay(unsigned usecs) 
-{
-	int i;
-	for(i = 0; i < usecs; i++)
-		outb(i&0xff, 0x80);
-}
-
+#include "pc80/udelay_io.c"
 #include "lib/delay.c"
 #include "cpu/x86/lapic/boot_cpu.c"
 #include "lib/debug.c"
-
 #include "southbridge/via/vt8235/vt8235_early_smbus.c"
-
 #include "southbridge/via/vt8235/vt8235_early_serial.c"
+
 static void memreset_setup(void)
 {
 }
Index: src/mainboard/via/epia/auto.c
===================================================================
--- src/mainboard/via/epia/auto.c	(Revision 4758)
+++ src/mainboard/via/epia/auto.c	(Arbeitskopie)
@@ -13,20 +13,10 @@
 #include "northbridge/via/vt8601/raminit.h"
 #include "cpu/x86/mtrr/earlymtrr.c"
 #include "cpu/x86/bist.h"
-
-/*
- */
-void udelay(unsigned usecs) 
-{
-	int i;
-	for (i = 0; i < usecs; i++)
-		outb(i&0xff, 0x80);
-}
-
+#include "pc80/udelay_io.c"
 #include "lib/delay.c"
 #include "cpu/x86/lapic/boot_cpu.c"
 #include "lib/debug.c"
-
 #include "southbridge/via/vt8231/vt8231_early_smbus.c"
 #include "southbridge/via/vt8231/vt8231_early_serial.c"
 
Index: src/mainboard/dell/s1850/auto.c
===================================================================
--- src/mainboard/dell/s1850/auto.c	(Revision 4758)
+++ src/mainboard/dell/s1850/auto.c	(Arbeitskopie)
@@ -42,13 +42,6 @@
 #define RECVENA_CONFIG  0x0808090a
 #define RECVENB_CONFIG  0x0808090a
 
-//void udelay(int usecs)
-//{
-//        int i;
-//        for(i = 0; i < usecs; i++)
-//                outb(i&0xff, 0x80);
-//}
-
 #if 0
 static void hard_reset(void)
 {
Index: src/mainboard/asus/mew-vm/auto.c
===================================================================
--- src/mainboard/asus/mew-vm/auto.c	(Revision 4758)
+++ src/mainboard/asus/mew-vm/auto.c	(Arbeitskopie)
@@ -38,18 +38,9 @@
 #define SERIAL_DEV PNP_DEV(0x2e, LPC47B272_SP1)
 
 #include "southbridge/intel/i82801xx/i82801xx_early_smbus.c"
-
-/* TODO: Not needed? */
-void udelay(int usecs) 
-{
-	int i;
-	for (i = 0; i < usecs; i++)
-		outb(i&0xff, 0x80);
-}
-
 #include "lib/debug.c"
+#include "pc80/udelay_io.c"
 #include "lib/delay.c"
-
 #include "northbridge/intel/i82810/raminit.c"
 #include "northbridge/intel/i82810/debug.c"
 
-- 
coreboot mailing list: [email protected]
http://www.coreboot.org/mailman/listinfo/coreboot

Reply via email to