[v2] r4726 - in trunk/coreboot-v2: . src

Author: uwe
Date: 2009-10-05 15:55:28 +0200 (Mon, 05 Oct 2009)
New Revision: 4726

Modified:
   trunk/coreboot-v2/Makefile
   trunk/coreboot-v2/src/Kconfig
Log:
Backport facility to specify a local coreboot version suffix from v3.

Tested on QEMU.

Signed-off-by: Uwe Hermann 
Acked-by: Uwe Hermann

Modified: trunk/coreboot-v2/Makefile
===================================================================
--- trunk/coreboot-v2/Makefile	2009-10-05 12:58:48 UTC (rev 4725)
+++ trunk/coreboot-v2/Makefile	2009-10-05 13:55:28 UTC (rev 4726)
@@ -93,6 +93,10 @@
 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 @@

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

Modified: trunk/coreboot-v2/src/Kconfig
===================================================================
--- trunk/coreboot-v2/src/Kconfig	2009-10-05 12:58:48 UTC (rev 4725)
+++ trunk/coreboot-v2/src/Kconfig	2009-10-05 13:55:28 UTC (rev 4726)
@@ -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