x86: flatten hierarchy
It never made sense to have bootblock_* in init, but
pirq_routing.c in boot, and some ld scripts on the main
level while others live in subdirectories.
This patch flattens the directory hierarchy and makes
x86 more similar to the other architectures.
Change-Id: I4056038fe7813e4d3d3042c441e7ab6076a36384
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-on: http://review.coreboot.org/10901
Tested-by: build bot (Jenkins)
Tested-by: Raptor Engineering Automated Test Stand <noreply@raptorengineeringinc.com>
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index 2448590..4b61767 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 @@
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 @@
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 @@
@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 @@
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 += $(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 # 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
similarity index 100%
rename from src/arch/x86/boot/acpi.c
rename to src/arch/x86/acpi.c
diff --git a/src/arch/x86/boot/acpigen.c b/src/arch/x86/acpigen.c
similarity index 100%
rename from src/arch/x86/boot/acpigen.c
rename to src/arch/x86/acpigen.c
diff --git a/src/arch/x86/boot/boot.c b/src/arch/x86/boot.c
similarity index 100%
rename from src/arch/x86/boot/boot.c
rename to 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 10a1efd..0000000
--- 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
similarity index 100%
rename from src/arch/x86/init/bootblock_normal.c
rename to src/arch/x86/bootblock_normal.c
diff --git a/src/arch/x86/init/bootblock_simple.c b/src/arch/x86/bootblock_simple.c
similarity index 100%
rename from src/arch/x86/init/bootblock_simple.c
rename to src/arch/x86/bootblock_simple.c
diff --git a/src/arch/x86/lib/c_start.S b/src/arch/x86/c_start.S
similarity index 100%
rename from src/arch/x86/lib/c_start.S
rename to 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
similarity index 100%
rename from src/arch/x86/lib/cbfs_and_run.c
rename to src/arch/x86/cbfs_and_run.c
diff --git a/src/arch/x86/boot/cbmem.c b/src/arch/x86/cbmem.c
similarity index 100%
rename from src/arch/x86/boot/cbmem.c
rename to src/arch/x86/cbmem.c
diff --git a/src/arch/x86/lib/cpu.c b/src/arch/x86/cpu.c
similarity index 100%
rename from src/arch/x86/lib/cpu.c
rename to src/arch/x86/cpu.c
diff --git a/src/arch/x86/lib/cpu_common.c b/src/arch/x86/cpu_common.c
similarity index 100%
rename from src/arch/x86/lib/cpu_common.c
rename to 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
similarity index 100%
rename from src/arch/x86/init/crt0_romcc_epilogue.inc
rename to src/arch/x86/crt0_romcc_epilogue.inc
diff --git a/src/arch/x86/lib/ebda.c b/src/arch/x86/ebda.c
similarity index 100%
rename from src/arch/x86/lib/ebda.c
rename to src/arch/x86/ebda.c
diff --git a/src/arch/x86/lib/exception.c b/src/arch/x86/exception.c
similarity index 100%
rename from src/arch/x86/lib/exception.c
rename to src/arch/x86/exception.c
diff --git a/src/arch/x86/init/failover.ld b/src/arch/x86/failover.ld
similarity index 100%
rename from src/arch/x86/init/failover.ld
rename to src/arch/x86/failover.ld
diff --git a/src/arch/x86/boot/gdt.c b/src/arch/x86/gdt.c
similarity index 100%
rename from src/arch/x86/boot/gdt.c
rename to src/arch/x86/gdt.c
diff --git a/src/arch/x86/lib/id.inc b/src/arch/x86/id.inc
similarity index 100%
rename from src/arch/x86/lib/id.inc
rename to src/arch/x86/id.inc
diff --git a/src/arch/x86/lib/id.ld b/src/arch/x86/id.ld
similarity index 100%
rename from src/arch/x86/lib/id.ld
rename to 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 263c58e..0000000
--- 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
similarity index 100%
rename from src/arch/x86/lib/ioapic.c
rename to 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 ccfe30a..0000000
--- 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
similarity index 100%
rename from src/arch/x86/lib/memcpy.c
rename to src/arch/x86/memcpy.c
diff --git a/src/arch/x86/lib/memmove.c b/src/arch/x86/memmove.c
similarity index 100%
rename from src/arch/x86/lib/memmove.c
rename to src/arch/x86/memmove.c
diff --git a/src/arch/x86/lib/memset.c b/src/arch/x86/memset.c
similarity index 100%
rename from src/arch/x86/lib/memset.c
rename to src/arch/x86/memset.c
diff --git a/src/arch/x86/lib/mmap_boot.c b/src/arch/x86/mmap_boot.c
similarity index 100%
rename from src/arch/x86/lib/mmap_boot.c
rename to src/arch/x86/mmap_boot.c
diff --git a/src/arch/x86/boot/mpspec.c b/src/arch/x86/mpspec.c
similarity index 100%
rename from src/arch/x86/boot/mpspec.c
rename to src/arch/x86/mpspec.c
diff --git a/src/arch/x86/lib/pci_ops_conf1.c b/src/arch/x86/pci_ops_conf1.c
similarity index 100%
rename from src/arch/x86/lib/pci_ops_conf1.c
rename to 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
similarity index 100%
rename from src/arch/x86/lib/pci_ops_mmconf.c
rename to src/arch/x86/pci_ops_mmconf.c
diff --git a/src/arch/x86/boot/pirq_routing.c b/src/arch/x86/pirq_routing.c
similarity index 100%
rename from src/arch/x86/boot/pirq_routing.c
rename to src/arch/x86/pirq_routing.c
diff --git a/src/arch/x86/init/prologue.inc b/src/arch/x86/prologue.inc
similarity index 100%
rename from src/arch/x86/init/prologue.inc
rename to src/arch/x86/prologue.inc
diff --git a/src/arch/x86/lib/romcc_console.c b/src/arch/x86/romcc_console.c
similarity index 100%
rename from src/arch/x86/lib/romcc_console.c
rename to src/arch/x86/romcc_console.c
diff --git a/src/arch/x86/init/romstage.ld b/src/arch/x86/romstage.ld
similarity index 100%
rename from src/arch/x86/init/romstage.ld
rename to src/arch/x86/romstage.ld
diff --git a/src/arch/x86/boot/smbios.c b/src/arch/x86/smbios.c
similarity index 100%
rename from src/arch/x86/boot/smbios.c
rename to src/arch/x86/smbios.c
diff --git a/src/arch/x86/lib/stages.c b/src/arch/x86/stages.c
similarity index 100%
rename from src/arch/x86/lib/stages.c
rename to src/arch/x86/stages.c
diff --git a/src/arch/x86/boot/tables.c b/src/arch/x86/tables.c
similarity index 100%
rename from src/arch/x86/boot/tables.c
rename to src/arch/x86/tables.c
diff --git a/src/arch/x86/lib/thread.c b/src/arch/x86/thread.c
similarity index 100%
rename from src/arch/x86/lib/thread.c
rename to src/arch/x86/thread.c
diff --git a/src/arch/x86/lib/thread_switch.S b/src/arch/x86/thread_switch.S
similarity index 100%
rename from src/arch/x86/lib/thread_switch.S
rename to src/arch/x86/thread_switch.S
diff --git a/src/arch/x86/lib/timestamp.c b/src/arch/x86/timestamp.c
similarity index 100%
rename from src/arch/x86/lib/timestamp.c
rename to src/arch/x86/timestamp.c
diff --git a/src/arch/x86/boot/wakeup.S b/src/arch/x86/wakeup.S
similarity index 100%
rename from src/arch/x86/boot/wakeup.S
rename to src/arch/x86/wakeup.S
diff --git a/src/arch/x86/lib/walkcbfs.S b/src/arch/x86/walkcbfs.S
similarity index 100%
rename from src/arch/x86/lib/walkcbfs.S
rename to src/arch/x86/walkcbfs.S
diff --git a/src/mainboard/bifferos/bifferboard/romstage.c b/src/mainboard/bifferos/bifferboard/romstage.c
index b0f0477..dc616ed 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 3dcea68..36925db 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 eaa1a77..3b88913 100644
--- a/src/northbridge/intel/fsp_rangeley/Makefile.inc
+++ b/src/northbridge/intel/fsp_rangeley/Makefile.inc
@@ -28,7 +28,7 @@
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 42c16fa..6c5e09f 100644
--- a/src/northbridge/intel/fsp_sandybridge/Makefile.inc
+++ b/src/northbridge/intel/fsp_sandybridge/Makefile.inc
@@ -31,7 +31,7 @@
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 330dc00..ad4b2ba 100644
--- a/src/northbridge/intel/haswell/Makefile.inc
+++ b/src/northbridge/intel/haswell/Makefile.inc
@@ -32,7 +32,7 @@
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 cb02fd8..e5b4385 100644
--- a/src/northbridge/intel/nehalem/Makefile.inc
+++ b/src/northbridge/intel/nehalem/Makefile.inc
@@ -31,7 +31,7 @@
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 cf79459..407b61d 100644
--- a/src/northbridge/intel/sandybridge/Makefile.inc
+++ b/src/northbridge/intel/sandybridge/Makefile.inc
@@ -40,7 +40,7 @@
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
