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>

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
 
 #######################################################################

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");

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

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))
 

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"

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"

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. */

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"

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"
 

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"

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>

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"
 

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>

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)

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"

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"

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. */

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. */

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"

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. */

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. */

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>

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"

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)! */

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"

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>

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"
 

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);

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);

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! */

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)

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"

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"

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"

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"

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"

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"

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"

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"

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)

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)

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"

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"

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);

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"

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"

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"

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"

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"

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"

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. */

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"

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"

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"

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"