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 +#include #else static inline void mainboard_interrupt_handlers(int intXX, void *intXX_func) { } #endif diff --git a/src/devices/Kconfig b/src/device/Kconfig similarity index 100% rename from src/devices/Kconfig rename to src/device/Kconfig diff --git a/src/devices/Makefile.inc b/src/device/Makefile.inc similarity index 100% rename from src/devices/Makefile.inc rename to src/device/Makefile.inc diff --git a/src/devices/agp_device.c b/src/device/agp_device.c similarity index 100% rename from src/devices/agp_device.c rename to src/device/agp_device.c diff --git a/src/devices/cardbus_device.c b/src/device/cardbus_device.c similarity index 100% rename from src/devices/cardbus_device.c rename to src/device/cardbus_device.c diff --git a/src/devices/cpu_device.c b/src/device/cpu_device.c similarity index 100% rename from src/devices/cpu_device.c rename to src/device/cpu_device.c diff --git a/src/devices/device.c b/src/device/device.c similarity index 100% rename from src/devices/device.c rename to src/device/device.c diff --git a/src/devices/device_romstage.c b/src/device/device_romstage.c similarity index 100% rename from src/devices/device_romstage.c rename to src/device/device_romstage.c diff --git a/src/devices/device_util.c b/src/device/device_util.c similarity index 100% rename from src/devices/device_util.c rename to src/device/device_util.c diff --git a/src/devices/hypertransport.c b/src/device/hypertransport.c similarity index 100% rename from src/devices/hypertransport.c rename to src/device/hypertransport.c diff --git a/src/devices/oprom/Makefile.inc b/src/device/oprom/Makefile.inc similarity index 100% rename from src/devices/oprom/Makefile.inc rename to src/device/oprom/Makefile.inc diff --git a/src/devices/oprom/include/vbe.h b/src/device/oprom/include/vbe.h similarity index 100% rename from src/devices/oprom/include/vbe.h rename to 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 similarity index 100% rename from src/devices/oprom/include/x86emu/fpu_regs.h rename to 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 similarity index 100% rename from src/devices/oprom/include/x86emu/regs.h rename to 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 similarity index 100% rename from src/devices/oprom/include/x86emu/types.h rename to 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 similarity index 100% rename from src/devices/oprom/include/x86emu/x86emu.h rename to src/device/oprom/include/x86emu/x86emu.h diff --git a/src/devices/oprom/realmode/Makefile.inc b/src/device/oprom/realmode/Makefile.inc similarity index 100% rename from src/devices/oprom/realmode/Makefile.inc rename to src/device/oprom/realmode/Makefile.inc diff --git a/src/devices/oprom/realmode/x86.c b/src/device/oprom/realmode/x86.c similarity index 100% rename from src/devices/oprom/realmode/x86.c rename to src/device/oprom/realmode/x86.c diff --git a/src/devices/oprom/realmode/x86.h b/src/device/oprom/realmode/x86.h similarity index 100% rename from src/devices/oprom/realmode/x86.h rename to src/device/oprom/realmode/x86.h diff --git a/src/devices/oprom/realmode/x86_asm.S b/src/device/oprom/realmode/x86_asm.S similarity index 100% rename from src/devices/oprom/realmode/x86_asm.S rename to 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 similarity index 100% rename from src/devices/oprom/realmode/x86_interrupts.c rename to src/device/oprom/realmode/x86_interrupts.c diff --git a/src/devices/oprom/x86emu/LICENSE b/src/device/oprom/x86emu/LICENSE similarity index 100% rename from src/devices/oprom/x86emu/LICENSE rename to src/device/oprom/x86emu/LICENSE diff --git a/src/devices/oprom/x86emu/Makefile.inc b/src/device/oprom/x86emu/Makefile.inc similarity index 100% rename from src/devices/oprom/x86emu/Makefile.inc rename to src/device/oprom/x86emu/Makefile.inc diff --git a/src/devices/oprom/x86emu/debug.c b/src/device/oprom/x86emu/debug.c similarity index 100% rename from src/devices/oprom/x86emu/debug.c rename to src/device/oprom/x86emu/debug.c diff --git a/src/devices/oprom/x86emu/debug.h b/src/device/oprom/x86emu/debug.h similarity index 100% rename from src/devices/oprom/x86emu/debug.h rename to src/device/oprom/x86emu/debug.h diff --git a/src/devices/oprom/x86emu/decode.c b/src/device/oprom/x86emu/decode.c similarity index 100% rename from src/devices/oprom/x86emu/decode.c rename to src/device/oprom/x86emu/decode.c diff --git a/src/devices/oprom/x86emu/decode.h b/src/device/oprom/x86emu/decode.h similarity index 100% rename from src/devices/oprom/x86emu/decode.h rename to src/device/oprom/x86emu/decode.h diff --git a/src/devices/oprom/x86emu/fpu.c b/src/device/oprom/x86emu/fpu.c similarity index 100% rename from src/devices/oprom/x86emu/fpu.c rename to src/device/oprom/x86emu/fpu.c diff --git a/src/devices/oprom/x86emu/fpu.h b/src/device/oprom/x86emu/fpu.h similarity index 100% rename from src/devices/oprom/x86emu/fpu.h rename to src/device/oprom/x86emu/fpu.h diff --git a/src/devices/oprom/x86emu/ops.c b/src/device/oprom/x86emu/ops.c similarity index 100% rename from src/devices/oprom/x86emu/ops.c rename to src/device/oprom/x86emu/ops.c diff --git a/src/devices/oprom/x86emu/ops.h b/src/device/oprom/x86emu/ops.h similarity index 100% rename from src/devices/oprom/x86emu/ops.h rename to src/device/oprom/x86emu/ops.h diff --git a/src/devices/oprom/x86emu/ops2.c b/src/device/oprom/x86emu/ops2.c similarity index 100% rename from src/devices/oprom/x86emu/ops2.c rename to src/device/oprom/x86emu/ops2.c diff --git a/src/devices/oprom/x86emu/prim_asm.h b/src/device/oprom/x86emu/prim_asm.h similarity index 100% rename from src/devices/oprom/x86emu/prim_asm.h rename to 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 similarity index 100% rename from src/devices/oprom/x86emu/prim_ops.c rename to 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 similarity index 100% rename from src/devices/oprom/x86emu/prim_ops.h rename to src/device/oprom/x86emu/prim_ops.h diff --git a/src/devices/oprom/x86emu/sys.c b/src/device/oprom/x86emu/sys.c similarity index 100% rename from src/devices/oprom/x86emu/sys.c rename to src/device/oprom/x86emu/sys.c diff --git a/src/devices/oprom/x86emu/x86emui.h b/src/device/oprom/x86emu/x86emui.h similarity index 100% rename from src/devices/oprom/x86emu/x86emui.h rename to src/device/oprom/x86emu/x86emui.h diff --git a/src/devices/oprom/yabel/Makefile.inc b/src/device/oprom/yabel/Makefile.inc similarity index 100% rename from src/devices/oprom/yabel/Makefile.inc rename to src/device/oprom/yabel/Makefile.inc diff --git a/src/devices/oprom/yabel/biosemu.c b/src/device/oprom/yabel/biosemu.c similarity index 100% rename from src/devices/oprom/yabel/biosemu.c rename to src/device/oprom/yabel/biosemu.c diff --git a/src/devices/oprom/yabel/biosemu.h b/src/device/oprom/yabel/biosemu.h similarity index 100% rename from src/devices/oprom/yabel/biosemu.h rename to src/device/oprom/yabel/biosemu.h diff --git a/src/devices/oprom/yabel/compat/Makefile.inc b/src/device/oprom/yabel/compat/Makefile.inc similarity index 100% rename from src/devices/oprom/yabel/compat/Makefile.inc rename to 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 similarity index 100% rename from src/devices/oprom/yabel/compat/functions.c rename to 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 similarity index 100% rename from src/devices/oprom/yabel/compat/of.h rename to 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 similarity index 100% rename from src/devices/oprom/yabel/compat/rtas.h rename to 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 similarity index 100% rename from src/devices/oprom/yabel/compat/time.h rename to src/device/oprom/yabel/compat/time.h diff --git a/src/devices/oprom/yabel/debug.c b/src/device/oprom/yabel/debug.c similarity index 100% rename from src/devices/oprom/yabel/debug.c rename to src/device/oprom/yabel/debug.c diff --git a/src/devices/oprom/yabel/debug.h b/src/device/oprom/yabel/debug.h similarity index 100% rename from src/devices/oprom/yabel/debug.h rename to src/device/oprom/yabel/debug.h diff --git a/src/devices/oprom/yabel/device.c b/src/device/oprom/yabel/device.c similarity index 100% rename from src/devices/oprom/yabel/device.c rename to src/device/oprom/yabel/device.c diff --git a/src/devices/oprom/yabel/device.h b/src/device/oprom/yabel/device.h similarity index 100% rename from src/devices/oprom/yabel/device.h rename to src/device/oprom/yabel/device.h diff --git a/src/devices/oprom/yabel/interrupt.c b/src/device/oprom/yabel/interrupt.c similarity index 100% rename from src/devices/oprom/yabel/interrupt.c rename to src/device/oprom/yabel/interrupt.c diff --git a/src/devices/oprom/yabel/interrupt.h b/src/device/oprom/yabel/interrupt.h similarity index 100% rename from src/devices/oprom/yabel/interrupt.h rename to src/device/oprom/yabel/interrupt.h diff --git a/src/devices/oprom/yabel/io.c b/src/device/oprom/yabel/io.c similarity index 100% rename from src/devices/oprom/yabel/io.c rename to src/device/oprom/yabel/io.c diff --git a/src/devices/oprom/yabel/io.h b/src/device/oprom/yabel/io.h similarity index 100% rename from src/devices/oprom/yabel/io.h rename to src/device/oprom/yabel/io.h diff --git a/src/devices/oprom/yabel/mem.c b/src/device/oprom/yabel/mem.c similarity index 100% rename from src/devices/oprom/yabel/mem.c rename to src/device/oprom/yabel/mem.c diff --git a/src/devices/oprom/yabel/mem.h b/src/device/oprom/yabel/mem.h similarity index 100% rename from src/devices/oprom/yabel/mem.h rename to src/device/oprom/yabel/mem.h diff --git a/src/devices/oprom/yabel/pmm.c b/src/device/oprom/yabel/pmm.c similarity index 100% rename from src/devices/oprom/yabel/pmm.c rename to src/device/oprom/yabel/pmm.c diff --git a/src/devices/oprom/yabel/pmm.h b/src/device/oprom/yabel/pmm.h similarity index 100% rename from src/devices/oprom/yabel/pmm.h rename to src/device/oprom/yabel/pmm.h diff --git a/src/devices/oprom/yabel/vbe.c b/src/device/oprom/yabel/vbe.c similarity index 100% rename from src/devices/oprom/yabel/vbe.c rename to src/device/oprom/yabel/vbe.c diff --git a/src/devices/oprom/yabel/vbe.h b/src/device/oprom/yabel/vbe.h similarity index 100% rename from src/devices/oprom/yabel/vbe.h rename to src/device/oprom/yabel/vbe.h diff --git a/src/devices/pci_device.c b/src/device/pci_device.c similarity index 100% rename from src/devices/pci_device.c rename to src/device/pci_device.c diff --git a/src/devices/pci_ops.c b/src/device/pci_ops.c similarity index 100% rename from src/devices/pci_ops.c rename to src/device/pci_ops.c diff --git a/src/devices/pci_rom.c b/src/device/pci_rom.c similarity index 100% rename from src/devices/pci_rom.c rename to src/device/pci_rom.c diff --git a/src/devices/pciexp_device.c b/src/device/pciexp_device.c similarity index 100% rename from src/devices/pciexp_device.c rename to src/device/pciexp_device.c diff --git a/src/devices/pcix_device.c b/src/device/pcix_device.c similarity index 100% rename from src/devices/pcix_device.c rename to src/device/pcix_device.c diff --git a/src/devices/pnp_device.c b/src/device/pnp_device.c similarity index 100% rename from src/devices/pnp_device.c rename to src/device/pnp_device.c diff --git a/src/devices/root_device.c b/src/device/root_device.c similarity index 100% rename from src/devices/root_device.c rename to src/device/root_device.c diff --git a/src/devices/smbus_ops.c b/src/device/smbus_ops.c similarity index 100% rename from src/devices/smbus_ops.c rename to 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 #if CONFIG_PCI_OPTION_ROM_RUN_REALMODE -#include +#include #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 #include #if CONFIG_PCI_OPTION_ROM_RUN_REALMODE -#include +#include #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 #include #if CONFIG_PCI_OPTION_ROM_RUN_REALMODE -#include +#include #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