Fix libpayload alloc() size and gcc pointer optimization problems.

[coreboot.git] / payloads / coreinfo / Makefile

diff --git a/payloads/coreinfo/Makefile b/payloads/coreinfo/Makefile
index 2fc1d8cc66923e69d145a0e1c7a41764c4619c71..6b0e7c4435c72e83c1bee02a44e8f2c5280d49ec 100644 (file)
--- a/payloads/coreinfo/Makefile
+++ b/payloads/coreinfo/Makefile
@@ -44,7 +44,7 @@ HOSTCXX = g++
 HOSTCFLAGS := -I$(srck) -I$(objk)
 HOSTCXXFLAGS := -I$(srck) -I$(objk)
 
-LIBPAYLOAD_DIR := ../libpayload
+LIBPAYLOAD_DIR := ../libpayload/install/libpayload
 XCC := CC=$(CC) $(LIBPAYLOAD_DIR)/bin/lpgcc
 AS = $(LIBPAYLOAD_DIR)/bin/lpas
 STRIP ?= strip
@@ -53,7 +53,7 @@ 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 ramdump_module.o lar_module.o \
-         multiboot_module.o coreinfo.o
+         multiboot_module.o cbfs_module.o coreinfo.o
 OBJS    = $(patsubst %,$(obj)/%,$(OBJECTS))
 TARGET  = $(obj)/coreinfo.elf
 
@@ -65,9 +65,9 @@ else
 
 include $(src)/.config
 
-all: prepare $(TARGET)
+all: $(TARGET)
 
-$(TARGET): $(src)/.config $(OBJS)
+$(TARGET): $(src)/.config $(OBJS) prepare
        $(Q)printf "  LD      $(subst $(shell pwd)/,,$(@))\n"
        $(Q)$(XCC) -o $@ $(OBJS)
        $(Q)printf "  STRIP   $(subst $(shell pwd)/,,$(@))\n"