From 4d7ec68856aa2c8aed6d84905e71d6f28900d52d Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Sun, 11 Oct 2009 18:21:45 +0000 Subject: Remove useless udelay() duplication. Abuild-tested for the boards that are touched. Signed-off-by: Uwe Hermann Acked-by: Peter Stuge git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4760 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/asus/mew-vm/auto.c | 11 +---------- src/mainboard/dell/s1850/auto.c | 7 ------- src/mainboard/emulation/qemu-x86/auto.c | 11 +---------- src/mainboard/emulation/qemu-x86/rom.c | 10 ---------- src/mainboard/supermicro/x6dhe_g/auto.c | 7 ------- src/mainboard/supermicro/x6dhe_g2/auto.c | 7 ------- src/mainboard/supermicro/x6dhe_g2/auto.updated.c | 7 ------- src/mainboard/supermicro/x6dhr_ig/auto.c | 7 ------- src/mainboard/supermicro/x6dhr_ig2/auto.c | 7 ------- src/mainboard/via/epia-m/auto.c | 14 ++------------ src/mainboard/via/epia/auto.c | 12 +----------- 11 files changed, 5 insertions(+), 95 deletions(-) diff --git a/src/mainboard/asus/mew-vm/auto.c b/src/mainboard/asus/mew-vm/auto.c index 2a585e764b..674b73ffe5 100644 --- a/src/mainboard/asus/mew-vm/auto.c +++ b/src/mainboard/asus/mew-vm/auto.c @@ -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" diff --git a/src/mainboard/dell/s1850/auto.c b/src/mainboard/dell/s1850/auto.c index 4f61a45500..be8181215d 100644 --- a/src/mainboard/dell/s1850/auto.c +++ b/src/mainboard/dell/s1850/auto.c @@ -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) { diff --git a/src/mainboard/emulation/qemu-x86/auto.c b/src/mainboard/emulation/qemu-x86/auto.c index 7cf4012134..fb92ac946b 100644 --- a/src/mainboard/emulation/qemu-x86/auto.c +++ b/src/mainboard/emulation/qemu-x86/auto.c @@ -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" diff --git a/src/mainboard/emulation/qemu-x86/rom.c b/src/mainboard/emulation/qemu-x86/rom.c index 65c2644599..de1b162fd4 100644 --- a/src/mainboard/emulation/qemu-x86/rom.c +++ b/src/mainboard/emulation/qemu-x86/rom.c @@ -7,15 +7,6 @@ #include #include -/* - */ -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 @@ void main(void) uart_init(); start_address = cbfs_load_stage("fallback/coreboot_ram"); start_address(); - } diff --git a/src/mainboard/supermicro/x6dhe_g/auto.c b/src/mainboard/supermicro/x6dhe_g/auto.c index a5c702ba70..5d80f1e4db 100644 --- a/src/mainboard/supermicro/x6dhe_g/auto.c +++ b/src/mainboard/supermicro/x6dhe_g/auto.c @@ -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) { diff --git a/src/mainboard/supermicro/x6dhe_g2/auto.c b/src/mainboard/supermicro/x6dhe_g2/auto.c index 3c84fd5c14..d8eee227b2 100644 --- a/src/mainboard/supermicro/x6dhe_g2/auto.c +++ b/src/mainboard/supermicro/x6dhe_g2/auto.c @@ -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) { diff --git a/src/mainboard/supermicro/x6dhe_g2/auto.updated.c b/src/mainboard/supermicro/x6dhe_g2/auto.updated.c index 6e0fab7904..a9509cd5c5 100644 --- a/src/mainboard/supermicro/x6dhe_g2/auto.updated.c +++ b/src/mainboard/supermicro/x6dhe_g2/auto.updated.c @@ -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) { diff --git a/src/mainboard/supermicro/x6dhr_ig/auto.c b/src/mainboard/supermicro/x6dhr_ig/auto.c index d4e9992144..ee2b7717be 100644 --- a/src/mainboard/supermicro/x6dhr_ig/auto.c +++ b/src/mainboard/supermicro/x6dhr_ig/auto.c @@ -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) { diff --git a/src/mainboard/supermicro/x6dhr_ig2/auto.c b/src/mainboard/supermicro/x6dhr_ig2/auto.c index 2ed8bd5f7f..fb5da2a6a8 100644 --- a/src/mainboard/supermicro/x6dhr_ig2/auto.c +++ b/src/mainboard/supermicro/x6dhr_ig2/auto.c @@ -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) { diff --git a/src/mainboard/via/epia-m/auto.c b/src/mainboard/via/epia-m/auto.c index 5a93aa7541..3885fc6485 100644 --- a/src/mainboard/via/epia-m/auto.c +++ b/src/mainboard/via/epia-m/auto.c @@ -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) { } diff --git a/src/mainboard/via/epia/auto.c b/src/mainboard/via/epia/auto.c index e490402ba0..f84bd23de6 100644 --- a/src/mainboard/via/epia/auto.c +++ b/src/mainboard/via/epia/auto.c @@ -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" -- cgit v1.2.3