74 files changed, 9 insertions, 9 deletions
diff --git a/Makefile.inc b/Makefile.inc
index 927548e0df..b0a5341ddc 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 29731b349c..ef7fcf63b6 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 ad9493d183..7a58ce8f8b 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 700516b902..700516b902 100644
--- a/src/devices/Kconfig
+++ b/src/device/Kconfig
diff --git a/src/devices/Makefile.inc b/src/device/Makefile.inc
index 9fe156ba8c..9fe156ba8c 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 7e510f8eee..7e510f8eee 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 0b07e3458f..0b07e3458f 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 b689f1abb3..b689f1abb3 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 07bbc7a72a..07bbc7a72a 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 475f94aeaf..475f94aeaf 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 224c58ee64..224c58ee64 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 a6320fe666..a6320fe666 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 aa4a74d4d8..aa4a74d4d8 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 ab26d59bf6..ab26d59bf6 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 7c7df8562b..7c7df8562b 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 d738974d4b..d738974d4b 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 5485eeaedf..5485eeaedf 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 3ceee4985b..3ceee4985b 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 fafeb2c573..fafeb2c573 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 6a82a691b5..6a82a691b5 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 7dfa60f996..7dfa60f996 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 56ebb3a885..56ebb3a885 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 b3764f93b7..b3764f93b7 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 a3ede4a87d..a3ede4a87d 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 620e5f8771..620e5f8771 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 b3f4b6ebfb..b3f4b6ebfb 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 1b2c3a3f1c..1b2c3a3f1c 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 ed96dc66e6..ed96dc66e6 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 99ed7f6f35..99ed7f6f35 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 7edebd4244..7edebd4244 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 5fb271463b..5fb271463b 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 6917a08162..6917a08162 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 825b9eadd1..825b9eadd1 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 95ec09a317..95ec09a317 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 4fa8d55034..4fa8d55034 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 20e75978e5..20e75978e5 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 7230a71e5d..7230a71e5d 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 7a9e3921ec..7a9e3921ec 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 e34a1bad30..e34a1bad30 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 f05998cba5..f05998cba5 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 2a2ca312cb..2a2ca312cb 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 4f5c4aaa5b..4f5c4aaa5b 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 8121c8b461..8121c8b461 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 542c81f315..542c81f315 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 6a00f7a316..6a00f7a316 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 25cabf4d6a..25cabf4d6a 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 18dba3aa85..18dba3aa85 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 7cda8af0b1..7cda8af0b1 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 9361553da7..9361553da7 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 b09f50e4ac..b09f50e4ac 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 edee44d20e..edee44d20e 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 e5b4a3cff4..e5b4a3cff4 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 11755e102a..11755e102a 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 5c19b5142c..5c19b5142c 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 6b2dcc4504..6b2dcc4504 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 4b4a552813..4b4a552813 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 dca8cfc192..dca8cfc192 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 19d14d46b6..19d14d46b6 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 3cc3c17ac6..3cc3c17ac6 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 9dbe07cdd5..9dbe07cdd5 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 bf286bc12c..bf286bc12c 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 ff334fee0e..ff334fee0e 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 07da30034f..07da30034f 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 fe67515936..fe67515936 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 36f3e6a455..36f3e6a455 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 6bfd35dc60..6bfd35dc60 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 19b492db78..19b492db78 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 8ff2fdeb66..8ff2fdeb66 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 75ca42b0c9..75ca42b0c9 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 ce294faa97..1c3cc9f73c 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 9bbb54b07f..fe6e64100e 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 ee9924dd78..56a046e54d 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 3483a2b22b..fc14849072 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 0a8dae6d59..e187122c2e 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