74 files changed, 9 insertions, 9 deletions
diff --git a/Makefile.inc b/Makefile.inc
index 927548e..b0a5341 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -48,7 +48,7 @@ PHONY+= clean-abuild coreboot lint lint-stable build-dirs
 
 #######################################################################
 # root source directories of coreboot
-subdirs-y := src/lib src/console src/devices src/ec src/southbridge
+subdirs-y := src/lib src/console src/device src/ec src/southbridge
 subdirs-y += src/northbridge src/superio src/drivers src/cpu src/vendorcode
 subdirs-y += util/cbfstool util/sconfig util/nvramtool
 subdirs-y += src/arch/$(ARCHDIR-y)
@@ -184,7 +184,7 @@ COREBOOT_EXTRA_VERSION := -$(call strip_quotes,$(CONFIG_LOCALVERSION))
 endif
 
 INCLUDES := -Isrc -Isrc/include -I$(obj) -Isrc/arch/$(ARCHDIR-y)/include
-INCLUDES += -Isrc/devices/oprom/include
+INCLUDES += -Isrc/device/oprom/include
 # abspath is a workaround for romcc
 INCLUDES += -include $(src)/include/kconfig.h
 
diff --git a/src/Kconfig b/src/Kconfig
index 29731b3..ef7fcf6 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -238,7 +238,7 @@ source src/ec/Kconfig
 
 endmenu
 
-source src/devices/Kconfig
+source src/device/Kconfig
 
 menu "Generic Drivers"
 source src/drivers/Kconfig
diff --git a/src/arch/x86/include/arch/interrupt.h b/src/arch/x86/include/arch/interrupt.h
index ad9493d..7a58ce8 100644
--- a/src/arch/x86/include/arch/interrupt.h
+++ b/src/arch/x86/include/arch/interrupt.h
@@ -25,7 +25,7 @@
 #if CONFIG_PCI_OPTION_ROM_RUN_REALMODE
 extern void mainboard_interrupt_handlers(int intXX, void *intXX_func);
 #elif CONFIG_PCI_OPTION_ROM_RUN_YABEL
-#include <devices/oprom/yabel/biosemu.h>
+#include <device/oprom/yabel/biosemu.h>
 #else
 static inline void mainboard_interrupt_handlers(int intXX, void *intXX_func) { }
 #endif
