diff options
70 files changed, 59 insertions, 60 deletions
diff --git a/Makefile.inc b/Makefile.inc index 4d25dd528bb8..53a3dadab08d 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 2f7adae19097..f3f7071140b9 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 21a698a3978b..5f6dadfcc5cb 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 8ca21bf5e581..8ca21bf5e581 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 f75216da4714..f75216da4714 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 66988753cfe3..66988753cfe3 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 b64f125f3a38..b64f125f3a38 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 e0a664333425..e0a664333425 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 99d670de421d..99d670de421d 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 0652f27c47ff..0652f27c47ff 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 17e1ed702d46..17e1ed702d46 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 37f3f731865a..37f3f731865a 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 d4b726a388cd..d4b726a388cd 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 9d640419bb38..9d640419bb38 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 1e6e750b8987..1e6e750b8987 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 d98bbeec84e2..d98bbeec84e2 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 c31287ab6d8e..c31287ab6d8e 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 5f6972890bf9..5f6972890bf9 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 24dac2c098dc..a1f06e702196 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 b7534a8d3ab7..741eca22785a 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 9c04fb957899..8d2175d33ab8 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 313559277bf2..ccba4bc5bbb3 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 6f3911a3d323..89d8959c783a 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 27022d4e67e3..248d2f779bd0 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 f1d1b2a0d61c..55d05168f62c 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 74365e67246d..56341ea3ec98 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 8b46b19e8d08..a8aeabd87f71 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 f0f26c903959..2901391c1459 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 f82f87eee4b5..473a33b4c1b3 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 4d10862a39ea..a0af9b264fd7 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 593bfc4df415..f7e993f52166 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 361a32fe6dde..a78cff5cebf4 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 6209233c10ee..008b45752cc5 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 b7534a8d3ab7..741eca22785a 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 1772a5217832..009b0827f7f6 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 d5cf02bba9eb..fd811a86203d 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 f930e4527fcb..11ef163c316a 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 de1947f8b740..a90a28ba01ee 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 062f450f343a..14822abf06df 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 d1a762240b39..e5c791716478 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 6b200f1c827e..b36481a4ec71 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 d6b5dd5fa067..33a0fccf94c8 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 c1500964090a..8b231af2faa3 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 9002ab101c56..f2663b1d9ff8 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 789d17fe4597..8c63cf2e7ee7 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 e70e65d4a0c2..2dd363c8ce9b 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 0594e7e402e6..330323d6b836 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 6672a4095973..396f25fb3dcc 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 899a60418759..7814fc245046 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 dbe769ef84da..35833d4668a7 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 d93813f59464..85c8fb7bf203 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 fba259342ccc..e84c95b54945 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 c06574db6923..216ce6037436 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 8d7f4e8f8ec2..c086f2d7cc16 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 d3284b70ba72..33319821a4bd 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 a6ffa6fe2080..49dbfe4b99a0 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 5f5b116429a6..a7fd4e9222b3 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 692e5b07d92f..5e5ad8d7a1a0 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 49499ea1115b..df640c527e06 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 830be38d8875..479e24c5ae29 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 b6c6c1d44310..f2578e5264d2 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 7ce89adbae28..2b291164d8c4 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 ecbf902901fa..b311d641b044 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 00958f0ab32e..83d40efd250c 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 f47bbca34ba9..a42484149c86 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 5517cc9372d6..d5e2c218e980 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 9aacd9810acf..f0fbe1ecbb44 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 7c604c10cd47..fd053b6bc97a 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 ff85c853a5f8..6e95bc20c575 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 739292593ea6..3fc7091243a8 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" |