Stefan Reinauer (stefan.reinauer@coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10717
-gerrit
commit 6e1b129241c0ed1b7bf6d4671b9f7a62eb191fa9 Author: Stefan Reinauer stefan.reinauer@coreboot.org Date: Mon Jun 29 16:44:12 2015 -0700
coreinfo: fix compilation
- extra rule for config.h creation - include kconfig.h from libpayload - libpayload symbols are conflicting with gcc builtins (e.g. log2) - ALIGN() is already defined in libpayload these days - move libpayload build directory under build/
Change-Id: I2aefdde26853253d58f6cf6e186e784871c1cb5b Signed-off-by: Stefan Reinauer stefan.reinauer@coreboot.org --- payloads/coreinfo/Makefile | 11 +++++++---- payloads/coreinfo/cbfs_module.c | 2 -- 2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/payloads/coreinfo/Makefile b/payloads/coreinfo/Makefile index 68aeffc..3cc0fc9 100644 --- a/payloads/coreinfo/Makefile +++ b/payloads/coreinfo/Makefile @@ -52,15 +52,15 @@ HOSTCFLAGS := -I$(srck) -I$(objk) HOSTCXXFLAGS := -I$(srck) -I$(objk)
LIBCONFIG_PATH := ../libpayload -LIBPAYLOAD_DIR := ./libpayloadbin +LIBPAYLOAD_DIR := build/libpayload LPCC := $(LIBPAYLOAD_DIR)/libpayload/bin/lpgcc LPAS := $(LIBPAYLOAD_DIR)/libpayload/bin/lpas HAVE_LIBPAYLOAD := $(wildcard $(LIBPAYLOAD_DIR)/libpayload/lib/libpayload.a) LIB_CONFIG ?= defconfig OBJCOPY ?= objcopy
-INCLUDES = -I$(obj) -CFLAGS := -Wall -Werror -Os $(INCLUDES) +INCLUDES = -I$(obj) -include $(LIBPAYLOAD_DIR)/libpayload/include/kconfig.h +CFLAGS := -Wall -Werror -Os -fno-builtin $(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 @@ -71,7 +71,7 @@ ifneq ($(strip $(HAVE_DOTCONFIG)),) include $(src)/.config all: $(TARGET)
-$(TARGET): $(src)/.config $(OBJS) libpayload +$(TARGET): $(src)/.config $(obj)/config.h $(OBJS) libpayload $(Q)printf " LPCC $(subst $(shell pwd)/,,$(@))\n" $(Q)$(LPCC) -o $@ $(OBJS) $(Q)$(OBJCOPY) --only-keep-debug $@ $(TARGET).debug @@ -101,6 +101,9 @@ libpayload: $(Q)make -C $(LIBCONFIG_PATH) DESTDIR=$(shell pwd)/$(LIBPAYLOAD_DIR) install endif
+$(obj)/config.h: + $(MAKE) oldconfig + $(shell mkdir -p $(obj) $(objk)/lxdialog $(KCONFIG_SPLITCONFIG))
clean: diff --git a/payloads/coreinfo/cbfs_module.c b/payloads/coreinfo/cbfs_module.c index 2e6db28..8cb76a4 100644 --- a/payloads/coreinfo/cbfs_module.c +++ b/payloads/coreinfo/cbfs_module.c @@ -22,8 +22,6 @@
#if IS_ENABLED(CONFIG_MODULE_CBFS)
-#define ALIGN(_v, _a) (((_v) + ((_a) - 1)) & ~((_a) - 1)) - #define HEADER_MAGIC 0x4F524243 #define HEADER_ADDR 0xfffffffc #define LARCHIVE_MAGIC 0x455649484352414cLL /* "LARCHIVE" */