summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUwe Hermann <uwe@hermann-uwe.de>2009-10-05 13:55:28 +0000
committerUwe Hermann <uwe@hermann-uwe.de>2009-10-05 13:55:28 +0000
commitc04be9322cd69b3340d78db84b7663848170fe94 (patch)
tree5819319c2ef42fcd2cddf97081b4c47c72467550
parentba6a93ddcb17b1e05480b57c1a47f8dc7084c355 (diff)
downloadcoreboot-c04be9322cd69b3340d78db84b7663848170fe94.tar.xz
Backport facility to specify a local coreboot version suffix from v3.
Tested on QEMU. Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de> Acked-by: Uwe Hermann <uwe@hermann-uwe.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4726 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
-rw-r--r--Makefile6
-rw-r--r--src/Kconfig9
2 files changed, 14 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index fada32b0f5..b3e3e42cb9 100644
--- a/Makefile
+++ b/Makefile
@@ -93,6 +93,10 @@ BUILD-y := src/lib src/boot src/console src/devices src/southbridge src/northbri
BUILD-y += util/cbfstool
BUILD-$(CONFIG_ARCH_X86) += src/pc80
+ifneq ($(CONFIG_LOCALVERSION),"")
+COREBOOT_EXTRA_VERSION := -$(shell echo $(CONFIG_LOCALVERSION))
+endif
+
# The primary target needs to be here before we include the
# other files
@@ -241,7 +245,7 @@ STACKPROTECT += $(call cc-option, -fno-stack-protector,)
CFLAGS = $(STACKPROTECT) $(INCLUDES) -Os -nostdinc
CFLAGS += -nostdlib -Wall -Wundef -Wstrict-prototypes -Wmissing-prototypes
-CFLAGS +=-Wwrite-strings -Wredundant-decls -Wno-trigraphs
+CFLAGS += -Wwrite-strings -Wredundant-decls -Wno-trigraphs
CFLAGS += -Wstrict-aliasing -Wshadow
CFLAGS += -fno-common -ffreestanding -fno-builtin -fomit-frame-pointer
diff --git a/src/Kconfig b/src/Kconfig
index 5702d7abf1..b2508bbc8a 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -27,6 +27,15 @@
mainmenu "Coreboot Configuration"
+menu "General setup"
+
+config LOCALVERSION
+ string "Local version - append to coreboot release"
+ help
+ Append an extra string to the end of the coreboot version.
+
+endmenu
+
source src/mainboard/Kconfig
source src/arch/i386/Kconfig
source src/arch/ppc/Kconfig