* refactor x86 smi handler (put all debug stuff in an extra file smiutil.c)

[coreboot.git] / src / cpu / x86 / smm / Config.lb

diff --git a/src/cpu/x86/smm/Config.lb b/src/cpu/x86/smm/Config.lb
index 652cb2de7fda9d52f124720dea75d00e488bdbbe..f725581b14e95cc64adb8a1a77996eda7edfd0d3 100644 (file)
--- a/src/cpu/x86/smm/Config.lb
+++ b/src/cpu/x86/smm/Config.lb
@@ -18,24 +18,25 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses HAVE_SMI_HANDLER
+uses CONFIG_HAVE_SMI_HANDLER
 
-if HAVE_SMI_HANDLER
+if CONFIG_HAVE_SMI_HANDLER
        object smmrelocate.S
 
        smmobject smmhandler.S
        smmobject smihandler.o
+       smmobject smiutil.o
 
        makerule smm.o
-               depends "$(SMM-OBJECTS) $(TOP)/src/console/printk.o $(TOP)/src/console/vtxprintf.o $(LIBGCC_FILE_NAME)" 
+               depends "$(SMM-OBJECTS) src/console/printk.o src/console/vtxprintf.o $(LIBGCC_FILE_NAME)" 
                action  "$(CC) $(DISTRO_LFLAGS) -nostdlib -r -o $@ $^"
        end
 
        makerule smm
                depends "smm.o $(TOP)/src/cpu/x86/smm/smm.ld ldoptions" 
                action  "$(CC) $(DISTRO_LFLAGS) -nostdlib -nostartfiles -static -o smm.elf -T $(TOP)/src/cpu/x86/smm/smm.ld smm.o"
-               action  "$(CROSS_COMPILE)nm -n smm.elf | sort > smm.map"
-               action  "$(OBJCOPY) -O binary smm.elf smm"
+               action  "$(CONFIG_CROSS_COMPILE)nm -n smm.elf | sort > smm.map"
+               action  "$(CONFIG_OBJCOPY) -O binary smm.elf smm"
        end
 
        makerule smm_bin.c