Use convenience function to checksum

[coreboot.git] / payloads / coreinfo / Makefile

diff --git a/payloads/coreinfo/Makefile b/payloads/coreinfo/Makefile
index e8e914c0903362ae1d3eb4bb49b87318d19f844f..6b0e7c4435c72e83c1bee02a44e8f2c5280d49ec 100644 (file)
--- a/payloads/coreinfo/Makefile
+++ b/payloads/coreinfo/Makefile
@@ -44,14 +44,16 @@ HOSTCXX = g++
 HOSTCFLAGS := -I$(srck) -I$(objk)
 HOSTCXXFLAGS := -I$(srck) -I$(objk)
 
-LIBPAYLOAD_DIR := ../libpayload
-CC = $(LIBPAYLOAD_DIR)/bin/lpgcc
+LIBPAYLOAD_DIR := ../libpayload/install/libpayload
+XCC := CC=$(CC) $(LIBPAYLOAD_DIR)/bin/lpgcc
 AS = $(LIBPAYLOAD_DIR)/bin/lpas
+STRIP ?= strip
 
 INCLUDES = -Ibuild
 CFLAGS := -Wall -Werror -Os $(INCLUDES)
 OBJECTS = cpuinfo_module.o cpuid.S.o pci_module.o coreboot_module.o \
-         nvram_module.o bootlog_module.o lar_module.o coreinfo.o
+         nvram_module.o bootlog_module.o ramdump_module.o lar_module.o \
+         multiboot_module.o cbfs_module.o coreinfo.o
 OBJS    = $(patsubst %,$(obj)/%,$(OBJECTS))
 TARGET  = $(obj)/coreinfo.elf
 
@@ -63,13 +65,13 @@ else
 
 include $(src)/.config
 
-all: prepare $(TARGET)
+all: $(TARGET)
 
-$(TARGET): $(OBJS)
+$(TARGET): $(src)/.config $(OBJS) prepare
        $(Q)printf "  LD      $(subst $(shell pwd)/,,$(@))\n"
-       $(Q)$(CC) -o $@ $(OBJS)
+       $(Q)$(XCC) -o $@ $(OBJS)
        $(Q)printf "  STRIP   $(subst $(shell pwd)/,,$(@))\n"
-       $(Q)strip -s $@
+       $(Q)$(STRIP) -s $@
 
 $(obj)/%.S.o: $(src)/%.S
        $(Q)printf "  AS      $(subst $(shell pwd)/,,$(@))\n"
@@ -77,7 +79,7 @@ $(obj)/%.S.o: $(src)/%.S
 
 $(obj)/%.o: $(src)/%.c
        $(Q)printf "  CC      $(subst $(shell pwd)/,,$(@))\n"
-       $(Q)$(CC) $(CFLAGS) -c -o $@ $<
+       $(Q)$(XCC) $(CFLAGS) -c -o $@ $<
 
 endif
 
@@ -85,7 +87,7 @@ prepare:
        $(Q)mkdir -p $(obj)/util/kconfig/lxdialog
 
 clean:
-       $(Q)rm -rf build/util build/*.conf build/*.cmd build/*.elf build/*.o
+       $(Q)rm -rf build/*.elf build/*.o
 
 distclean: clean
        $(Q)rm -rf build