summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Reinauer <stefan.reinauer@coreboot.org>2012-04-27 02:31:28 +0200
committerStefan Reinauer <stefan.reinauer@coreboot.org>2012-04-27 19:23:16 +0200
commitae5e11d7cd7484343d277fb454fb19fdff34730d (patch)
tree231aede3dcf80242a4e68e2b4268835f4bf1c5c6
parentaee1869fcf6c5eb1616f8c5c5a446c2b2de693e8 (diff)
downloadcoreboot-ae5e11d7cd7484343d277fb454fb19fdff34730d.tar.xz
Move top level pc80 directory to drivers/
There is no reason for this to be a top level directory. Some stuff from lib/ should also be moved to drivers/ Change-Id: I3c2d2e127f7215eadead029cfc7442c22b26814a Signed-off-by: Stefan Reinauer <reinauer@google.com> Reviewed-on: http://review.coreboot.org/939 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
-rw-r--r--Makefile.inc2
-rw-r--r--src/cpu/amd/sc520/raminit.c2
-rw-r--r--src/drivers/Makefile.inc1
-rw-r--r--src/drivers/pc80/Makefile.inc (renamed from src/pc80/Makefile.inc)0
-rw-r--r--src/drivers/pc80/i8254.c (renamed from src/pc80/i8254.c)0
-rw-r--r--src/drivers/pc80/i8259.c (renamed from src/pc80/i8259.c)0
-rw-r--r--src/drivers/pc80/isa-dma.c (renamed from src/pc80/isa-dma.c)0
-rw-r--r--src/drivers/pc80/keyboard.c (renamed from src/pc80/keyboard.c)0
-rw-r--r--src/drivers/pc80/mc146818rtc.c (renamed from src/pc80/mc146818rtc.c)0
-rw-r--r--src/drivers/pc80/mc146818rtc_early.c (renamed from src/pc80/mc146818rtc_early.c)0
-rw-r--r--src/drivers/pc80/tpm.c (renamed from src/pc80/tpm.c)0
-rw-r--r--src/drivers/pc80/udelay_io.c (renamed from src/pc80/udelay_io.c)0
-rw-r--r--src/drivers/pc80/vga/Makefile.inc (renamed from src/pc80/vga/Makefile.inc)0
-rw-r--r--src/drivers/pc80/vga/vga.c (renamed from src/pc80/vga/vga.c)0
-rw-r--r--src/drivers/pc80/vga/vga.h (renamed from src/pc80/vga/vga.h)0
-rw-r--r--src/drivers/pc80/vga/vga_font_8x16.c (renamed from src/pc80/vga/vga_font_8x16.c)0
-rw-r--r--src/drivers/pc80/vga/vga_io.c (renamed from src/pc80/vga/vga_io.c)0
-rw-r--r--src/drivers/pc80/vga/vga_palette.c (renamed from src/pc80/vga/vga_palette.c)0
-rw-r--r--src/include/pc80/mc146818rtc.h2
-rw-r--r--src/mainboard/a-trend/atc-6220/romstage.c2
-rw-r--r--src/mainboard/a-trend/atc-6240/romstage.c2
-rw-r--r--src/mainboard/abit/be6-ii_v2_0/romstage.c2
-rw-r--r--src/mainboard/amd/dinar/romstage.c4
-rw-r--r--src/mainboard/amd/inagua/romstage.c4
-rw-r--r--src/mainboard/amd/persimmon/romstage.c4
-rw-r--r--src/mainboard/amd/torpedo/romstage.c4
-rw-r--r--src/mainboard/asrock/e350m1/romstage.c4
-rw-r--r--src/mainboard/asus/mew-am/romstage.c2
-rw-r--r--src/mainboard/asus/mew-vm/romstage.c2
-rw-r--r--src/mainboard/asus/p2b-d/romstage.c2
-rw-r--r--src/mainboard/asus/p2b-ds/romstage.c2
-rw-r--r--src/mainboard/asus/p2b-f/romstage.c2
-rw-r--r--src/mainboard/asus/p2b-ls/romstage.c2
-rw-r--r--src/mainboard/asus/p2b/romstage.c2
-rw-r--r--src/mainboard/asus/p3b-f/romstage.c2
-rw-r--r--src/mainboard/azza/pt-6ibd/romstage.c2
-rw-r--r--src/mainboard/bcom/winnetp680/romstage.c2
-rw-r--r--src/mainboard/biostar/m6tba/romstage.c2
-rw-r--r--src/mainboard/compaq/deskpro_en_sff_p600/romstage.c2
-rw-r--r--src/mainboard/digitallogic/adl855pc/romstage.c2
-rw-r--r--src/mainboard/ecs/p6iwp-fe/romstage.c2
-rw-r--r--src/mainboard/emulation/qemu-x86/romstage.c2
-rw-r--r--src/mainboard/gigabyte/ga-6bxc/romstage.c2
-rw-r--r--src/mainboard/gigabyte/ga-6bxe/romstage.c2
-rw-r--r--src/mainboard/hp/e_vectra_p2706t/romstage.c2
-rw-r--r--src/mainboard/iei/juki-511p/romstage.c2
-rw-r--r--src/mainboard/intel/d810e2cb/romstage.c2
-rw-r--r--src/mainboard/intel/truxton/romstage.c2
-rw-r--r--src/mainboard/jetway/j7f24/romstage.c2
-rw-r--r--src/mainboard/lanner/em8510/romstage.c2
-rw-r--r--src/mainboard/mitac/6513wu/romstage.c2
-rw-r--r--src/mainboard/msi/ms6119/romstage.c2
-rw-r--r--src/mainboard/msi/ms6147/romstage.c2
-rw-r--r--src/mainboard/msi/ms6156/romstage.c2
-rw-r--r--src/mainboard/msi/ms6178/romstage.c2
-rw-r--r--src/mainboard/nec/powermate2000/romstage.c2
-rw-r--r--src/mainboard/nokia/ip530/romstage.c2
-rw-r--r--src/mainboard/rca/rm4100/romstage.c2
-rw-r--r--src/mainboard/soyo/sy-6ba-plus-iii/romstage.c2
-rw-r--r--src/mainboard/supermicro/x6dai_g/romstage.c2
-rw-r--r--src/mainboard/supermicro/x6dhe_g/romstage.c2
-rw-r--r--src/mainboard/thomson/ip1000/romstage.c2
-rw-r--r--src/mainboard/tyan/s1846/romstage.c2
-rw-r--r--src/mainboard/via/epia-cn/romstage.c2
-rw-r--r--src/mainboard/via/epia-m/romstage.c2
-rw-r--r--src/mainboard/via/epia-m700/romstage.c2
-rw-r--r--src/mainboard/via/epia-n/romstage.c2
-rw-r--r--src/mainboard/via/epia/romstage.c2
-rw-r--r--src/mainboard/via/pc2500e/romstage.c2
-rw-r--r--src/mainboard/via/vt8454c/romstage.c2
70 files changed, 59 insertions, 60 deletions
diff --git a/Makefile.inc b/Makefile.inc
index 4d25dd528b..53a3dadab0 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -55,8 +55,6 @@ subdirs-y += util/cbfstool util/sconfig util/nvramtool
subdirs-y += src/arch/$(ARCHDIR-y)
subdirs-y += src/mainboard/$(MAINBOARDDIR)
-subdirs-$(CONFIG_ARCH_X86) += src/pc80
-
subdirs-y += site-local
#######################################################################
diff --git a/src/cpu/amd/sc520/raminit.c b/src/cpu/amd/sc520/raminit.c
index 2f7adae190..f3f7071140 100644
--- a/src/cpu/amd/sc520/raminit.c
+++ b/src/cpu/amd/sc520/raminit.c
@@ -234,7 +234,7 @@ dummy_write(void){
*ptr = 0;
}
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
static void dumpram(void){
print_err("ctl "); print_err_hex8(*drcctl); print_err("\n");
diff --git a/src/drivers/Makefile.inc b/src/drivers/Makefile.inc
index 21a698a397..5f6dadfcc5 100644
--- a/src/drivers/Makefile.inc
+++ b/src/drivers/Makefile.inc
@@ -26,3 +26,4 @@ subdirs-y += oxford
subdirs-y += sil
subdirs-y += trident
subdirs-y += ics
+subdirs-$(CONFIG_ARCH_X86) += pc80
diff --git a/src/pc80/Makefile.inc b/src/drivers/pc80/Makefile.inc
index 8ca21bf5e5..8ca21bf5e5 100644
--- a/src/pc80/Makefile.inc
+++ b/src/drivers/pc80/Makefile.inc
diff --git a/src/pc80/i8254.c b/src/drivers/pc80/i8254.c
index f75216da47..f75216da47 100644
--- a/src/pc80/i8254.c
+++ b/src/drivers/pc80/i8254.c
diff --git a/src/pc80/i8259.c b/src/drivers/pc80/i8259.c
index 66988753cf..66988753cf 100644
--- a/src/pc80/i8259.c
+++ b/src/drivers/pc80/i8259.c
diff --git a/src/pc80/isa-dma.c b/src/drivers/pc80/isa-dma.c
index b64f125f3a..b64f125f3a 100644
--- a/src/pc80/isa-dma.c
+++ b/src/drivers/pc80/isa-dma.c
diff --git a/src/pc80/keyboard.c b/src/drivers/pc80/keyboard.c
index e0a6643334..e0a6643334 100644
--- a/src/pc80/keyboard.c
+++ b/src/drivers/pc80/keyboard.c
diff --git a/src/pc80/mc146818rtc.c b/src/drivers/pc80/mc146818rtc.c
index 99d670de42..99d670de42 100644
--- a/src/pc80/mc146818rtc.c
+++ b/src/drivers/pc80/mc146818rtc.c
diff --git a/src/pc80/mc146818rtc_early.c b/src/drivers/pc80/mc146818rtc_early.c
index 0652f27c47..0652f27c47 100644
--- a/src/pc80/mc146818rtc_early.c
+++ b/src/drivers/pc80/mc146818rtc_early.c
diff --git a/src/pc80/tpm.c b/src/drivers/pc80/tpm.c
index 17e1ed702d..17e1ed702d 100644
--- a/src/pc80/tpm.c
+++ b/src/drivers/pc80/tpm.c
diff --git a/src/pc80/udelay_io.c b/src/drivers/pc80/udelay_io.c
index 37f3f73186..37f3f73186 100644
--- a/src/pc80/udelay_io.c
+++ b/src/drivers/pc80/udelay_io.c
diff --git a/src/pc80/vga/Makefile.inc b/src/drivers/pc80/vga/Makefile.inc
index d4b726a388..d4b726a388 100644
--- a/src/pc80/vga/Makefile.inc
+++ b/src/drivers/pc80/vga/Makefile.inc
diff --git a/src/pc80/vga/vga.c b/src/drivers/pc80/vga/vga.c
index 9d640419bb..9d640419bb 100644
--- a/src/pc80/vga/vga.c
+++ b/src/drivers/pc80/vga/vga.c
diff --git a/src/pc80/vga/vga.h b/src/drivers/pc80/vga/vga.h
index 1e6e750b89..1e6e750b89 100644
--- a/src/pc80/vga/vga.h
+++ b/src/drivers/pc80/vga/vga.h
diff --git a/src/pc80/vga/vga_font_8x16.c b/src/drivers/pc80/vga/vga_font_8x16.c
index d98bbeec84..d98bbeec84 100644
--- a/src/pc80/vga/vga_font_8x16.c
+++ b/src/drivers/pc80/vga/vga_font_8x16.c
diff --git a/src/pc80/vga/vga_io.c b/src/drivers/pc80/vga/vga_io.c
index c31287ab6d..c31287ab6d 100644
--- a/src/pc80/vga/vga_io.c
+++ b/src/drivers/pc80/vga/vga_io.c
diff --git a/src/pc80/vga/vga_palette.c b/src/drivers/pc80/vga/vga_palette.c
index 5f6972890b..5f6972890b 100644
--- a/src/pc80/vga/vga_palette.c
+++ b/src/drivers/pc80/vga/vga_palette.c
diff --git a/src/include/pc80/mc146818rtc.h b/src/include/pc80/mc146818rtc.h
index 24dac2c098..a1f06e7021 100644
--- a/src/include/pc80/mc146818rtc.h
+++ b/src/include/pc80/mc146818rtc.h
@@ -135,7 +135,7 @@ static inline int get_option(void *dest __attribute__((unused)),
#define read_option_lowlevel(start, size, def) def
#endif
#else
-#include <pc80/mc146818rtc_early.c>
+#include <drivers/pc80/mc146818rtc_early.c>
#endif
#define read_option(name, default) read_option_lowlevel(CMOS_VSTART_ ##name, CMOS_VLEN_ ##name, (default))
diff --git a/src/mainboard/a-trend/atc-6220/romstage.c b/src/mainboard/a-trend/atc-6220/romstage.c
index b7534a8d3a..741eca2278 100644
--- a/src/mainboard/a-trend/atc-6220/romstage.c
+++ b/src/mainboard/a-trend/atc-6220/romstage.c
@@ -28,7 +28,7 @@
#include <console/console.h>
#include "southbridge/intel/i82371eb/i82371eb.h"
#include "northbridge/intel/i440bx/raminit.h"
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include "lib/delay.c"
#include "cpu/x86/bist.h"
#include "superio/winbond/w83977tf/early_serial.c"
diff --git a/src/mainboard/a-trend/atc-6240/romstage.c b/src/mainboard/a-trend/atc-6240/romstage.c
index 9c04fb9578..8d2175d33a 100644
--- a/src/mainboard/a-trend/atc-6240/romstage.c
+++ b/src/mainboard/a-trend/atc-6240/romstage.c
@@ -28,7 +28,7 @@
#include <console/console.h>
#include "southbridge/intel/i82371eb/i82371eb.h"
#include "northbridge/intel/i440bx/raminit.h"
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include "lib/delay.c"
#include "cpu/x86/bist.h"
#include "superio/winbond/w83627hf/early_serial.c"
diff --git a/src/mainboard/abit/be6-ii_v2_0/romstage.c b/src/mainboard/abit/be6-ii_v2_0/romstage.c
index 313559277b..ccba4bc5bb 100644
--- a/src/mainboard/abit/be6-ii_v2_0/romstage.c
+++ b/src/mainboard/abit/be6-ii_v2_0/romstage.c
@@ -28,7 +28,7 @@
#include <console/console.h>
#include "southbridge/intel/i82371eb/i82371eb.h"
#include "northbridge/intel/i440bx/raminit.h"
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include "lib/delay.c"
#include "cpu/x86/bist.h"
/* FIXME: It's a Winbond W83977EF, actually. */
diff --git a/src/mainboard/amd/dinar/romstage.c b/src/mainboard/amd/dinar/romstage.c
index 6f3911a3d3..89d8959c78 100644
--- a/src/mainboard/amd/dinar/romstage.c
+++ b/src/mainboard/amd/dinar/romstage.c
@@ -32,8 +32,8 @@
#include "superio/smsc/sch4037/sch4037_early_init.c"
#include "superio/smsc/sio1036/sio1036_early_init.c"
#include "cpu/x86/lapic/boot_cpu.c"
-#include "pc80/i8254.c"
-#include "pc80/i8259.c"
+#include "drivers/pc80/i8254.c"
+#include "drivers/pc80/i8259.c"
#include "nb_cimx.h"
#include "sb_cimx.h"
#include "Platform.h"
diff --git a/src/mainboard/amd/inagua/romstage.c b/src/mainboard/amd/inagua/romstage.c
index 27022d4e67..248d2f779b 100644
--- a/src/mainboard/amd/inagua/romstage.c
+++ b/src/mainboard/amd/inagua/romstage.c
@@ -34,8 +34,8 @@
#include "cpu/x86/bist.h"
#include "superio/smsc/kbc1100/kbc1100_early_init.c"
#include "cpu/x86/lapic/boot_cpu.c"
-#include "pc80/i8254.c"
-#include "pc80/i8259.c"
+#include "drivers/pc80/i8254.c"
+#include "drivers/pc80/i8259.c"
#include "sb_cimx.h"
#include "SBPLATFORM.h"
diff --git a/src/mainboard/amd/persimmon/romstage.c b/src/mainboard/amd/persimmon/romstage.c
index f1d1b2a0d6..55d05168f6 100644
--- a/src/mainboard/amd/persimmon/romstage.c
+++ b/src/mainboard/amd/persimmon/romstage.c
@@ -33,8 +33,8 @@
#include "cpu/x86/bist.h"
#include "superio/fintek/f81865f/f81865f_early_serial.c"
#include "cpu/x86/lapic/boot_cpu.c"
-#include "pc80/i8254.c"
-#include "pc80/i8259.c"
+#include "drivers/pc80/i8254.c"
+#include "drivers/pc80/i8259.c"
#include <cpu/x86/cache.h>
#include "sb_cimx.h"
#include "SBPLATFORM.h"
diff --git a/src/mainboard/amd/torpedo/romstage.c b/src/mainboard/amd/torpedo/romstage.c
index 74365e6724..56341ea3ec 100644
--- a/src/mainboard/amd/torpedo/romstage.c
+++ b/src/mainboard/amd/torpedo/romstage.c
@@ -32,8 +32,8 @@
#include "cpu/x86/bist.h"
#include "superio/smsc/kbc1100/kbc1100_early_init.c"
#include "cpu/x86/lapic/boot_cpu.c"
-#include "pc80/i8254.c"
-#include "pc80/i8259.c"
+#include "drivers/pc80/i8254.c"
+#include "drivers/pc80/i8259.c"
#include "SbEarly.h"
#include "SbPlatform.h"
#include <arch/cpu.h>
diff --git a/src/mainboard/asrock/e350m1/romstage.c b/src/mainboard/asrock/e350m1/romstage.c
index 8b46b19e8d..a8aeabd87f 100644
--- a/src/mainboard/asrock/e350m1/romstage.c
+++ b/src/mainboard/asrock/e350m1/romstage.c
@@ -33,8 +33,8 @@
#include "cpu/x86/bist.h"
#include "superio/winbond/w83627hf/early_serial.c"
#include "cpu/x86/lapic/boot_cpu.c"
-#include "pc80/i8254.c"
-#include "pc80/i8259.c"
+#include "drivers/pc80/i8254.c"
+#include "drivers/pc80/i8259.c"
#include "sb_cimx.h"
#include "SBPLATFORM.h"
diff --git a/src/mainboard/asus/mew-am/romstage.c b/src/mainboard/asus/mew-am/romstage.c
index f0f26c9039..2901391c14 100644
--- a/src/mainboard/asus/mew-am/romstage.c
+++ b/src/mainboard/asus/mew-am/romstage.c
@@ -27,7 +27,7 @@
#include <console/console.h>
#include "southbridge/intel/i82801ax/i82801ax.h"
#include "northbridge/intel/i82810/raminit.h"
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include "cpu/x86/bist.h"
#include "superio/smsc/smscsuperio/early_serial.c"
#include <lib.h>
diff --git a/src/mainboard/asus/mew-vm/romstage.c b/src/mainboard/asus/mew-vm/romstage.c
index f82f87eee4..473a33b4c1 100644
--- a/src/mainboard/asus/mew-vm/romstage.c
+++ b/src/mainboard/asus/mew-vm/romstage.c
@@ -29,7 +29,7 @@
#include "northbridge/intel/i82810/raminit.h"
#include "cpu/x86/bist.h"
#include "southbridge/intel/i82801ax/i82801ax.h"
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include <lib.h>
#define SERIAL_DEV PNP_DEV(0x2e, LPC47B272_SP1)
diff --git a/src/mainboard/asus/p2b-d/romstage.c b/src/mainboard/asus/p2b-d/romstage.c
index 4d10862a39..a0af9b264f 100644
--- a/src/mainboard/asus/p2b-d/romstage.c
+++ b/src/mainboard/asus/p2b-d/romstage.c
@@ -28,7 +28,7 @@
#include <console/console.h>
#include "southbridge/intel/i82371eb/i82371eb.h"
#include "northbridge/intel/i440bx/raminit.h"
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include "lib/delay.c"
#include "cpu/x86/bist.h"
#include "superio/winbond/w83977tf/early_serial.c"
diff --git a/src/mainboard/asus/p2b-ds/romstage.c b/src/mainboard/asus/p2b-ds/romstage.c
index 593bfc4df4..f7e993f521 100644
--- a/src/mainboard/asus/p2b-ds/romstage.c
+++ b/src/mainboard/asus/p2b-ds/romstage.c
@@ -28,7 +28,7 @@
#include <console/console.h>
#include "southbridge/intel/i82371eb/i82371eb.h"
#include "northbridge/intel/i440bx/raminit.h"
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include "lib/delay.c"
#include "cpu/x86/bist.h"
#include "superio/winbond/w83977tf/early_serial.c"
diff --git a/src/mainboard/asus/p2b-f/romstage.c b/src/mainboard/asus/p2b-f/romstage.c
index 361a32fe6d..a78cff5ceb 100644
--- a/src/mainboard/asus/p2b-f/romstage.c
+++ b/src/mainboard/asus/p2b-f/romstage.c
@@ -28,7 +28,7 @@
#include <console/console.h>
#include "southbridge/intel/i82371eb/i82371eb.h"
#include "northbridge/intel/i440bx/raminit.h"
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include "lib/delay.c"
#include "cpu/x86/bist.h"
/* FIXME: The ASUS P2B-F has a Winbond W83977EF, actually. */
diff --git a/src/mainboard/asus/p2b-ls/romstage.c b/src/mainboard/asus/p2b-ls/romstage.c
index 6209233c10..008b45752c 100644
--- a/src/mainboard/asus/p2b-ls/romstage.c
+++ b/src/mainboard/asus/p2b-ls/romstage.c
@@ -28,7 +28,7 @@
#include <console/console.h>
#include "southbridge/intel/i82371eb/i82371eb.h"
#include "northbridge/intel/i440bx/raminit.h"
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include "lib/delay.c"
#include "cpu/x86/bist.h"
/* FIXME: The ASUS P2B-LS has a Winbond W83977EF, actually. */
diff --git a/src/mainboard/asus/p2b/romstage.c b/src/mainboard/asus/p2b/romstage.c
index b7534a8d3a..741eca2278 100644
--- a/src/mainboard/asus/p2b/romstage.c
+++ b/src/mainboard/asus/p2b/romstage.c
@@ -28,7 +28,7 @@
#include <console/console.h>
#include "southbridge/intel/i82371eb/i82371eb.h"
#include "northbridge/intel/i440bx/raminit.h"
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include "lib/delay.c"
#include "cpu/x86/bist.h"
#include "superio/winbond/w83977tf/early_serial.c"
diff --git a/src/mainboard/asus/p3b-f/romstage.c b/src/mainboard/asus/p3b-f/romstage.c
index 1772a52178..009b0827f7 100644
--- a/src/mainboard/asus/p3b-f/romstage.c
+++ b/src/mainboard/asus/p3b-f/romstage.c
@@ -28,7 +28,7 @@
#include <console/console.h>
#include "southbridge/intel/i82371eb/i82371eb.h"
#include "northbridge/intel/i440bx/raminit.h"
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include "lib/delay.c"
#include "cpu/x86/bist.h"
/* FIXME: The ASUS P3B-F has a Winbond W83977EF, actually. */
diff --git a/src/mainboard/azza/pt-6ibd/romstage.c b/src/mainboard/azza/pt-6ibd/romstage.c
index d5cf02bba9..fd811a8620 100644
--- a/src/mainboard/azza/pt-6ibd/romstage.c
+++ b/src/mainboard/azza/pt-6ibd/romstage.c
@@ -28,7 +28,7 @@
#include <console/console.h>
#include "southbridge/intel/i82371eb/i82371eb.h"
#include "northbridge/intel/i440bx/raminit.h"
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include "lib/delay.c"
#include "cpu/x86/bist.h"
/* FIXME: It's a Winbond W83977EF, actually. */
diff --git a/src/mainboard/bcom/winnetp680/romstage.c b/src/mainboard/bcom/winnetp680/romstage.c
index f930e4527f..11ef163c31 100644
--- a/src/mainboard/bcom/winnetp680/romstage.c
+++ b/src/mainboard/bcom/winnetp680/romstage.c
@@ -29,7 +29,7 @@
#include <console/console.h>
#include "northbridge/via/cn700/raminit.h"
#include "cpu/x86/bist.h"
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include "lib/delay.c"
#include <lib.h>
#include <spd.h>
diff --git a/src/mainboard/biostar/m6tba/romstage.c b/src/mainboard/biostar/m6tba/romstage.c
index de1947f8b7..a90a28ba01 100644
--- a/src/mainboard/biostar/m6tba/romstage.c
+++ b/src/mainboard/biostar/m6tba/romstage.c
@@ -28,7 +28,7 @@
#include <console/console.h>
#include "southbridge/intel/i82371eb/i82371eb.h"
#include "northbridge/intel/i440bx/raminit.h"
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include "lib/delay.c"
#include "cpu/x86/bist.h"
#include "superio/smsc/smscsuperio/early_serial.c"
diff --git a/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c b/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c
index 062f450f34..14822abf06 100644
--- a/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c
+++ b/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c
@@ -28,7 +28,7 @@
#include <console/console.h>
#include "southbridge/intel/i82371eb/i82371eb.h"
#include "northbridge/intel/i440bx/raminit.h"
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include "lib/delay.c"
#include "cpu/x86/bist.h"
/* FIXME: This should be PC97307 (but it's buggy at the moment)! */
diff --git a/src/mainboard/digitallogic/adl855pc/romstage.c b/src/mainboard/digitallogic/adl855pc/romstage.c
index d1a762240b..e5c7917164 100644
--- a/src/mainboard/digitallogic/adl855pc/romstage.c
+++ b/src/mainboard/digitallogic/adl855pc/romstage.c
@@ -6,7 +6,7 @@
#include <arch/hlt.h>
#include <stdlib.h>
#include <lib.h>
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include <pc80/mc146818rtc.h>
#include <console/console.h>
#include "southbridge/intel/i82801dx/i82801dx.h"
diff --git a/src/mainboard/ecs/p6iwp-fe/romstage.c b/src/mainboard/ecs/p6iwp-fe/romstage.c
index 6b200f1c82..b36481a4ec 100644
--- a/src/mainboard/ecs/p6iwp-fe/romstage.c
+++ b/src/mainboard/ecs/p6iwp-fe/romstage.c
@@ -28,7 +28,7 @@
#include <console/console.h>
#include "southbridge/intel/i82801ax/i82801ax.h"
#include "northbridge/intel/i82810/raminit.h"
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include "cpu/x86/bist.h"
#include "superio/ite/it8712f/early_serial.c"
#include <lib.h>
diff --git a/src/mainboard/emulation/qemu-x86/romstage.c b/src/mainboard/emulation/qemu-x86/romstage.c
index d6b5dd5fa0..33a0fccf94 100644
--- a/src/mainboard/emulation/qemu-x86/romstage.c
+++ b/src/mainboard/emulation/qemu-x86/romstage.c
@@ -7,7 +7,7 @@
#include <arch/hlt.h>
#include <pc80/mc146818rtc.h>
#include <console/console.h>
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include "lib/delay.c"
#include "cpu/x86/lapic/boot_cpu.c"
diff --git a/src/mainboard/gigabyte/ga-6bxc/romstage.c b/src/mainboard/gigabyte/ga-6bxc/romstage.c
index c150096409..8b231af2fa 100644
--- a/src/mainboard/gigabyte/ga-6bxc/romstage.c
+++ b/src/mainboard/gigabyte/ga-6bxc/romstage.c
@@ -28,7 +28,7 @@
#include <console/console.h>
#include "southbridge/intel/i82371eb/i82371eb.h"
#include "northbridge/intel/i440bx/raminit.h"
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include "lib/delay.c"
#include "cpu/x86/bist.h"
void it8671f_48mhz_clkin(void);
diff --git a/src/mainboard/gigabyte/ga-6bxe/romstage.c b/src/mainboard/gigabyte/ga-6bxe/romstage.c
index 9002ab101c..f2663b1d9f 100644
--- a/src/mainboard/gigabyte/ga-6bxe/romstage.c
+++ b/src/mainboard/gigabyte/ga-6bxe/romstage.c
@@ -28,7 +28,7 @@
#include <console/console.h>
#include "southbridge/intel/i82371eb/i82371eb.h"
#include "northbridge/intel/i440bx/raminit.h"
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include "lib/delay.c"
#include "cpu/x86/bist.h"
static void it8671f_48mhz_clkin(void);
diff --git a/src/mainboard/hp/e_vectra_p2706t/romstage.c b/src/mainboard/hp/e_vectra_p2706t/romstage.c
index 789d17fe45..8c63cf2e7e 100644
--- a/src/mainboard/hp/e_vectra_p2706t/romstage.c
+++ b/src/mainboard/hp/e_vectra_p2706t/romstage.c
@@ -32,7 +32,7 @@
#include "northbridge/intel/i82810/raminit.h"
#include "cpu/x86/bist.h"
#include "southbridge/intel/i82801ax/i82801ax.h"
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include <lib.h>
/* TODO: It's a PC87364 actually! */
diff --git a/src/mainboard/iei/juki-511p/romstage.c b/src/mainboard/iei/juki-511p/romstage.c
index e70e65d4a0..2dd363c8ce 100644
--- a/src/mainboard/iei/juki-511p/romstage.c
+++ b/src/mainboard/iei/juki-511p/romstage.c
@@ -28,7 +28,7 @@
#include "superio/winbond/w83977f/early_serial.c"
#include "southbridge/amd/cs5530/enable_rom.c"
#include "cpu/x86/bist.h"
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include "northbridge/amd/gx1/raminit.c"
#define SERIAL_DEV PNP_DEV(0x3f0, W83977F_SP1)
diff --git a/src/mainboard/intel/d810e2cb/romstage.c b/src/mainboard/intel/d810e2cb/romstage.c
index 0594e7e402..330323d6b8 100644
--- a/src/mainboard/intel/d810e2cb/romstage.c
+++ b/src/mainboard/intel/d810e2cb/romstage.c
@@ -27,7 +27,7 @@
#include <console/console.h>
#include "southbridge/intel/i82801bx/i82801bx.h"
#include "northbridge/intel/i82810/raminit.h"
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include "cpu/x86/bist.h"
#include "superio/smsc/smscsuperio/early_serial.c"
#include "gpio.c"
diff --git a/src/mainboard/intel/truxton/romstage.c b/src/mainboard/intel/truxton/romstage.c
index 6672a40959..396f25fb3d 100644
--- a/src/mainboard/intel/truxton/romstage.c
+++ b/src/mainboard/intel/truxton/romstage.c
@@ -26,7 +26,7 @@
#include <arch/romcc_io.h>
#include <cpu/x86/lapic.h>
#include <pc80/mc146818rtc.h>
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include <console/console.h>
#include "southbridge/intel/i3100/early_smbus.c"
#include "southbridge/intel/i3100/early_lpc.c"
diff --git a/src/mainboard/jetway/j7f24/romstage.c b/src/mainboard/jetway/j7f24/romstage.c
index 899a604187..7814fc2450 100644
--- a/src/mainboard/jetway/j7f24/romstage.c
+++ b/src/mainboard/jetway/j7f24/romstage.c
@@ -29,7 +29,7 @@
#include <console/console.h>
#include "northbridge/via/cn700/raminit.h"
#include "cpu/x86/bist.h"
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include "lib/delay.c"
#include "southbridge/via/vt8237r/early_smbus.c"
#include "superio/fintek/f71805f/early_serial.c"
diff --git a/src/mainboard/lanner/em8510/romstage.c b/src/mainboard/lanner/em8510/romstage.c
index dbe769ef84..35833d4668 100644
--- a/src/mainboard/lanner/em8510/romstage.c
+++ b/src/mainboard/lanner/em8510/romstage.c
@@ -29,7 +29,7 @@
#include <stdlib.h>
#include <lib.h>
#include <spd.h>
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include <pc80/mc146818rtc.h>
#include <console/console.h>
#include "southbridge/intel/i82801dx/i82801dx.h"
diff --git a/src/mainboard/mitac/6513wu/romstage.c b/src/mainboard/mitac/6513wu/romstage.c
index d93813f594..85c8fb7bf2 100644
--- a/src/mainboard/mitac/6513wu/romstage.c
+++ b/src/mainboard/mitac/6513wu/romstage.c
@@ -27,7 +27,7 @@
#include <console/console.h>
#include "southbridge/intel/i82801ax/i82801ax.h"
#include "northbridge/intel/i82810/raminit.h"
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include "lib/delay.c"
#include "cpu/x86/bist.h"
#include "superio/smsc/smscsuperio/early_serial.c"
diff --git a/src/mainboard/msi/ms6119/romstage.c b/src/mainboard/msi/ms6119/romstage.c
index fba259342c..e84c95b549 100644
--- a/src/mainboard/msi/ms6119/romstage.c
+++ b/src/mainboard/msi/ms6119/romstage.c
@@ -28,7 +28,7 @@
#include <console/console.h>
#include "southbridge/intel/i82371eb/i82371eb.h"
#include "northbridge/intel/i440bx/raminit.h"
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include "lib/delay.c"
#include "cpu/x86/bist.h"
#include "superio/winbond/w83977tf/early_serial.c"
diff --git a/src/mainboard/msi/ms6147/romstage.c b/src/mainboard/msi/ms6147/romstage.c
index c06574db69..216ce60374 100644
--- a/src/mainboard/msi/ms6147/romstage.c
+++ b/src/mainboard/msi/ms6147/romstage.c
@@ -28,7 +28,7 @@
#include <console/console.h>
#include "southbridge/intel/i82371eb/i82371eb.h"
#include "northbridge/intel/i440bx/raminit.h"
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include "lib/delay.c"
#include <cpu/x86/bist.h>
#include "superio/winbond/w83977tf/early_serial.c"
diff --git a/src/mainboard/msi/ms6156/romstage.c b/src/mainboard/msi/ms6156/romstage.c
index 8d7f4e8f8e..c086f2d7cc 100644
--- a/src/mainboard/msi/ms6156/romstage.c
+++ b/src/mainboard/msi/ms6156/romstage.c
@@ -28,7 +28,7 @@
#include <console/console.h>
#include "southbridge/intel/i82371eb/i82371eb.h"
#include "northbridge/intel/i440bx/raminit.h"
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include "lib/delay.c"
#include "cpu/x86/bist.h"
#include "superio/winbond/w83977tf/early_serial.c"
diff --git a/src/mainboard/msi/ms6178/romstage.c b/src/mainboard/msi/ms6178/romstage.c
index d3284b70ba..33319821a4 100644
--- a/src/mainboard/msi/ms6178/romstage.c
+++ b/src/mainboard/msi/ms6178/romstage.c
@@ -29,7 +29,7 @@
#include "northbridge/intel/i82810/raminit.h"
#include "cpu/x86/bist.h"
#include "southbridge/intel/i82801ax/i82801ax.h"
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include <lib.h>
#define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1)
diff --git a/src/mainboard/nec/powermate2000/romstage.c b/src/mainboard/nec/powermate2000/romstage.c
index a6ffa6fe20..49dbfe4b99 100644
--- a/src/mainboard/nec/powermate2000/romstage.c
+++ b/src/mainboard/nec/powermate2000/romstage.c
@@ -29,7 +29,7 @@
#include "northbridge/intel/i82810/raminit.h"
#include "cpu/x86/bist.h"
#include "southbridge/intel/i82801ax/i82801ax.h"
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include <lib.h>
#define SERIAL_DEV PNP_DEV(0x2e, SMSCSUPERIO_SP1)
diff --git a/src/mainboard/nokia/ip530/romstage.c b/src/mainboard/nokia/ip530/romstage.c
index 5f5b116429..a7fd4e9222 100644
--- a/src/mainboard/nokia/ip530/romstage.c
+++ b/src/mainboard/nokia/ip530/romstage.c
@@ -28,7 +28,7 @@
#include <console/console.h>
#include "southbridge/intel/i82371eb/i82371eb.h"
#include "northbridge/intel/i440bx/raminit.h"
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include "lib/delay.c"
#include "cpu/x86/bist.h"
#include "superio/smsc/smscsuperio/early_serial.c"
diff --git a/src/mainboard/rca/rm4100/romstage.c b/src/mainboard/rca/rm4100/romstage.c
index 692e5b07d9..5e5ad8d7a1 100644
--- a/src/mainboard/rca/rm4100/romstage.c
+++ b/src/mainboard/rca/rm4100/romstage.c
@@ -25,7 +25,7 @@
#include <device/pnp_def.h>
#include <arch/romcc_io.h>
#include <arch/hlt.h>
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include <console/console.h>
#include <lib.h>
#include "superio/smsc/smscsuperio/early_serial.c"
diff --git a/src/mainboard/soyo/sy-6ba-plus-iii/romstage.c b/src/mainboard/soyo/sy-6ba-plus-iii/romstage.c
index 49499ea111..df640c527e 100644
--- a/src/mainboard/soyo/sy-6ba-plus-iii/romstage.c
+++ b/src/mainboard/soyo/sy-6ba-plus-iii/romstage.c
@@ -28,7 +28,7 @@
#include <console/console.h>
#include "southbridge/intel/i82371eb/i82371eb.h"
#include "northbridge/intel/i440bx/raminit.h"
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include "lib/delay.c"
#include "cpu/x86/bist.h"
void it8671f_48mhz_clkin(void);
diff --git a/src/mainboard/supermicro/x6dai_g/romstage.c b/src/mainboard/supermicro/x6dai_g/romstage.c
index 830be38d88..479e24c5ae 100644
--- a/src/mainboard/supermicro/x6dai_g/romstage.c
+++ b/src/mainboard/supermicro/x6dai_g/romstage.c
@@ -6,7 +6,7 @@
#include <cpu/x86/lapic.h>
#include <stdlib.h>
#include <console/console.h>
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include "lib/delay.c"
#include "southbridge/intel/esb6300/early_smbus.c"
#include "northbridge/intel/e7525/raminit.h"
diff --git a/src/mainboard/supermicro/x6dhe_g/romstage.c b/src/mainboard/supermicro/x6dhe_g/romstage.c
index b6c6c1d443..f2578e5264 100644
--- a/src/mainboard/supermicro/x6dhe_g/romstage.c
+++ b/src/mainboard/supermicro/x6dhe_g/romstage.c
@@ -6,7 +6,7 @@
#include <cpu/x86/lapic.h>
#include <stdlib.h>
#include <console/console.h>
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include "lib/delay.c"
#include "southbridge/intel/esb6300/early_smbus.c"
#include "northbridge/intel/e7520/raminit.h"
diff --git a/src/mainboard/thomson/ip1000/romstage.c b/src/mainboard/thomson/ip1000/romstage.c
index 7ce89adbae..2b291164d8 100644
--- a/src/mainboard/thomson/ip1000/romstage.c
+++ b/src/mainboard/thomson/ip1000/romstage.c
@@ -26,7 +26,7 @@
#include <arch/romcc_io.h>
#include <arch/hlt.h>
#include <arch/llshell.h>
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include <console/console.h>
#include <lib.h>
#include "superio/smsc/smscsuperio/early_serial.c"
diff --git a/src/mainboard/tyan/s1846/romstage.c b/src/mainboard/tyan/s1846/romstage.c
index ecbf902901..b311d641b0 100644
--- a/src/mainboard/tyan/s1846/romstage.c
+++ b/src/mainboard/tyan/s1846/romstage.c
@@ -28,7 +28,7 @@
#include <console/console.h>
#include "southbridge/intel/i82371eb/i82371eb.h"
#include "northbridge/intel/i440bx/raminit.h"
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include "lib/delay.c"
#include "cpu/x86/bist.h"
#include "superio/nsc/pc87309/early_serial.c"
diff --git a/src/mainboard/via/epia-cn/romstage.c b/src/mainboard/via/epia-cn/romstage.c
index 00958f0ab3..83d40efd25 100644
--- a/src/mainboard/via/epia-cn/romstage.c
+++ b/src/mainboard/via/epia-cn/romstage.c
@@ -30,7 +30,7 @@
#include <lib.h>
#include "northbridge/via/cn700/raminit.h"
#include "cpu/x86/bist.h"
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include "lib/delay.c"
#include "southbridge/via/vt8237r/early_smbus.c"
#include "southbridge/via/vt8235/early_serial.c"
diff --git a/src/mainboard/via/epia-m/romstage.c b/src/mainboard/via/epia-m/romstage.c
index f47bbca34b..a42484149c 100644
--- a/src/mainboard/via/epia-m/romstage.c
+++ b/src/mainboard/via/epia-m/romstage.c
@@ -10,7 +10,7 @@
#include "northbridge/via/vt8623/raminit.h"
#include "cpu/x86/mtrr/earlymtrr.c"
#include "cpu/x86/bist.h"
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include "lib/delay.c"
#include "cpu/x86/lapic/boot_cpu.c"
#include "lib/debug.c"
diff --git a/src/mainboard/via/epia-m700/romstage.c b/src/mainboard/via/epia-m700/romstage.c
index 5517cc9372..d5e2c218e9 100644
--- a/src/mainboard/via/epia-m700/romstage.c
+++ b/src/mainboard/via/epia-m700/romstage.c
@@ -35,7 +35,7 @@
#include <lib.h>
#include "northbridge/via/vx800/vx800.h"
#include "cpu/x86/bist.h"
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include "lib/delay.c"
#include <string.h>
/* This file contains the board-special SI value for raminit.c. */
diff --git a/src/mainboard/via/epia-n/romstage.c b/src/mainboard/via/epia-n/romstage.c
index 9aacd9810a..f0fbe1ecbb 100644
--- a/src/mainboard/via/epia-n/romstage.c
+++ b/src/mainboard/via/epia-n/romstage.c
@@ -30,7 +30,7 @@
#include "northbridge/via/cn400/raminit.h"
#include "cpu/x86/mtrr/earlymtrr.c"
#include "cpu/x86/bist.h"
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include "lib/delay.c"
#include "cpu/x86/lapic/boot_cpu.c"
#include "southbridge/via/vt8237r/early_smbus.c"
diff --git a/src/mainboard/via/epia/romstage.c b/src/mainboard/via/epia/romstage.c
index 7c604c10cd..fd053b6bc9 100644
--- a/src/mainboard/via/epia/romstage.c
+++ b/src/mainboard/via/epia/romstage.c
@@ -9,7 +9,7 @@
#include "northbridge/via/vt8601/raminit.h"
#include "cpu/x86/mtrr/earlymtrr.c"
#include "cpu/x86/bist.h"
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include "lib/delay.c"
#include "lib/debug.c"
#include "southbridge/via/vt8231/early_smbus.c"
diff --git a/src/mainboard/via/pc2500e/romstage.c b/src/mainboard/via/pc2500e/romstage.c
index ff85c853a5..6e95bc20c5 100644
--- a/src/mainboard/via/pc2500e/romstage.c
+++ b/src/mainboard/via/pc2500e/romstage.c
@@ -30,7 +30,7 @@
#include <lib.h>
#include "northbridge/via/cn700/raminit.h"
#include "cpu/x86/bist.h"
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include "lib/delay.c"
#include "southbridge/via/vt8237r/early_smbus.c"
#include "superio/ite/it8716f/early_serial.c"
diff --git a/src/mainboard/via/vt8454c/romstage.c b/src/mainboard/via/vt8454c/romstage.c
index 739292593e..3fc7091243 100644
--- a/src/mainboard/via/vt8454c/romstage.c
+++ b/src/mainboard/via/vt8454c/romstage.c
@@ -30,7 +30,7 @@
#include <lib.h>
#include "northbridge/via/cx700/raminit.h"
#include "cpu/x86/bist.h"
-#include "pc80/udelay_io.c"
+#include "drivers/pc80/udelay_io.c"
#include "lib/delay.c"
#include "northbridge/via/cx700/early_smbus.c"
#include "lib/debug.c"