[coreboot-gerrit] New patch to review for coreboot: coreinfo: Rename libpayload variables
Stefan Reinauer (stefan.reinauer@coreboot.org)
gerrit at coreboot.org
Tue Mar 15 20:57:17 CET 2016
Stefan Reinauer (stefan.reinauer at coreboot.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14099
-gerrit
commit 414aaebb0c26e83c033a0fd8ff68c54a451cbefe
Author: Stefan Reinauer <stefan.reinauer at coreboot.org>
Date: Tue Mar 15 12:56:04 2016 -0700
coreinfo: Rename libpayload variables
LIBCONFIG_PATH -> LIBPAYLOAD_PATH
LIBPAYLOAD_DIR -> LIBPAYLOAD_OBJ
Change-Id: Idd9947bac594f5b109b877aefac70b1a1d2336eb
Signed-off-by: Stefan Reinauer <stefan.reinauer at coreboot.org>
---
payloads/coreinfo/Makefile | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/payloads/coreinfo/Makefile b/payloads/coreinfo/Makefile
index f6d2cee..fc55e57 100644
--- a/payloads/coreinfo/Makefile
+++ b/payloads/coreinfo/Makefile
@@ -47,14 +47,14 @@ HOSTCXX ?= g++
HOSTCFLAGS := -I$(srck) -I$(objk)
HOSTCXXFLAGS := -I$(srck) -I$(objk)
-LIBCONFIG_PATH := ../libpayload
-LIBPAYLOAD_DIR := $(coreinfo_obj)/libpayload
-HAVE_LIBPAYLOAD := $(wildcard $(LIBPAYLOAD_DIR)/lib/libpayload.a)
+LIBPAYLOAD_PATH := ../libpayload
+LIBPAYLOAD_OBJ := $(coreinfo_obj)/libpayload
+HAVE_LIBPAYLOAD := $(wildcard $(LIBPAYLOAD_OBJ)/lib/libpayload.a)
LIBPAYLOAD_CONFIG ?= defconfig
LIBPAYLOAD_KBUILD_DEFCONFIG ?= configs/defconfig-tinycurses
OBJCOPY ?= objcopy
-INCLUDES = -I$(coreinfo_obj) -include $(LIBPAYLOAD_DIR)/include/kconfig.h
+INCLUDES = -I$(coreinfo_obj) -include $(LIBPAYLOAD_OBJ)/include/kconfig.h
OBJECTS = cpuinfo_module.o cpuid.S.o pci_module.o coreboot_module.o \
nvram_module.o bootlog_module.o ramdump_module.o \
multiboot_module.o cbfs_module.o coreinfo.o
@@ -79,8 +79,8 @@ CC := $(CC_$(ARCH-y))
AS := $(AS_$(ARCH-y))
OBJCOPY := $(OBJCOPY_$(ARCH-y))
-LPCC := CC="$(CC)" $(LIBPAYLOAD_DIR)/bin/lpgcc
-LPAS := AS="$(AS)" $(LIBPAYLOAD_DIR)/bin/lpas
+LPCC := CC="$(CC)" $(LIBPAYLOAD_OBJ)/bin/lpgcc
+LPAS := AS="$(AS)" $(LIBPAYLOAD_OBJ)/bin/lpas
CFLAGS += -Wall -Werror -Os -fno-builtin $(CFLAGS_$(ARCH-y)) $(INCLUDES)
@@ -113,13 +113,13 @@ defaultbuild:
ifneq ($(strip $(HAVE_LIBPAYLOAD)),)
libpayload:
- printf "Found Libpayload $(LIBPAYLOAD_DIR).\n"
+ printf "Found Libpayload $(LIBPAYLOAD_OBJ).\n"
else
libpayload:
- printf "Building libpayload @ $(LIBCONFIG_PATH).\n"
- $(MAKE) -C $(LIBCONFIG_PATH) distclean coreinfo_obj=$(coreinfo_obj)/libptmp
- $(MAKE) -C $(LIBCONFIG_PATH) $(LIBPAYLOAD_CONFIG) KBUILD_DEFCONFIG=$(LIBPAYLOAD_KBUILD_DEFCONFIG)
- $(MAKE) -C $(LIBCONFIG_PATH) install DESTDIR=$(coreinfo_obj)
+ printf "Building libpayload @ $(LIBPAYLOAD_PATH).\n"
+ $(MAKE) -C $(LIBPAYLOAD_PATH) distclean coreinfo_obj=$(coreinfo_obj)/libptmp
+ $(MAKE) -C $(LIBPAYLOAD_PATH) $(LIBPAYLOAD_CONFIG) KBUILD_DEFCONFIG=$(LIBPAYLOAD_KBUILD_DEFCONFIG)
+ $(MAKE) -C $(LIBPAYLOAD_PATH) install DESTDIR=$(coreinfo_obj)
endif
$(coreinfo_obj)/config.h:
More information about the coreboot-gerrit
mailing list