r137 - in buildrom-devel: . packages/coreboot-v3

Author: myles
Date: 2008-03-10 20:53:05 +0100 (Mon, 10 Mar 2008)
New Revision: 137

Modified:
   buildrom-devel/Config.in
   buildrom-devel/packages/coreboot-v3/coreboot-v3.mk
Log:
This patch makes use of the CONFIG_COREBOOT_V3_ROM_SIZE variable in buildrom.
The hope is that eventually we could do some math with it if we want.  The
only problem is that when you don't have it set, it gives you an error when
you do make menuconfig.  Here is the error:

#
# using defaults found in .config
#
.config:23:warning: symbol value '' invalid for COREBOOT_V3_ROM_SIZE
.config:83:warning: symbol value '' invalid for LAB_PAUSE

Notice that LAB_PAUSE has the same problem.  Setting the value to be a string
instead of an int removes the warning, but removes the error checking as well.

Myles

Signed-off-by: Myles Watson 
Acked-by: Ward Vandewege

Modified: buildrom-devel/Config.in
===================================================================
--- buildrom-devel/Config.in	2008-03-10 19:27:00 UTC (rev 136)
+++ buildrom-devel/Config.in	2008-03-10 19:53:05 UTC (rev 137)
@@ -76,6 +76,21 @@
    	is experimental, and only supports a few platforms.
 endchoice

+config COREBOOT_V3_OVERRIDE_ROM_SIZE
+	bool "Override default ROM size"
+	depends COREBOOT_V3
+	help
+		Select this option to specify your own ROM size.  Use this
+		option if your chip is a different size than the one that
+		typically comes with the board.
+
+config COREBOOT_V3_ROM_SIZE
+	int "coreboot v3 romsize in KB"
+	default "1024"
+	depends COREBOOT_V3_OVERRIDE_ROM_SIZE
+	help
+		Specify the ROM size here in KB.
+
 config USE_LZMA
    bool "Enable LZMA compression"
    depends !(PAYLOAD_OFW && COREBOOT_V2)

Modified: buildrom-devel/packages/coreboot-v3/coreboot-v3.mk
===================================================================
--- buildrom-devel/packages/coreboot-v3/coreboot-v3.mk	2008-03-10 19:27:00 UTC (rev 136)
+++ buildrom-devel/packages/coreboot-v3/coreboot-v3.mk	2008-03-10 19:53:05 UTC (rev 137)
@@ -7,6 +7,12 @@
 CBV3_DIR=$(BUILD_DIR)/coreboot-v3
 CBV3_SRC_DIR=$(CBV3_DIR)/svn

+ifeq ($(CONFIG_COREBOOT_V3_OVERRIDE_ROM_SIZE),y)
+	CBV3_ROM_SIZE=CONFIG_COREBOOT_ROMSIZE_KB=$(CONFIG_COREBOOT_V3_ROM_SIZE)
+else
+	CBV3_ROM_SIZE=
+endif
+
 CBV3_STAMP_DIR=$(CBV3_DIR)/stamps
 CBV3_LOG_DIR=$(CBV3_DIR)/logs

@@ -58,7 +64,7 @@

$(CBV3_OUTPUT): $(CBV3_STAMP_DIR)/.configured
    @ echo "Building coreboot v3..."
-	@ $(MAKE) -C $(CBV3_SRC_DIR) > $(CBV3_BUILD_LOG) 2>&1
+	@ $(MAKE) -C $(CBV3_SRC_DIR) $(CBV3_ROM_SIZE) > $(CBV3_BUILD_LOG) 2>&1

$(CBV3_SRC_DIR)/build/util/lar/lar: $(CBV3_STAMP_DIR)/.configured
    @ $(MAKE) -C $(CBV3_SRC_DIR)/util lar > $(CBV3_BUILD_LOG) 2>&1