GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

coreinfo/Makefile: change $(obj) to $(coreinfo_obj) 

- Rename obj to coreinfo_obj so it doesn't conflict with the obj
variable in libpayload.

Change-Id: I2ffb06a87e30a5eeff5b0dfc0ba62b5e9ab46e26
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/13938
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
This commit is contained in:
Martin Roth 2016-03-07 16:26:51 -07:00
parent 143a78c9f8
commit 9c3ff1ba52
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
payloads/coreinfo/Makefile
View File

@ -17,15 +17,15 @@
src := $(shell pwd) src := $(shell pwd)
srctree := $(src) srctree := $(src)
srck := $(src)/../../util/kconfig srck := $(src)/../../util/kconfig
obj := $(src)/build coreinfo_obj := $(src)/build
objk := $(src)/build/util/kconfig objk := $(src)/build/util/kconfig
export KERNELVERSION := 0.1.0 export KERNELVERSION := 0.1.0
export KCONFIG_AUTOHEADER := $(obj)/config.h export KCONFIG_AUTOHEADER := $(coreinfo_obj)/config.h
export KCONFIG_AUTOCONFIG := $(obj)/auto.conf export KCONFIG_AUTOCONFIG := $(coreinfo_obj)/auto.conf
export KCONFIG_DEPENDENCIES := $(obj)/auto.conf.cmd export KCONFIG_DEPENDENCIES := $(coreinfo_obj)/auto.conf.cmd
export KCONFIG_SPLITCONFIG := $(obj)/config export KCONFIG_SPLITCONFIG := $(coreinfo_obj)/config
export KCONFIG_TRISTATE := $(obj)/tristate.conf export KCONFIG_TRISTATE := $(coreinfo_obj)/tristate.conf
export KCONFIG_NEGATIVES := 1 export KCONFIG_NEGATIVES := 1
export Kconfig := Kconfig export Kconfig := Kconfig
@ -53,12 +53,12 @@ HAVE_LIBPAYLOAD := $(wildcard $(LIBPAYLOAD_DIR)/libpayload/lib/libpayload.a)
LIB_CONFIG ?= defconfig LIB_CONFIG ?= defconfig
OBJCOPY ?= objcopy OBJCOPY ?= objcopy
INCLUDES = -I$(obj) -include $(LIBPAYLOAD_DIR)/libpayload/include/kconfig.h INCLUDES = -I$(coreinfo_obj) -include $(LIBPAYLOAD_DIR)/libpayload/include/kconfig.h
OBJECTS = cpuinfo_module.o cpuid.S.o pci_module.o coreboot_module.o \ 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 \ nvram_module.o bootlog_module.o ramdump_module.o lar_module.o \
multiboot_module.o cbfs_module.o coreinfo.o multiboot_module.o cbfs_module.o coreinfo.o
OBJS = $(patsubst %,$(obj)/%,$(OBJECTS)) OBJS = $(patsubst %,$(coreinfo_obj)/%,$(OBJECTS))
TARGET = $(obj)/coreinfo.elf TARGET = $(coreinfo_obj)/coreinfo.elf
all: real-all all: real-all
@ -87,18 +87,18 @@ ifneq ($(strip $(HAVE_DOTCONFIG)),)
include $(src)/.config include $(src)/.config
real-all: $(TARGET) real-all: $(TARGET)
$(TARGET): $(src)/.config $(obj)/config.h $(OBJS) libpayload $(TARGET): $(src)/.config $(coreinfo_obj)/config.h $(OBJS) libpayload
printf " LPCC $(subst $(shell pwd)/,,$(@)) (LINK)\n" printf " LPCC $(subst $(shell pwd)/,,$(@)) (LINK)\n"
$(LPCC) -o $@ $(OBJS) $(LPCC) -o $@ $(OBJS)
$(OBJCOPY) --only-keep-debug $@ $(TARGET).debug $(OBJCOPY) --only-keep-debug $@ $(TARGET).debug
$(OBJCOPY) --strip-debug $@ $(OBJCOPY) --strip-debug $@
$(OBJCOPY) --add-gnu-debuglink=$(TARGET).debug $@ $(OBJCOPY) --add-gnu-debuglink=$(TARGET).debug $@
$(obj)/%.S.o: $(src)/%.S libpayload $(coreinfo_obj)/%.S.o: $(src)/%.S libpayload
printf " LPAS $(subst $(shell pwd)/,,$(@))\n" printf " LPAS $(subst $(shell pwd)/,,$(@))\n"
$(LPAS) -o $@ $< $(LPAS) -o $@ $<
$(obj)/%.o: $(src)/%.c libpayload $(coreinfo_obj)/%.o: $(src)/%.c libpayload
printf " LPCC $(subst $(shell pwd)/,,$(@))\n" printf " LPCC $(subst $(shell pwd)/,,$(@))\n"
$(LPCC) $(CFLAGS) -c -o $@ $< $(LPCC) $(CFLAGS) -c -o $@ $<
@ -121,10 +121,10 @@ libpayload:
$(MAKE) -C $(LIBCONFIG_PATH) DESTDIR=$(shell pwd)/$(LIBPAYLOAD_DIR) install $(MAKE) -C $(LIBCONFIG_PATH) DESTDIR=$(shell pwd)/$(LIBPAYLOAD_DIR) install
endif endif
$(obj)/config.h: $(coreinfo_obj)/config.h:
$(MAKE) oldconfig $(MAKE) oldconfig
$(shell mkdir -p $(obj) $(objk)/lxdialog $(KCONFIG_SPLITCONFIG)) $(shell mkdir -p $(coreinfo_obj) $(objk)/lxdialog $(KCONFIG_SPLITCONFIG))
clean: clean:
rm -rf build/*.elf build/*.o .xcompile rm -rf build/*.elf build/*.o .xcompile