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

Makefile: Keep list of exported variables 

This can be useful to unexport them later.

Change-Id: I2ce9eff32d817ec190441550116376843abd1c11
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/21162
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
This commit is contained in:
Nico Huber 2017-08-23 23:48:13 +02:00 committed by Martin Roth
parent 699143aa35
commit 7a1fbdb1e6
2 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Makefile
View File

@ -30,24 +30,31 @@
## SUCH DAMAGE. ## SUCH DAMAGE.
## ##
export top := $(CURDIR) top := $(CURDIR)
export src := src src := src
export srck := $(top)/util/kconfig srck := $(top)/util/kconfig
obj ?= build obj ?= build
override obj := $(subst $(top)/,,$(abspath $(obj))) override obj := $(subst $(top)/,,$(abspath $(obj)))
export obj objutil ?= $(obj)/util
export objutil ?= $(obj)/util objk := $(objutil)/kconfig
export objk := $(objutil)/kconfig
absobj := $(abspath $(obj)) absobj := $(abspath $(obj))
COREBOOT_EXPORTS := COREBOOT_EXPORTS
COREBOOT_EXPORTS += top src srck obj objutil objk
export KCONFIG_AUTOHEADER := $(obj)/config.h DOTCONFIG ?= $(top)/.config
export KCONFIG_AUTOCONFIG := $(obj)/auto.conf KCONFIG_CONFIG = $(DOTCONFIG)
export KCONFIG_DEPENDENCIES := $(obj)/auto.conf.cmd KCONFIG_AUTOHEADER := $(obj)/config.h
export KCONFIG_SPLITCONFIG := $(obj)/config KCONFIG_AUTOCONFIG := $(obj)/auto.conf
export KCONFIG_TRISTATE := $(obj)/tristate.conf KCONFIG_DEPENDENCIES := $(obj)/auto.conf.cmd
export KCONFIG_NEGATIVES := 1 KCONFIG_SPLITCONFIG := $(obj)/config
export KCONFIG_STRICT := 1 KCONFIG_TRISTATE := $(obj)/tristate.conf
KCONFIG_NEGATIVES := 1
KCONFIG_STRICT := 1
COREBOOT_EXPORTS += KCONFIG_CONFIG KCONFIG_AUTOHEADER KCONFIG_AUTOCONFIG
COREBOOT_EXPORTS += KCONFIG_DEPENDENCIES KCONFIG_SPLITCONFIG KCONFIG_TRISTATE
COREBOOT_EXPORTS += KCONFIG_NEGATIVES KCONFIG_STRICT
# directory containing the toplevel Makefile.inc # directory containing the toplevel Makefile.inc
TOPLEVEL := . TOPLEVEL := .
@ -55,9 +62,6 @@ TOPLEVEL := .
CONFIG_SHELL := sh CONFIG_SHELL := sh
KBUILD_DEFCONFIG := configs/defconfig KBUILD_DEFCONFIG := configs/defconfig
UNAME_RELEASE := $(shell uname -r) UNAME_RELEASE := $(shell uname -r)
DOTCONFIG ?= $(top)/.config
KCONFIG_CONFIG = $(DOTCONFIG)
export KCONFIG_CONFIG
HAVE_DOTCONFIG := $(wildcard $(DOTCONFIG)) HAVE_DOTCONFIG := $(wildcard $(DOTCONFIG))
MAKEFLAGS += -rR --no-print-directory MAKEFLAGS += -rR --no-print-directory
@ -82,6 +86,8 @@ PREPROCESS_ONLY := -E -P -x assembler-with-cpp -undef -I .
DOXYGEN := doxygen DOXYGEN := doxygen
DOXYGEN_OUTPUT_DIR := doxygen DOXYGEN_OUTPUT_DIR := doxygen
export $(COREBOOT_EXPORTS)
all: real-all all: real-all
help_coreboot help:: help_coreboot help::

22
Makefile.inc
View File