diff --git a/src/devices/Kconfig b/src/device/Kconfig
index 700516b..700516b 100644
--- a/src/devices/Kconfig
+++ b/src/device/Kconfig
diff --git a/src/devices/Makefile.inc b/src/device/Makefile.inc
index 9fe156b..9fe156b 100644
--- a/src/devices/Makefile.inc
+++ b/src/device/Makefile.inc
diff --git a/src/devices/agp_device.c b/src/device/agp_device.c
index 7e510f8..7e510f8 100644
--- a/src/devices/agp_device.c
+++ b/src/device/agp_device.c
diff --git a/src/devices/cardbus_device.c b/src/device/cardbus_device.c
index 0b07e34..0b07e34 100644
--- a/src/devices/cardbus_device.c
+++ b/src/device/cardbus_device.c
diff --git a/src/devices/cpu_device.c b/src/device/cpu_device.c
index b689f1a..b689f1a 100644
--- a/src/devices/cpu_device.c
+++ b/src/device/cpu_device.c
diff --git a/src/devices/device.c b/src/device/device.c
index 07bbc7a..07bbc7a 100644
--- a/src/devices/device.c
+++ b/src/device/device.c
diff --git a/src/devices/device_romstage.c b/src/device/device_romstage.c
index 475f94a..475f94a 100644
--- a/src/devices/device_romstage.c
+++ b/src/device/device_romstage.c
diff --git a/src/devices/device_util.c b/src/device/device_util.c
index 224c58e..224c58e 100644
--- a/src/devices/device_util.c
+++ b/src/device/device_util.c
diff --git a/src/devices/hypertransport.c b/src/device/hypertransport.c
index a6320fe..a6320fe 100644
--- a/src/devices/hypertransport.c
+++ b/src/device/hypertransport.c
diff --git a/src/devices/oprom/Makefile.inc b/src/device/oprom/Makefile.inc
index aa4a74d..aa4a74d 100644
--- a/src/devices/oprom/Makefile.inc
+++ b/src/device/oprom/Makefile.inc
diff --git a/src/devices/oprom/include/vbe.h b/src/device/oprom/include/vbe.h
index ab26d59..ab26d59 100644
--- a/src/devices/oprom/include/vbe.h
+++ b/src/device/oprom/include/vbe.h
diff --git a/src/devices/oprom/include/x86emu/fpu_regs.h b/src/device/oprom/include/x86emu/fpu_regs.h
index 7c7df85..7c7df85 100644
--- a/src/devices/oprom/include/x86emu/fpu_regs.h
+++ b/src/device/oprom/include/x86emu/fpu_regs.h
diff --git a/src/devices/oprom/include/x86emu/regs.h b/src/device/oprom/include/x86emu/regs.h
index d738974..d738974 100644
--- a/src/devices/oprom/include/x86emu/regs.h
+++ b/src/device/oprom/include/x86emu/regs.h
diff --git a/src/devices/oprom/include/x86emu/types.h b/src/device/oprom/include/x86emu/types.h
index 5485eea..5485eea 100644
--- a/src/devices/oprom/include/x86emu/types.h
+++ b/src/device/oprom/include/x86emu/types.h
diff --git a/src/devices/oprom/include/x86emu/x86emu.h b/src/device/oprom/include/x86emu/x86emu.h
index 3ceee49..3ceee49 100644
--- a/src/devices/oprom/include/x86emu/x86emu.h
+++ b/src/device/oprom/include/x86emu/x86emu.h
diff --git a/src/devices/oprom/realmode/Makefile.inc b/src/device/oprom/realmode/Makefile.inc
index fafeb2c..fafeb2c 100644
--- a/src/devices/oprom/realmode/Makefile.inc
+++ b/src/device/oprom/realmode/Makefile.inc
diff --git a/src/devices/oprom/realmode/x86.c b/src/device/oprom/realmode/x86.c
index 6a82a69..6a82a69 100644
--- a/src/devices/oprom/realmode/x86.c
+++ b/src/device/oprom/realmode/x86.c
diff --git a/src/devices/oprom/realmode/x86.h b/src/device/oprom/realmode/x86.h
index 7dfa60f..7dfa60f 100644
--- a/src/devices/oprom/realmode/x86.h
+++ b/src/device/oprom/realmode/x86.h
diff --git a/src/devices/oprom/realmode/x86_asm.S b/src/device/oprom/realmode/x86_asm.S
index 56ebb3a..56ebb3a 100644
--- a/src/devices/oprom/realmode/x86_asm.S
+++ b/src/device/oprom/realmode/x86_asm.S
diff --git a/src/devices/oprom/realmode/x86_interrupts.c b/src/device/oprom/realmode/x86_interrupts.c
index b3764f9..b3764f9 100644
--- a/src/devices/oprom/realmode/x86_interrupts.c
+++ b/src/device/oprom/realmode/x86_interrupts.c
diff --git a/src/devices/oprom/x86emu/LICENSE b/src/device/oprom/x86emu/LICENSE
index a3ede4a..a3ede4a 100644
--- a/src/devices/oprom/x86emu/LICENSE
+++ b/src/device/oprom/x86emu/LICENSE
diff --git a/src/devices/oprom/x86emu/Makefile.inc b/src/device/oprom/x86emu/Makefile.inc
index 620e5f8..620e5f8 100644
--- a/src/devices/oprom/x86emu/Makefile.inc
+++ b/src/device/oprom/x86emu/Makefile.inc
diff --git a/src/devices/oprom/x86emu/debug.c b/src/device/oprom/x86emu/debug.c
index b3f4b6e..b3f4b6e 100644
--- a/src/devices/oprom/x86emu/debug.c
+++ b/src/device/oprom/x86emu/debug.c
diff --git a/src/devices/oprom/x86emu/debug.h b/src/device/oprom/x86emu/debug.h
index 1b2c3a3..1b2c3a3 100644
--- a/src/devices/oprom/x86emu/debug.h
+++ b/src/device/oprom/x86emu/debug.h
diff --git a/src/devices/oprom/x86emu/decode.c b/src/device/oprom/x86emu/decode.c
index ed96dc6..ed96dc6 100644
--- a/src/devices/oprom/x86emu/decode.c
+++ b/src/device/oprom/x86emu/decode.c
diff --git a/src/devices/oprom/x86emu/decode.h b/src/device/oprom/x86emu/decode.h
index 99ed7f6..99ed7f6 100644
--- a/src/devices/oprom/x86emu/decode.h
+++ b/src/device/oprom/x86emu/decode.h
diff --git a/src/devices/oprom/x86emu/fpu.c b/src/device/oprom/x86emu/fpu.c
index 7edebd4..7edebd4 100644
--- a/src/devices/oprom/x86emu/fpu.c
+++ b/src/device/oprom/x86emu/fpu.c
diff --git a/src/devices/oprom/x86emu/fpu.h b/src/device/oprom/x86emu/fpu.h
index 5fb2714..5fb2714 100644
--- a/src/devices/oprom/x86emu/fpu.h
+++ b/src/device/oprom/x86emu/fpu.h
diff --git a/src/devices/oprom/x86emu/ops.c b/src/device/oprom/x86emu/ops.c
index 6917a08..6917a08 100644
--- a/src/devices/oprom/x86emu/ops.c
+++ b/src/device/oprom/x86emu/ops.c
diff --git a/src/devices/oprom/x86emu/ops.h b/src/device/oprom/x86emu/ops.h
index 825b9ea..825b9ea 100644
--- a/src/devices/oprom/x86emu/ops.h
+++ b/src/device/oprom/x86emu/ops.h
diff --git a/src/devices/oprom/x86emu/ops2.c b/src/device/oprom/x86emu/ops2.c
index 95ec09a..95ec09a 100644
--- a/src/devices/oprom/x86emu/ops2.c
+++ b/src/device/oprom/x86emu/ops2.c
diff --git a/src/devices/oprom/x86emu/prim_asm.h b/src/device/oprom/x86emu/prim_asm.h
index 4fa8d55..4fa8d55 100644
--- a/src/devices/oprom/x86emu/prim_asm.h
+++ b/src/device/oprom/x86emu/prim_asm.h
diff --git a/src/devices/oprom/x86emu/prim_ops.c b/src/device/oprom/x86emu/prim_ops.c
index 20e7597..20e7597 100644
--- a/src/devices/oprom/x86emu/prim_ops.c
+++ b/src/device/oprom/x86emu/prim_ops.c
diff --git a/src/devices/oprom/x86emu/prim_ops.h b/src/device/oprom/x86emu/prim_ops.h
index 7230a71..7230a71 100644
--- a/src/devices/oprom/x86emu/prim_ops.h
+++ b/src/device/oprom/x86emu/prim_ops.h
diff --git a/src/devices/oprom/x86emu/sys.c b/src/device/oprom/x86emu/sys.c
index 7a9e392..7a9e392 100644
--- a/src/devices/oprom/x86emu/sys.c
+++ b/src/device/oprom/x86emu/sys.c
diff --git a/src/devices/oprom/x86emu/x86emui.h b/src/device/oprom/x86emu/x86emui.h
index e34a1ba..e34a1ba 100644
--- a/src/devices/oprom/x86emu/x86emui.h
+++ b/src/device/oprom/x86emu/x86emui.h
diff --git a/src/devices/oprom/yabel/Makefile.inc b/src/device/oprom/yabel/Makefile.inc
index f05998c..f05998c 100644
--- a/src/devices/oprom/yabel/Makefile.inc
+++ b/src/device/oprom/yabel/Makefile.inc
diff --git a/src/devices/oprom/yabel/biosemu.c b/src/device/oprom/yabel/biosemu.c
index 2a2ca31..2a2ca31 100644
--- a/src/devices/oprom/yabel/biosemu.c
+++ b/src/device/oprom/yabel/biosemu.c
diff --git a/src/devices/oprom/yabel/biosemu.h b/src/device/oprom/yabel/biosemu.h
index 4f5c4aa..4f5c4aa 100644
--- a/src/devices/oprom/yabel/biosemu.h
+++ b/src/device/oprom/yabel/biosemu.h
diff --git a/src/devices/oprom/yabel/compat/Makefile.inc b/src/device/oprom/yabel/compat/Makefile.inc
index 8121c8b..8121c8b 100644
--- a/src/devices/oprom/yabel/compat/Makefile.inc
+++ b/src/device/oprom/yabel/compat/Makefile.inc
diff --git a/src/devices/oprom/yabel/compat/functions.c b/src/device/oprom/yabel/compat/functions.c
index 542c81f..542c81f 100644
--- a/src/devices/oprom/yabel/compat/functions.c
+++ b/src/device/oprom/yabel/compat/functions.c
diff --git a/src/devices/oprom/yabel/compat/of.h b/src/device/oprom/yabel/compat/of.h
index 6a00f7a..6a00f7a 100644
--- a/src/devices/oprom/yabel/compat/of.h
+++ b/src/device/oprom/yabel/compat/of.h
diff --git a/src/devices/oprom/yabel/compat/rtas.h b/src/device/oprom/yabel/compat/rtas.h
index 25cabf4..25cabf4 100644
--- a/src/devices/oprom/yabel/compat/rtas.h
+++ b/src/device/oprom/yabel/compat/rtas.h
diff --git a/src/devices/oprom/yabel/compat/time.h b/src/device/oprom/yabel/compat/time.h
index 18dba3a..18dba3a 100644
--- a/src/devices/oprom/yabel/compat/time.h
+++ b/src/device/oprom/yabel/compat/time.h
diff --git a/src/devices/oprom/yabel/debug.c b/src/device/oprom/yabel/debug.c
index 7cda8af..7cda8af 100644
--- a/src/devices/oprom/yabel/debug.c
+++ b/src/device/oprom/yabel/debug.c
diff --git a/src/devices/oprom/yabel/debug.h b/src/device/oprom/yabel/debug.h
index 9361553..9361553 100644
--- a/src/devices/oprom/yabel/debug.h
+++ b/src/device/oprom/yabel/debug.h
diff --git a/src/devices/oprom/yabel/device.c b/src/device/oprom/yabel/device.c
index b09f50e..b09f50e 100644
--- a/src/devices/oprom/yabel/device.c
+++ b/src/device/oprom/yabel/device.c
diff --git a/src/devices/oprom/yabel/device.h b/src/device/oprom/yabel/device.h
index edee44d..edee44d 100644
--- a/src/devices/oprom/yabel/device.h
+++ b/src/device/oprom/yabel/device.h
diff --git a/src/devices/oprom/yabel/interrupt.c b/src/device/oprom/yabel/interrupt.c
index e5b4a3c..e5b4a3c 100644
--- a/src/devices/oprom/yabel/interrupt.c
+++ b/src/device/oprom/yabel/interrupt.c
diff --git a/src/devices/oprom/yabel/interrupt.h b/src/device/oprom/yabel/interrupt.h
index 11755e1..11755e1 100644
--- a/src/devices/oprom/yabel/interrupt.h
+++ b/src/device/oprom/yabel/interrupt.h
diff --git a/src/devices/oprom/yabel/io.c b/src/device/oprom/yabel/io.c
index 5c19b51..5c19b51 100644
--- a/src/devices/oprom/yabel/io.c
+++ b/src/device/oprom/yabel/io.c
diff --git a/src/devices/oprom/yabel/io.h b/src/device/oprom/yabel/io.h
index 6b2dcc4..6b2dcc4 100644
--- a/src/devices/oprom/yabel/io.h
+++ b/src/device/oprom/yabel/io.h
diff --git a/src/devices/oprom/yabel/mem.c b/src/device/oprom/yabel/mem.c
index 4b4a552..4b4a552 100644
--- a/src/devices/oprom/yabel/mem.c
+++ b/src/device/oprom/yabel/mem.c
diff --git a/src/devices/oprom/yabel/mem.h b/src/device/oprom/yabel/mem.h
index dca8cfc..dca8cfc 100644
--- a/src/devices/oprom/yabel/mem.h
+++ b/src/device/oprom/yabel/mem.h
diff --git a/src/devices/oprom/yabel/pmm.c b/src/device/oprom/yabel/pmm.c
index 19d14d4..19d14d4 100644
--- a/src/devices/oprom/yabel/pmm.c
+++ b/src/device/oprom/yabel/pmm.c
diff --git a/src/devices/oprom/yabel/pmm.h b/src/device/oprom/yabel/pmm.h
index 3cc3c17..3cc3c17 100644
--- a/src/devices/oprom/yabel/pmm.h
+++ b/src/device/oprom/yabel/pmm.h
diff --git a/src/devices/oprom/yabel/vbe.c b/src/device/oprom/yabel/vbe.c
index 9dbe07c..9dbe07c 100644
--- a/src/devices/oprom/yabel/vbe.c
+++ b/src/device/oprom/yabel/vbe.c
diff --git a/src/devices/oprom/yabel/vbe.h b/src/device/oprom/yabel/vbe.h
index bf286bc..bf286bc 100644
--- a/src/devices/oprom/yabel/vbe.h
+++ b/src/device/oprom/yabel/vbe.h
diff --git a/src/devices/pci_device.c b/src/device/pci_device.c
index ff334fe..ff334fe 100644
--- a/src/devices/pci_device.c
+++ b/src/device/pci_device.c
diff --git a/src/devices/pci_ops.c b/src/device/pci_ops.c
index 07da300..07da300 100644
--- a/src/devices/pci_ops.c
+++ b/src/device/pci_ops.c
diff --git a/src/devices/pci_rom.c b/src/device/pci_rom.c
index fe67515..fe67515 100644
--- a/src/devices/pci_rom.c
+++ b/src/device/pci_rom.c
diff --git a/src/devices/pciexp_device.c b/src/device/pciexp_device.c
index 36f3e6a..36f3e6a 100644
--- a/src/devices/pciexp_device.c
+++ b/src/device/pciexp_device.c
diff --git a/src/devices/pcix_device.c b/src/device/pcix_device.c
index 6bfd35d..6bfd35d 100644
--- a/src/devices/pcix_device.c
+++ b/src/device/pcix_device.c
diff --git a/src/devices/pnp_device.c b/src/device/pnp_device.c
index 19b492d..19b492d 100644
--- a/src/devices/pnp_device.c
+++ b/src/device/pnp_device.c
diff --git a/src/devices/root_device.c b/src/device/root_device.c
index 8ff2fde..8ff2fde 100644
--- a/src/devices/root_device.c
+++ b/src/device/root_device.c
diff --git a/src/devices/smbus_ops.c b/src/device/smbus_ops.c
index 75ca42b..75ca42b 100644
--- a/src/devices/smbus_ops.c
+++ b/src/device/smbus_ops.c
diff --git a/src/northbridge/via/cx700/vga.c b/src/northbridge/via/cx700/vga.c
index ce294fa..1c3cc9f 100644
--- a/src/northbridge/via/cx700/vga.c
+++ b/src/northbridge/via/cx700/vga.c
@@ -32,7 +32,7 @@
 #include "registers.h"
 #include <x86emu/regs.h>
 #if CONFIG_PCI_OPTION_ROM_RUN_REALMODE
