HOSTCFLAGS := -I$(srck) -I$(objk)
HOSTCXXFLAGS := -I$(srck) -I$(objk)
-CC = gcc
-CROSS_CFLAGS = -m32
-INCLUDES = -I../libpayload/include -Ibuild \
- -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)
+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 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
include $(src)/.config
-all: prepare $(TARGET)
+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
$(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