@ -29,33 +29,35 @@ CONFIG_DEVICETREE:=$(call strip_quotes, $(CONFIG_DEVICETREE))
# misleadingly named, this is the coreboot version # misleadingly named, this is the coreboot version
ifeq ($(KERNELVERSION),) ifeq ($(KERNELVERSION),)
ifeq ($(BUILD_TIMELESS),1) ifeq ($(BUILD_TIMELESS),1)
export KERNELVERSION := TIMELESS KERNELVERSION := TIMELESS
else else
export KERNELVERSION := $(strip $(if $(GIT),\ KERNELVERSION := $(strip $(if $(GIT),\
$(shell git describe --dirty --always || git describe),\ $(shell git describe --dirty --always || git describe),\
$(if $(wildcard $(top)/.coreboot-version),\ $(if $(wildcard $(top)/.coreboot-version),\
$(shell cat $(top)/.coreboot-version),\ $(shell cat $(top)/.coreboot-version),\
coreboot-unknown$(KERNELREVISION)))) coreboot-unknown$(KERNELREVISION))))
endif endif
endif endif
COREBOOT_EXPORTS += KERNELVERSION
####################################################################### #######################################################################
# Basic component discovery # Basic component discovery
MAINBOARDDIR=$(call strip_quotes,$(CONFIG_MAINBOARD_DIR)) MAINBOARDDIR=$(call strip_quotes,$(CONFIG_MAINBOARD_DIR))
VARIANT_DIR:=$(call strip_quotes,$(CONFIG_VARIANT_DIR)) VARIANT_DIR:=$(call strip_quotes,$(CONFIG_VARIANT_DIR))
export MAINBOARDDIR COREBOOT_EXPORTS += MAINBOARDDIR VARIANT_DIR
export VARIANT_DIR
## Final build results, which CBFSTOOL uses to create the final ## Final build results, which CBFSTOOL uses to create the final
## rom image file, are placed under $(objcbfs). ## rom image file, are placed under $(objcbfs).
## These typically have suffixes .debug .elf .bin and .map ## These typically have suffixes .debug .elf .bin and .map
export objcbfs := $(obj)/cbfs/$(CONFIG_CBFS_PREFIX) objcbfs := $(obj)/cbfs/$(CONFIG_CBFS_PREFIX)
COREBOOT_EXPORTS += objcbfs
## Based on the active configuration, Makefile conditionally collects ## Based on the active configuration, Makefile conditionally collects
## the required assembly includes and saves them in a file. ## the required assembly includes and saves them in a file.
## Such files that do not have a clear one-to-one relation to a source ## Such files that do not have a clear one-to-one relation to a source
## file under src/ are placed and built under $(objgenerated) ## file under src/ are placed and built under $(objgenerated)
export objgenerated := $(obj)/generated objgenerated := $(obj)/generated
COREBOOT_EXPORTS += objgenerated
####################################################################### #######################################################################
# root rule to resolve if in build mode (ie. configuration exists) # root rule to resolve if in build mode (ie. configuration exists)
@ -195,7 +197,8 @@ ifeq ($(CONFIG_USE_BLOBS),y)
# unless explicitly requested and enabled through --checkout # unless explicitly requested and enabled through --checkout
forgetthis:=$(if $(GIT),$(shell git submodule update --init --checkout 3rdparty/blobs)) forgetthis:=$(if $(GIT),$(shell git submodule update --init --checkout 3rdparty/blobs))
endif endif
export UPDATED_SUBMODULES:=1 UPDATED_SUBMODULES:=1
COREBOOT_EXPORTS += UPDATED_SUBMODULES
endif endif
postcar-c-deps:=$$(OPTION_TABLE_H) postcar-c-deps:=$$(OPTION_TABLE_H)
@ -347,7 +350,8 @@ CBFS_PRERAM_COMPRESS_FLAG:=LZ4
endif endif
ifneq ($(CONFIG_LOCALVERSION),"") ifneq ($(CONFIG_LOCALVERSION),"")
export COREBOOT_EXTRA_VERSION := -$(call strip_quotes,$(CONFIG_LOCALVERSION)) COREBOOT_EXTRA_VERSION := -$(call strip_quotes,$(CONFIG_LOCALVERSION))
COREBOOT_EXPORTS += COREBOOT_EXTRA_VERSION
endif endif
CPPFLAGS_common := -Isrc -Isrc/include -Isrc/commonlib/include -I$(obj) CPPFLAGS_common := -Isrc -Isrc/include -Isrc/commonlib/include -I$(obj)
@ -437,6 +441,8 @@ additional-dirs := $(objutil)/cbfstool $(objutil)/romcc $(objutil)/ifdtool \
$(objutil)/ifdfake $(objutil)/options $(objutil)/amdfwtool \ $(objutil)/ifdfake $(objutil)/options $(objutil)/amdfwtool \
$(objutil)/cbootimage $(objutil)/bimgtool $(objutil)/cbootimage $(objutil)/bimgtool
export $(COREBOOT_EXPORTS)
####################################################################### #######################################################################
# generate build support files # generate build support files
$(obj)/build.h: .xcompile $(obj)/build.h: .xcompile