-#include <devices/oprom/realmode/x86.h>
+#include <device/oprom/realmode/x86.h>
 #endif
 
 /* PCI Domain 1 Device 0 Function 0 */
diff --git a/src/northbridge/via/vt8623/vga.c b/src/northbridge/via/vt8623/vga.c
index 9bbb54b..fe6e641 100644
--- a/src/northbridge/via/vt8623/vga.c
+++ b/src/northbridge/via/vt8623/vga.c
@@ -31,7 +31,7 @@
 #include <arch/interrupt.h>
 #include <x86emu/regs.h>
 #if CONFIG_PCI_OPTION_ROM_RUN_REALMODE
-#include <devices/oprom/realmode/x86.h>
+#include <device/oprom/realmode/x86.h>
 #endif
 
 static int via_vt8623_int15_handler(void)
diff --git a/src/northbridge/via/vx800/vga.c b/src/northbridge/via/vx800/vga.c
index ee9924d..56a046e 100644
--- a/src/northbridge/via/vx800/vga.c
+++ b/src/northbridge/via/vx800/vga.c
@@ -34,7 +34,7 @@
 #include <arch/interrupt.h>
 #include <x86emu/regs.h>
 #if CONFIG_PCI_OPTION_ROM_RUN_REALMODE
-#include <devices/oprom/realmode/x86.h>
+#include <device/oprom/realmode/x86.h>
 #endif
 
 /* PCI Domain 1 Device 0 Function 0 */
