diff options
| -rw-r--r-- | src/arch/x86/Makefile.inc | 86 | ||||
| -rw-r--r-- | src/arch/x86/acpi.c (renamed from src/arch/x86/boot/acpi.c) | 0 | ||||
| -rw-r--r-- | src/arch/x86/acpigen.c (renamed from src/arch/x86/boot/acpigen.c) | 0 | ||||
| -rw-r--r-- | src/arch/x86/boot.c (renamed from src/arch/x86/boot/boot.c) | 0 | ||||
| -rw-r--r-- | src/arch/x86/boot/Makefile.inc | 22 | ||||
| -rw-r--r-- | src/arch/x86/bootblock_normal.c (renamed from src/arch/x86/init/bootblock_normal.c) | 0 | ||||
| -rw-r--r-- | src/arch/x86/bootblock_simple.c (renamed from src/arch/x86/init/bootblock_simple.c) | 0 | ||||
| -rw-r--r-- | src/arch/x86/c_start.S (renamed from src/arch/x86/lib/c_start.S) | 0 | ||||
| -rw-r--r-- | src/arch/x86/cbfs_and_run.c (renamed from src/arch/x86/lib/cbfs_and_run.c) | 0 | ||||
| -rw-r--r-- | src/arch/x86/cbmem.c (renamed from src/arch/x86/boot/cbmem.c) | 0 | ||||
| -rw-r--r-- | src/arch/x86/cpu.c (renamed from src/arch/x86/lib/cpu.c) | 0 | ||||
| -rw-r--r-- | src/arch/x86/cpu_common.c (renamed from src/arch/x86/lib/cpu_common.c) | 0 | ||||
| -rw-r--r-- | src/arch/x86/crt0_romcc_epilogue.inc (renamed from src/arch/x86/init/crt0_romcc_epilogue.inc) | 0 | ||||
| -rw-r--r-- | src/arch/x86/ebda.c (renamed from src/arch/x86/lib/ebda.c) | 0 | ||||
| -rw-r--r-- | src/arch/x86/exception.c (renamed from src/arch/x86/lib/exception.c) | 0 | ||||
| -rw-r--r-- | src/arch/x86/failover.ld (renamed from src/arch/x86/init/failover.ld) | 0 | ||||
| -rw-r--r-- | src/arch/x86/gdt.c (renamed from src/arch/x86/boot/gdt.c) | 0 | ||||
| -rw-r--r-- | src/arch/x86/id.inc (renamed from src/arch/x86/lib/id.inc) | 0 | ||||
| -rw-r--r-- | src/arch/x86/id.ld (renamed from src/arch/x86/lib/id.ld) | 0 | ||||
| -rw-r--r-- | src/arch/x86/init/Makefile.inc | 1 | ||||
| -rw-r--r-- | src/arch/x86/ioapic.c (renamed from src/arch/x86/lib/ioapic.c) | 0 | ||||
| -rw-r--r-- | src/arch/x86/lib/Makefile.inc | 48 | ||||
| -rw-r--r-- | src/arch/x86/memcpy.c (renamed from src/arch/x86/lib/memcpy.c) | 0 | ||||
| -rw-r--r-- | src/arch/x86/memmove.c (renamed from src/arch/x86/lib/memmove.c) | 0 | ||||
| -rw-r--r-- | src/arch/x86/memset.c (renamed from src/arch/x86/lib/memset.c) | 0 | ||||
| -rw-r--r-- | src/arch/x86/mmap_boot.c (renamed from src/arch/x86/lib/mmap_boot.c) | 0 | ||||
| -rw-r--r-- | src/arch/x86/mpspec.c (renamed from src/arch/x86/boot/mpspec.c) | 0 | ||||
| -rw-r--r-- | src/arch/x86/pci_ops_conf1.c (renamed from src/arch/x86/lib/pci_ops_conf1.c) | 0 | ||||
| -rw-r--r-- | src/arch/x86/pci_ops_mmconf.c (renamed from src/arch/x86/lib/pci_ops_mmconf.c) | 0 | ||||
| -rw-r--r-- | src/arch/x86/pirq_routing.c (renamed from src/arch/x86/boot/pirq_routing.c) | 0 | ||||
| -rw-r--r-- | src/arch/x86/prologue.inc (renamed from src/arch/x86/init/prologue.inc) | 0 | ||||
| -rw-r--r-- | src/arch/x86/romcc_console.c (renamed from src/arch/x86/lib/romcc_console.c) | 0 | ||||
| -rw-r--r-- | src/arch/x86/romstage.ld (renamed from src/arch/x86/init/romstage.ld) | 0 | ||||
| -rw-r--r-- | src/arch/x86/smbios.c (renamed from src/arch/x86/boot/smbios.c) | 0 | ||||
| -rw-r--r-- | src/arch/x86/stages.c (renamed from src/arch/x86/lib/stages.c) | 0 | ||||
| -rw-r--r-- | src/arch/x86/tables.c (renamed from src/arch/x86/boot/tables.c) | 0 | ||||
| -rw-r--r-- | src/arch/x86/thread.c (renamed from src/arch/x86/lib/thread.c) | 0 | ||||
| -rw-r--r-- | src/arch/x86/thread_switch.S (renamed from src/arch/x86/lib/thread_switch.S) | 0 | ||||
| -rw-r--r-- | src/arch/x86/timestamp.c (renamed from src/arch/x86/lib/timestamp.c) | 0 | ||||
| -rw-r--r-- | src/arch/x86/wakeup.S (renamed from src/arch/x86/boot/wakeup.S) | 0 | ||||
| -rw-r--r-- | src/arch/x86/walkcbfs.S (renamed from src/arch/x86/lib/walkcbfs.S) | 0 | ||||
| -rw-r--r-- | src/mainboard/bifferos/bifferboard/romstage.c | 2 | ||||
| -rw-r--r-- | src/mainboard/dmp/vortex86ex/romstage.c | 2 | ||||
| -rw-r--r-- | src/northbridge/intel/fsp_rangeley/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/northbridge/intel/fsp_sandybridge/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/northbridge/intel/haswell/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/northbridge/intel/nehalem/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/northbridge/intel/sandybridge/Makefile.inc | 2 |
48 files changed, 77 insertions, 94 deletions
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index 2448590ba9..4b61767aed 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -19,13 +19,6 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc. ## -############################################################################### -# Take care of subdirectories -############################################################################### -subdirs-y += boot -# subdirs-y += init -subdirs-y += lib -subdirs-y += smp ################################################################################ # i386 specific tools @@ -74,20 +67,20 @@ CBFS_BASE_ADDRESS=$(call int-add, $(call int-subtract, 0xffffffff $(CONFIG_CBFS_ ifeq ($(CONFIG_ARCH_BOOTBLOCK_X86_32)$(CONFIG_ARCH_BOOTBLOCK_X86_64),y) -bootblock-srcs += $(src)/arch/x86/init/failover.ld +bootblock-srcs += $(src)/arch/x86/failover.ld bootblock-srcs += $(src)/cpu/x86/16bit/entry16.ld bootblock-srcs += $(src)/cpu/x86/16bit/reset16.ld -bootblock-srcs += $(src)/arch/x86/lib/id.ld +bootblock-srcs += $(src)/arch/x86/id.ld ifeq ($(CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE),y) bootblock-srcs += $(src)/cpu/intel/fit/fit.ld endif # TODO: Why can't this use the real bootblock-y += xxx.S mechanism instead? -bootblock_inc = $(src)/arch/x86/init/prologue.inc +bootblock_inc = $(src)/arch/x86/prologue.inc bootblock_inc += $(src)/cpu/x86/16bit/entry16.inc bootblock_inc += $(src)/cpu/x86/16bit/reset16.inc bootblock_inc += $(src)/cpu/x86/32bit/entry32.inc -bootblock_inc += $(src)/arch/x86/lib/id.inc +bootblock_inc += $(src)/arch/x86/id.inc ifeq ($(CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE),y) bootblock_inc += $(src)/cpu/intel/fit/fit.inc endif @@ -97,7 +90,7 @@ ifeq ($(CONFIG_SSE),y) bootblock_inc += $(src)/cpu/x86/sse_enable.inc endif bootblock_inc += $(objgenerated)/bootblock.inc -bootblock_inc += $(src)/arch/x86/lib/walkcbfs.S +bootblock_inc += $(src)/arch/x86/walkcbfs.S bootblock_romccflags := -mcpu=i386 -O2 -D__PRE_RAM__ -D__BOOTBLOCK__ ifeq ($(CONFIG_SSE),y) @@ -121,7 +114,7 @@ $(objgenerated)/bootblock.s: $(objgenerated)/bootblock_inc.S $(obj)/config.h $(o @printf " CC $(subst $(obj)/,,$(@))\n" $(CC_bootblock) -MMD -x assembler-with-cpp -E -I$(src)/include -I$(src)/arch/x86/include -I$(obj) -include $(obj)/build.h -include $(obj)/config.h -I. -I$(src) $< -o $@ -$(objgenerated)/bootblock.inc: $(src)/arch/x86/init/$(subst ",,$(CONFIG_BOOTBLOCK_SOURCE)) $(objutil)/romcc/romcc $(OPTION_TABLE_H) +$(objgenerated)/bootblock.inc: $(src)/arch/x86/$(subst ",,$(CONFIG_BOOTBLOCK_SOURCE)) $(objutil)/romcc/romcc $(OPTION_TABLE_H) @printf " ROMCC $(subst $(obj)/,,$(@))\n" $(CC_bootblock) $(CPPFLAGS_bootblock) -MM -MT$(objgenerated)/bootblock.inc \ $< > $(objgenerated)/bootblock.inc.d @@ -144,8 +137,8 @@ endif # CONFIG_ARCH_BOOTBLOCK_X86_32 / CONFIG_ARCH_BOOTBLOCK_X86_64 ifeq ($(CONFIG_ARCH_ROMSTAGE_X86_32)$(CONFIG_ARCH_ROMSTAGE_X86_64),y) -crt0s = $(src)/arch/x86/init/prologue.inc -romstage-srcs += $(src)/arch/x86/init/romstage.ld +crt0s = $(src)/arch/x86/prologue.inc +romstage-srcs += $(src)/arch/x86/romstage.ld crt0s += $(src)/cpu/x86/32bit/entry32.inc romstage-srcs += $(src)/cpu/x86/32bit/entry32.ld @@ -160,7 +153,7 @@ crt0s += $(cpu_incs-y) crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc ifeq ($(CONFIG_ROMCC),y) -crt0s += $(src)/arch/x86/init/crt0_romcc_epilogue.inc +crt0s += $(src)/arch/x86/crt0_romcc_epilogue.inc endif ifeq ($(CONFIG_ROMCC),y) @@ -339,3 +332,64 @@ endif endif # CONFIG_ARCH_RAMSTAGE_X86_32 / CONFIG_ARCH_RAMSTAGE_X86_64 +ifeq ($(CONFIG_ARCH_ROMSTAGE_X86_32)$(CONFIG_ARCH_ROMSTAGE_X86_64),y) + +romstage-y += cbmem.c +romstage-y += boot.c + +romstage-y += cbfs_and_run.c +romstage-$(CONFIG_ARCH_RAMSTAGE_X86_32) += cpu_common.c +romstage-y += memset.c +romstage-y += memcpy.c +romstage-y += memmove.c +romstage-y += mmap_boot.c + +romstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c + +endif # CONFIG_ARCH_ROMSTAGE_X86_32 / CONFIG_ARCH_ROMSTAGE_X86_64 + +ifeq ($(CONFIG_ARCH_RAMSTAGE_X86_32)$(CONFIG_ARCH_RAMSTAGE_X86_64),y) + +ramstage-y += boot.c +ramstage-y += gdt.c +ramstage-y += tables.c +ramstage-y += cbmem.c +ramstage-$(CONFIG_GENERATE_MP_TABLE) += mpspec.c +ramstage-$(CONFIG_GENERATE_PIRQ_TABLE) += pirq_routing.c +ramstage-$(CONFIG_HAVE_ACPI_TABLES) += acpi.c +ramstage-$(CONFIG_GENERATE_SMBIOS_TABLES) += smbios.c +ramstage-$(CONFIG_HAVE_ACPI_TABLES) += acpigen.c +ramstage-$(CONFIG_HAVE_ACPI_RESUME) += wakeup.S + +ramstage-y += c_start.S +ramstage-y += cpu.c +ramstage-y += cpu_common.c +ramstage-y += pci_ops_conf1.c +ramstage-$(CONFIG_MMCONF_SUPPORT) += pci_ops_mmconf.c +ramstage-y += exception.c +ramstage-$(CONFIG_IOAPIC) += ioapic.c +ramstage-y += memset.c +ramstage-y += memcpy.c +ramstage-y += memmove.c +ramstage-y += ebda.c +ramstage-y += mmap_boot.c +ramstage-$(CONFIG_COOP_MULTITASKING) += thread.c +ramstage-$(CONFIG_COOP_MULTITASKING) += thread_switch.S +ramstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c + +smm-y += memset.c +smm-y += memcpy.c +smm-y += memmove.c +smm-y += mmap_boot.c + +ifeq ($(CONFIG_ARCH_RAMSTAGE_X86_32),y) +rmodules_x86_32-y += memset.c +rmodules_x86_32-y += memcpy.c +rmodules_x86_32-y += memmove.c +else +rmodules_x86_64-y += memset.c +rmodules_x86_64-y += memcpy.c +rmodules_x86_64-y += memmove.c +endif + +endif # CONFIG_ARCH_RAMSTAGE_X86_32 / CONFIG_ARCH_RAMSTAGE_X86_64 diff --git a/src/arch/x86/boot/acpi.c b/src/arch/x86/acpi.c index 134e43782e..134e43782e 100644 --- a/src/arch/x86/boot/acpi.c +++ b/src/arch/x86/acpi.c diff --git a/src/arch/x86/boot/acpigen.c b/src/arch/x86/acpigen.c index 3aa823c363..3aa823c363 100644 --- a/src/arch/x86/boot/acpigen.c +++ b/src/arch/x86/acpigen.c diff --git a/src/arch/x86/boot/boot.c b/src/arch/x86/boot.c index 7eb87fbef6..7eb87fbef6 100644 --- a/src/arch/x86/boot/boot.c +++ b/src/arch/x86/boot.c diff --git a/src/arch/x86/boot/Makefile.inc b/src/arch/x86/boot/Makefile.inc deleted file mode 100644 index 10a1efd242..0000000000 --- a/src/arch/x86/boot/Makefile.inc +++ /dev/null @@ -1,22 +0,0 @@ - -ifeq ($(CONFIG_ARCH_ROMSTAGE_X86_32)$(CONFIG_ARCH_ROMSTAGE_X86_64),y) - -romstage-y += cbmem.c -romstage-y += boot.c - -endif # CONFIG_ARCH_ROMSTAGE_X86_32 / CONFIG_ARCH_ROMSTAGE_X86_64 - -ifeq ($(CONFIG_ARCH_RAMSTAGE_X86_32)$(CONFIG_ARCH_RAMSTAGE_X86_64),y) - -ramstage-y += boot.c -ramstage-y += gdt.c -ramstage-y += tables.c -ramstage-y += cbmem.c -ramstage-$(CONFIG_GENERATE_MP_TABLE) += mpspec.c -ramstage-$(CONFIG_GENERATE_PIRQ_TABLE) += pirq_routing.c -ramstage-$(CONFIG_HAVE_ACPI_TABLES) += acpi.c -ramstage-$(CONFIG_GENERATE_SMBIOS_TABLES) += smbios.c -ramstage-$(CONFIG_HAVE_ACPI_TABLES) += acpigen.c -ramstage-$(CONFIG_HAVE_ACPI_RESUME) += wakeup.S - -endif # CONFIG_ARCH_RAMSTAGE_X86_32 / CONFIG_ARCH_RAMSTAGE_X86_64 diff --git a/src/arch/x86/init/bootblock_normal.c b/src/arch/x86/bootblock_normal.c index bde2535ba6..bde2535ba6 100644 --- a/src/arch/x86/init/bootblock_normal.c +++ b/src/arch/x86/bootblock_normal.c diff --git a/src/arch/x86/init/bootblock_simple.c b/src/arch/x86/bootblock_simple.c index adeecf7ba6..adeecf7ba6 100644 --- a/src/arch/x86/init/bootblock_simple.c +++ b/src/arch/x86/bootblock_simple.c diff --git a/src/arch/x86/lib/c_start.S b/src/arch/x86/c_start.S index 582966bfdc..582966bfdc 100644 --- a/src/arch/x86/lib/c_start.S +++ b/src/arch/x86/c_start.S diff --git a/src/arch/x86/lib/cbfs_and_run.c b/src/arch/x86/cbfs_and_run.c index b6d342623d..b6d342623d 100644 --- a/src/arch/x86/lib/cbfs_and_run.c +++ b/src/arch/x86/cbfs_and_run.c diff --git a/src/arch/x86/boot/cbmem.c b/src/arch/x86/cbmem.c index e279db960c..e279db960c 100644 --- a/src/arch/x86/boot/cbmem.c +++ b/src/arch/x86/cbmem.c diff --git a/src/arch/x86/lib/cpu.c b/src/arch/x86/cpu.c index 3eb7b9439e..3eb7b9439e 100644 --- a/src/arch/x86/lib/cpu.c +++ b/src/arch/x86/cpu.c diff --git a/src/arch/x86/lib/cpu_common.c b/src/arch/x86/cpu_common.c index af0ab2ae98..af0ab2ae98 100644 --- a/src/arch/x86/lib/cpu_common.c +++ b/src/arch/x86/cpu_common.c diff --git a/src/arch/x86/init/crt0_romcc_epilogue.inc b/src/arch/x86/crt0_romcc_epilogue.inc index ff93adbc70..ff93adbc70 100644 --- a/src/arch/x86/init/crt0_romcc_epilogue.inc +++ b/src/arch/x86/crt0_romcc_epilogue.inc diff --git a/src/arch/x86/lib/ebda.c b/src/arch/x86/ebda.c index 47dfbdb1e9..47dfbdb1e9 100644 --- a/src/arch/x86/lib/ebda.c +++ b/src/arch/x86/ebda.c diff --git a/src/arch/x86/lib/exception.c b/src/arch/x86/exception.c index 65181e224e..65181e224e 100644 --- a/src/arch/x86/lib/exception.c +++ b/src/arch/x86/exception.c diff --git a/src/arch/x86/init/failover.ld b/src/arch/x86/failover.ld index d7aa47e249..d7aa47e249 100644 --- a/src/arch/x86/init/failover.ld +++ b/src/arch/x86/failover.ld diff --git a/src/arch/x86/boot/gdt.c b/src/arch/x86/gdt.c index a21fab24ad..a21fab24ad 100644 --- a/src/arch/x86/boot/gdt.c +++ b/src/arch/x86/gdt.c diff --git a/src/arch/x86/lib/id.inc b/src/arch/x86/id.inc index f8aba0b946..f8aba0b946 100644 --- a/src/arch/x86/lib/id.inc +++ b/src/arch/x86/id.inc diff --git a/src/arch/x86/lib/id.ld b/src/arch/x86/id.ld index cfd091dc17..cfd091dc17 100644 --- a/src/arch/x86/lib/id.ld +++ b/src/arch/x86/id.ld diff --git a/src/arch/x86/init/Makefile.inc b/src/arch/x86/init/Makefile.inc deleted file mode 100644 index 263c58e891..0000000000 --- a/src/arch/x86/init/Makefile.inc +++ /dev/null @@ -1 +0,0 @@ -# If you add something to this file, enable it in src/arch/x86/Makefile.inc first. diff --git a/src/arch/x86/lib/ioapic.c b/src/arch/x86/ioapic.c index 1b131278fd..1b131278fd 100644 --- a/src/arch/x86/lib/ioapic.c +++ b/src/arch/x86/ioapic.c diff --git a/src/arch/x86/lib/Makefile.inc b/src/arch/x86/lib/Makefile.inc deleted file mode 100644 index ccfe30ae67..0000000000 --- a/src/arch/x86/lib/Makefile.inc +++ /dev/null @@ -1,48 +0,0 @@ - -ifeq ($(CONFIG_ARCH_ROMSTAGE_X86_32)$(CONFIG_ARCH_ROMSTAGE_X86_64),y) - -romstage-y += cbfs_and_run.c -romstage-$(CONFIG_ARCH_RAMSTAGE_X86_32) += cpu_common.c -romstage-y += memset.c -romstage-y += memcpy.c -romstage-y += memmove.c -romstage-y += mmap_boot.c - -endif # CONFIG_ARCH_ROMSTAGE_X86_32 / CONFIG_ARCH_ROMSTAGE_X86_64 - -ifeq ($(CONFIG_ARCH_RAMSTAGE_X86_32)$(CONFIG_ARCH_RAMSTAGE_X86_64),y) - -ramstage-y += c_start.S -ramstage-y += cpu.c -ramstage-y += cpu_common.c -ramstage-y += pci_ops_conf1.c -ramstage-$(CONFIG_MMCONF_SUPPORT) += pci_ops_mmconf.c -ramstage-y += exception.c -ramstage-$(CONFIG_IOAPIC) += ioapic.c -ramstage-y += memset.c -ramstage-y += memcpy.c -ramstage-y += memmove.c -ramstage-y += ebda.c -ramstage-y += mmap_boot.c -ramstage-$(CONFIG_COOP_MULTITASKING) += thread.c -ramstage-$(CONFIG_COOP_MULTITASKING) += thread_switch.S -ramstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c - -romstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c - -smm-y += memset.c -smm-y += memcpy.c -smm-y += memmove.c -smm-y += mmap_boot.c - -ifeq ($(CONFIG_ARCH_RAMSTAGE_X86_32),y) -rmodules_x86_32-y += memset.c -rmodules_x86_32-y += memcpy.c -rmodules_x86_32-y += memmove.c -else -rmodules_x86_64-y += memset.c -rmodules_x86_64-y += memcpy.c -rmodules_x86_64-y += memmove.c -endif - -endif # CONFIG_ARCH_RAMSTAGE_X86_32 / CONFIG_ARCH_RAMSTAGE_X86_64 diff --git a/src/arch/x86/lib/memcpy.c b/src/arch/x86/memcpy.c index 4915a9eb51..4915a9eb51 100644 --- a/src/arch/x86/lib/memcpy.c +++ b/src/arch/x86/memcpy.c diff --git a/src/arch/x86/lib/memmove.c b/src/arch/x86/memmove.c index ba121278da..ba121278da 100644 --- a/src/arch/x86/lib/memmove.c +++ b/src/arch/x86/memmove.c diff --git a/src/arch/x86/lib/memset.c b/src/arch/x86/memset.c index d534556fd9..d534556fd9 100644 --- a/src/arch/x86/lib/memset.c +++ b/src/arch/x86/memset.c diff --git a/src/arch/x86/lib/mmap_boot.c b/src/arch/x86/mmap_boot.c index 4dd269b772..4dd269b772 100644 --- a/src/arch/x86/lib/mmap_boot.c +++ b/src/arch/x86/mmap_boot.c diff --git a/src/arch/x86/boot/mpspec.c b/src/arch/x86/mpspec.c index 1a0ac31fd0..1a0ac31fd0 100644 --- a/src/arch/x86/boot/mpspec.c +++ b/src/arch/x86/mpspec.c diff --git a/src/arch/x86/lib/pci_ops_conf1.c b/src/arch/x86/pci_ops_conf1.c index 77df4b314f..77df4b314f 100644 --- a/src/arch/x86/lib/pci_ops_conf1.c +++ b/src/arch/x86/pci_ops_conf1.c diff --git a/src/arch/x86/lib/pci_ops_mmconf.c b/src/arch/x86/pci_ops_mmconf.c index e4fa128551..e4fa128551 100644 --- a/src/arch/x86/lib/pci_ops_mmconf.c +++ b/src/arch/x86/pci_ops_mmconf.c diff --git a/src/arch/x86/boot/pirq_routing.c b/src/arch/x86/pirq_routing.c index 7fe20b25ab..7fe20b25ab 100644 --- a/src/arch/x86/boot/pirq_routing.c +++ b/src/arch/x86/pirq_routing.c diff --git a/src/arch/x86/init/prologue.inc b/src/arch/x86/prologue.inc index e0100b5127..e0100b5127 100644 --- a/src/arch/x86/init/prologue.inc +++ b/src/arch/x86/prologue.inc diff --git a/src/arch/x86/lib/romcc_console.c b/src/arch/x86/romcc_console.c index bfc35bc74c..bfc35bc74c 100644 --- a/src/arch/x86/lib/romcc_console.c +++ b/src/arch/x86/romcc_console.c diff --git a/src/arch/x86/init/romstage.ld b/src/arch/x86/romstage.ld index 951ca656a3..951ca656a3 100644 --- a/src/arch/x86/init/romstage.ld +++ b/src/arch/x86/romstage.ld diff --git a/src/arch/x86/boot/smbios.c b/src/arch/x86/smbios.c index a1f05daeaf..a1f05daeaf 100644 --- a/src/arch/x86/boot/smbios.c +++ b/src/arch/x86/smbios.c diff --git a/src/arch/x86/lib/stages.c b/src/arch/x86/stages.c index c06abe6793..c06abe6793 100644 --- a/src/arch/x86/lib/stages.c +++ b/src/arch/x86/stages.c diff --git a/src/arch/x86/boot/tables.c b/src/arch/x86/tables.c index 3d645633f0..3d645633f0 100644 --- a/src/arch/x86/boot/tables.c +++ b/src/arch/x86/tables.c diff --git a/src/arch/x86/lib/thread.c b/src/arch/x86/thread.c index f81a2d20ca..f81a2d20ca 100644 --- a/src/arch/x86/lib/thread.c +++ b/src/arch/x86/thread.c diff --git a/src/arch/x86/lib/thread_switch.S b/src/arch/x86/thread_switch.S index 52d4d3094b..52d4d3094b 100644 --- a/src/arch/x86/lib/thread_switch.S +++ b/src/arch/x86/thread_switch.S diff --git a/src/arch/x86/lib/timestamp.c b/src/arch/x86/timestamp.c index 9df505a570..9df505a570 100644 --- a/src/arch/x86/lib/timestamp.c +++ b/src/arch/x86/timestamp.c diff --git a/src/arch/x86/boot/wakeup.S b/src/arch/x86/wakeup.S index 38d6ea43ae..38d6ea43ae 100644 --- a/src/arch/x86/boot/wakeup.S +++ b/src/arch/x86/wakeup.S diff --git a/src/arch/x86/lib/walkcbfs.S b/src/arch/x86/walkcbfs.S index 60eb8b53b0..60eb8b53b0 100644 --- a/src/arch/x86/lib/walkcbfs.S +++ b/src/arch/x86/walkcbfs.S diff --git a/src/mainboard/bifferos/bifferboard/romstage.c b/src/mainboard/bifferos/bifferboard/romstage.c index b0f0477986..dc616edab5 100644 --- a/src/mainboard/bifferos/bifferboard/romstage.c +++ b/src/mainboard/bifferos/bifferboard/romstage.c @@ -23,7 +23,7 @@ #include <arch/io.h> #include <device/pnp_def.h> #include <pc80/mc146818rtc.h> -#include "arch/x86/lib/romcc_console.c" +#include "arch/x86/romcc_console.c" #include <console/console.h> #include <cpu/x86/cache.h> diff --git a/src/mainboard/dmp/vortex86ex/romstage.c b/src/mainboard/dmp/vortex86ex/romstage.c index 3dcea68fb5..36925db255 100644 --- a/src/mainboard/dmp/vortex86ex/romstage.c +++ b/src/mainboard/dmp/vortex86ex/romstage.c @@ -21,7 +21,7 @@ #include <stdint.h> #include <arch/io.h> #include <stdlib.h> -#include "arch/x86/lib/romcc_console.c" +#include "arch/x86/romcc_console.c" #include <console/console.h> #include <cpu/x86/cache.h> #include <halt.h> diff --git a/src/northbridge/intel/fsp_rangeley/Makefile.inc b/src/northbridge/intel/fsp_rangeley/Makefile.inc index eaa1a77e88..3b88913452 100644 --- a/src/northbridge/intel/fsp_rangeley/Makefile.inc +++ b/src/northbridge/intel/fsp_rangeley/Makefile.inc @@ -28,7 +28,7 @@ ramstage-y += acpi.c ramstage-y += port_access.c romstage-y += raminit.c -romstage-y += ../../../arch/x86/lib/walkcbfs.S +romstage-y += ../../../arch/x86/walkcbfs.S romstage-y += port_access.c smm-$(CONFIG_HAVE_SMI_HANDLER) += udelay.c diff --git a/src/northbridge/intel/fsp_sandybridge/Makefile.inc b/src/northbridge/intel/fsp_sandybridge/Makefile.inc index 42c16fa6ca..6c5e09f9b4 100644 --- a/src/northbridge/intel/fsp_sandybridge/Makefile.inc +++ b/src/northbridge/intel/fsp_sandybridge/Makefile.inc @@ -31,7 +31,7 @@ romstage-y += raminit.c romstage-y += ram_calc.c romstage-y += early_init.c romstage-y += report_platform.c -romstage-y += ../../../arch/x86/lib/walkcbfs.S +romstage-y += ../../../arch/x86/walkcbfs.S smm-$(CONFIG_HAVE_SMI_HANDLER) += udelay.c smm-$(CONFIG_HAVE_SMI_HANDLER) += finalize.c diff --git a/src/northbridge/intel/haswell/Makefile.inc b/src/northbridge/intel/haswell/Makefile.inc index 330dc00b91..ad4b2ba2f3 100644 --- a/src/northbridge/intel/haswell/Makefile.inc +++ b/src/northbridge/intel/haswell/Makefile.inc @@ -32,7 +32,7 @@ romstage-y += raminit.c romstage-y += mrccache.c romstage-y += early_init.c romstage-y += report_platform.c -romstage-y += ../../../arch/x86/lib/walkcbfs.S +romstage-y += ../../../arch/x86/walkcbfs.S smm-$(CONFIG_HAVE_SMI_HANDLER) += finalize.c diff --git a/src/northbridge/intel/nehalem/Makefile.inc b/src/northbridge/intel/nehalem/Makefile.inc index cb02fd8a68..e5b4385ea9 100644 --- a/src/northbridge/intel/nehalem/Makefile.inc +++ b/src/northbridge/intel/nehalem/Makefile.inc @@ -31,7 +31,7 @@ romstage-y += ram_calc.c romstage-y += raminit.c romstage-y += early_init.c romstage-y += ../sandybridge/mrccache.c -romstage-y += ../../../arch/x86/lib/walkcbfs.S +romstage-y += ../../../arch/x86/walkcbfs.S smm-$(CONFIG_HAVE_SMI_HANDLER) += finalize.c diff --git a/src/northbridge/intel/sandybridge/Makefile.inc b/src/northbridge/intel/sandybridge/Makefile.inc index cf79459df2..407b61d8a7 100644 --- a/src/northbridge/intel/sandybridge/Makefile.inc +++ b/src/northbridge/intel/sandybridge/Makefile.inc @@ -40,7 +40,7 @@ romstage-$(CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE_NATIVE) += ../../../device/dram/ romstage-y += mrccache.c romstage-y += early_init.c romstage-y += report_platform.c -romstage-y += ../../../arch/x86/lib/walkcbfs.S +romstage-y += ../../../arch/x86/walkcbfs.S smm-$(CONFIG_HAVE_SMI_HANDLER) += udelay.c smm-$(CONFIG_HAVE_SMI_HANDLER) += finalize.c |