Author: uwe Date: 2009-10-11 20:21:45 +0200 (Sun, 11 Oct 2009) New Revision: 4760
Modified: trunk/coreboot-v2/src/mainboard/asus/mew-vm/auto.c trunk/coreboot-v2/src/mainboard/dell/s1850/auto.c trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/auto.c trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/rom.c trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g/auto.c trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g2/auto.c trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g2/auto.updated.c trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig/auto.c trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig2/auto.c trunk/coreboot-v2/src/mainboard/via/epia-m/auto.c trunk/coreboot-v2/src/mainboard/via/epia/auto.c Log: Remove useless udelay() duplication.
Abuild-tested for the boards that are touched.
Signed-off-by: Uwe Hermann uwe@hermann-uwe.de Acked-by: Peter Stuge peter@stuge.se
Modified: trunk/coreboot-v2/src/mainboard/asus/mew-vm/auto.c =================================================================== --- trunk/coreboot-v2/src/mainboard/asus/mew-vm/auto.c 2009-10-11 17:40:44 UTC (rev 4759) +++ trunk/coreboot-v2/src/mainboard/asus/mew-vm/auto.c 2009-10-11 18:21:45 UTC (rev 4760) @@ -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"
Modified: trunk/coreboot-v2/src/mainboard/dell/s1850/auto.c =================================================================== --- trunk/coreboot-v2/src/mainboard/dell/s1850/auto.c 2009-10-11 17:40:44 UTC (rev 4759) +++ trunk/coreboot-v2/src/mainboard/dell/s1850/auto.c 2009-10-11 18:21:45 UTC (rev 4760) @@ -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) {
Modified: trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/auto.c =================================================================== --- trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/auto.c 2009-10-11 17:40:44 UTC (rev 4759) +++ trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/auto.c 2009-10-11 18:21:45 UTC (rev 4760) @@ -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"
Modified: trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/rom.c =================================================================== --- trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/rom.c 2009-10-11 17:40:44 UTC (rev 4759) +++ trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/rom.c 2009-10-11 18:21:45 UTC (rev 4760) @@ -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(); - }
Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g/auto.c =================================================================== --- trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g/auto.c 2009-10-11 17:40:44 UTC (rev 4759) +++ trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g/auto.c 2009-10-11 18:21:45 UTC (rev 4760) @@ -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) {
Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g2/auto.c =================================================================== --- trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g2/auto.c 2009-10-11 17:40:44 UTC (rev 4759) +++ trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g2/auto.c 2009-10-11 18:21:45 UTC (rev 4760) @@ -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) {
Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g2/auto.updated.c =================================================================== --- trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g2/auto.updated.c 2009-10-11 17:40:44 UTC (rev 4759) +++ trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g2/auto.updated.c 2009-10-11 18:21:45 UTC (rev 4760) @@ -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) {
Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig/auto.c =================================================================== --- trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig/auto.c 2009-10-11 17:40:44 UTC (rev 4759) +++ trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig/auto.c 2009-10-11 18:21:45 UTC (rev 4760) @@ -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) {
Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig2/auto.c =================================================================== --- trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig2/auto.c 2009-10-11 17:40:44 UTC (rev 4759) +++ trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig2/auto.c 2009-10-11 18:21:45 UTC (rev 4760) @@ -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) {
Modified: trunk/coreboot-v2/src/mainboard/via/epia/auto.c =================================================================== --- trunk/coreboot-v2/src/mainboard/via/epia/auto.c 2009-10-11 17:40:44 UTC (rev 4759) +++ trunk/coreboot-v2/src/mainboard/via/epia/auto.c 2009-10-11 18:21:45 UTC (rev 4760) @@ -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"
Modified: trunk/coreboot-v2/src/mainboard/via/epia-m/auto.c =================================================================== --- trunk/coreboot-v2/src/mainboard/via/epia-m/auto.c 2009-10-11 17:40:44 UTC (rev 4759) +++ trunk/coreboot-v2/src/mainboard/via/epia-m/auto.c 2009-10-11 18:21:45 UTC (rev 4760) @@ -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) { }