diff --git a/util/genprof/README b/util/genprof/README
index 3483a2b..fc14849 100644
--- a/util/genprof/README
+++ b/util/genprof/README
@@ -16,7 +16,7 @@ You can use the log2dress to dress the log again:
 
 ...
 src/arch/x86/lib/c_start.S:85 calls /home/ruik/coreboot/src/boot/selfboot.c:367
-/home/ruik/coreboot/src/boot/selfboot.c:370 calls /home/ruik/coreboot/src/devices/device.c:325
+/home/ruik/coreboot/src/boot/selfboot.c:370 calls /home/ruik/coreboot/src/device/device.c:325
 ...
 
 Alternatively, you can use genprof to generate a gmon.out file, which can be used
diff --git a/util/vgabios/Makefile b/util/vgabios/Makefile
index 0a8dae6..e187122 100644
--- a/util/vgabios/Makefile
+++ b/util/vgabios/Makefile
@@ -12,7 +12,7 @@ CFLAGS  += -Wall -Wundef -Wstrict-prototypes -Wmissing-prototypes
 CFLAGS  += -Wwrite-strings -Wredundant-decls -Wno-trigraphs
 CFLAGS  += -Wstrict-aliasing -Wshadow -Wextra
 
-INCLUDES = -Iinclude -I../../src/devices/oprom/include/
+INCLUDES = -Iinclude -I../../src/device/oprom/include/
 
 INTOBJS  = int10.o int15.o int16.o int1a.o inte6.o
 X86EMUOBJS  = sys.o decode.o ops.o ops2.o prim_ops.o fpu.o debug.o