Stub out FILE*, stdout/stdin/stderr and implement fprintf on these

[coreboot.git] / payloads / coreinfo / Makefile

diff --git a/payloads/coreinfo/Makefile b/payloads/coreinfo/Makefile
index c3f102e8365a13e9e6a47a67b8f7d62b3248c30e..6b0e7c4435c72e83c1bee02a44e8f2c5280d49ec 100644 (file)
--- a/payloads/coreinfo/Makefile
+++ b/payloads/coreinfo/Makefile
@@ -44,23 +44,22 @@ HOSTCXX = g++
 HOSTCFLAGS := -I$(srck) -I$(objk)
 HOSTCXXFLAGS := -I$(srck) -I$(objk)
 
-CC = gcc
-CROSS_CFLAGS = -m32
-INCLUDES = -I../libpayload/include \
-          -I$(shell $(CC) $(CROSS_CFLAGS) -print-search-dirs | \
-          head -n 1 | cut -d' ' -f2)include
-LIBPAYLOAD = ../libpayload/libpayload.a
-LIBGCC := $(shell $(CC) $(CROSS_CFLAGS) -print-libgcc-file-name)
-CFLAGS := -Wall -Werror -Os -fno-stack-protector -nostdinc $(INCLUDES)
-MODULES = cpuinfo_module.o cpuid.S.o pci_module.o coreboot_module.o
-OBJECTS = coreinfo.o
-OBJS    = $(patsubst %,$(obj)/%,$(OBJECTS)) $(patsubst %,$(obj)/%,$(MODULES))
+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 ramdump_module.o lar_module.o \
+         multiboot_module.o cbfs_module.o coreinfo.o
+OBJS    = $(patsubst %,$(obj)/%,$(OBJECTS))
 TARGET  = $(obj)/coreinfo.elf
 
 ifeq ($(strip $(HAVE_DOTCONFIG)),)
 
-all:
-       $(Q)printf "Please run make config/menuconfig/xconfig/gconfig first.\n"
+all: config
 
 else
 
@@ -68,22 +67,19 @@ include $(src)/.config
 
 all: $(TARGET)
 
-$(TARGET): $(OBJS)
+$(TARGET): $(src)/.config $(OBJS) prepare
        $(Q)printf "  LD      $(subst $(shell pwd)/,,$(@))\n"
-       $(Q)#ld --verbose -T ../libpayload/libpayload.ldscript -o $@ $(OBJS) \
-               #--whole-archive $(LIBPAYLOAD) --no-whole-archive $(LIBGCC)
-       $(Q)ld -T ../libpayload/libpayload.ldscript -o $@ $(OBJS) \
-               ../libpayload/i386/head.o $(LIBPAYLOAD) $(LIBGCC)
+       $(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"
-       $(Q)$(AS) --32 -o $@ $<
+       $(Q)$(AS) -o $@ $<
 
 $(obj)/%.o: $(src)/%.c
        $(Q)printf "  CC      $(subst $(shell pwd)/,,$(@))\n"
-       $(Q)$(CC) $(CROSS_CFLAGS) $(CFLAGS) -c -o $@ $<
+       $(Q)$(XCC) $(CFLAGS) -c -o $@ $<
 
 endif
 
@@ -91,9 +87,10 @@ prepare:
        $(Q)mkdir -p $(obj)/util/kconfig/lxdialog
 
 clean:
-       $(Q)rm -rf build
+       $(Q)rm -rf build/*.elf build/*.o
 
 distclean: clean
+       $(Q)rm -rf build
        $(Q)rm -f .config .config.old ..config.tmp .kconfig.d .tmpconfig*
 
 include util/kconfig/Makefile