Rename VB_SOURCE to VBOOT_SOURCE for increased clarity
This renames the VB_SOURCE variable to VBOOT_SOURCE in the build system, providing increased clarity about what it represents. Since the submodule itself is called "vboot", it makes sense to use that name in full instead of a very shortened (and confusing) version of it. Change-Id: Ib343b6642363665ec1205134832498a59b7c4a26 Signed-off-by: Paul Kocialkowski <contact@paulk.fr> Reviewed-on: https://review.coreboot.org/15824 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
parent
94938fb2a8
commit
46114517d7
|
@ -338,8 +338,8 @@ endif
|
||||||
|
|
||||||
CPPFLAGS_common := -Isrc -Isrc/include -Isrc/commonlib/include -I$(obj)
|
CPPFLAGS_common := -Isrc -Isrc/include -Isrc/commonlib/include -I$(obj)
|
||||||
CPPFLAGS_common += -Isrc/device/oprom/include
|
CPPFLAGS_common += -Isrc/device/oprom/include
|
||||||
VB_SOURCE ?= 3rdparty/vboot
|
VBOOT_SOURCE ?= 3rdparty/vboot
|
||||||
CPPFLAGS_common += -I$(VB_SOURCE)/firmware/include
|
CPPFLAGS_common += -I$(VBOOT_SOURCE)/firmware/include
|
||||||
CPPFLAGS_common += -include $(src)/include/kconfig.h
|
CPPFLAGS_common += -include $(src)/include/kconfig.h
|
||||||
CPPFLAGS_common += -I3rdparty
|
CPPFLAGS_common += -I3rdparty
|
||||||
|
|
||||||
|
|
|
@ -62,7 +62,7 @@ AGESA_INC += -I$(src)/southbridge/amd/pi/hudson
|
||||||
AGESA_INC += -I$(src)/arch/x86/include
|
AGESA_INC += -I$(src)/arch/x86/include
|
||||||
AGESA_INC += -I$(src)/include
|
AGESA_INC += -I$(src)/include
|
||||||
AGESA_INC += -I$(src)/commonlib/include
|
AGESA_INC += -I$(src)/commonlib/include
|
||||||
AGESA_INC += -I$(VB_SOURCE)/firmware/include
|
AGESA_INC += -I$(VBOOT_SOURCE)/firmware/include
|
||||||
|
|
||||||
AGESA_CFLAGS += -march=amdfam10 -mno-3dnow -fno-zero-initialized-in-bss -fno-strict-aliasing
|
AGESA_CFLAGS += -march=amdfam10 -mno-3dnow -fno-zero-initialized-in-bss -fno-strict-aliasing
|
||||||
CFLAGS_x86_32 += $(AGESA_CFLAGS)
|
CFLAGS_x86_32 += $(AGESA_CFLAGS)
|
||||||
|
|
|
@ -70,7 +70,7 @@ $(VB2_LIB): $(obj)/config.h
|
||||||
$(Q)FIRMWARE_ARCH=$(VB_FIRMWARE_ARCH) \
|
$(Q)FIRMWARE_ARCH=$(VB_FIRMWARE_ARCH) \
|
||||||
CC="$(CC_verstage)" \
|
CC="$(CC_verstage)" \
|
||||||
CFLAGS="$(VBOOT_CFLAGS)" VBOOT2="y" \
|
CFLAGS="$(VBOOT_CFLAGS)" VBOOT2="y" \
|
||||||
$(MAKE) -C $(VB_SOURCE) \
|
$(MAKE) -C $(VBOOT_SOURCE) \
|
||||||
BUILD=$(abspath $(dir $(VB2_LIB))) \
|
BUILD=$(abspath $(dir $(VB2_LIB))) \
|
||||||
V=$(V) \
|
V=$(V) \
|
||||||
fwlib20
|
fwlib20
|
||||||
|
|
|
@ -2,7 +2,7 @@ top ?= $(abspath ../..)
|
||||||
objutil ?= $(top)/util
|
objutil ?= $(top)/util
|
||||||
|
|
||||||
HOSTCC ?= $(CC)
|
HOSTCC ?= $(CC)
|
||||||
VB_SOURCE ?= $(top)/3rdparty/vboot
|
VBOOT_SOURCE ?= $(top)/3rdparty/vboot
|
||||||
|
|
||||||
.PHONY: all
|
.PHONY: all
|
||||||
all: $(objutil)/futility/futility
|
all: $(objutil)/futility/futility
|
||||||
|
|
|
@ -2,7 +2,7 @@ additional-dirs += $(objutil)/futility
|
||||||
|
|
||||||
$(objutil)/futility/build/futility/futility:
|
$(objutil)/futility/build/futility/futility:
|
||||||
@printf " MAKE $(subst $(objutil)/,,$(@))\n"
|
@printf " MAKE $(subst $(objutil)/,,$(@))\n"
|
||||||
unset CFLAGS LDFLAGS; $(MAKE) -C $(VB_SOURCE) \
|
unset CFLAGS LDFLAGS; $(MAKE) -C $(VBOOT_SOURCE) \
|
||||||
BUILD=$(abspath $@/../..) \
|
BUILD=$(abspath $@/../..) \
|
||||||
CC="$(HOSTCC)" \
|
CC="$(HOSTCC)" \
|
||||||
V=$(V) \
|
V=$(V) \
|
||||||
|
|
Loading…
Reference in New Issue