r240 - buildrom-devel/packages/coreboot-v3

Author: jcrouse
Date: 2008-09-29 20:03:50 +0200 (Mon, 29 Sep 2008)
New Revision: 240

Modified:
   buildrom-devel/packages/coreboot-v3/coreboot-v3.mk
Log:
[PATCH] buildrom:  Enable the external build directory for cb-v3 too

Signed-off-by: Jordan Crouse 
Acked-by: Ronald G. Minnich

Modified: buildrom-devel/packages/coreboot-v3/coreboot-v3.mk
===================================================================
--- buildrom-devel/packages/coreboot-v3/coreboot-v3.mk	2008-09-29 17:44:31 UTC (rev 239)
+++ buildrom-devel/packages/coreboot-v3/coreboot-v3.mk	2008-09-29 18:03:50 UTC (rev 240)
@@ -10,7 +10,16 @@
 CBV3_URL=svn://coreboot.org/repository/coreboot-v3
 CBV3_TARBALL=coreboot-v3-svn-$(CBV3_TAG).tar.gz
 CBV3_DIR=$(BUILD_DIR)/coreboot-v3
+CBV3_STAMP_DIR=$(CBV3_DIR)/stamps
+CBV3_LOG_DIR=$(CBV3_DIR)/logs
+
+ifeq ($(CONFIG_CB_USE_BUILD),y)
+CBV3_SRC_DIR=$(subst ",,$(CONFIG_CB_BUILDDIR))
+CBV3_BUILD_TARGET=
+else
 CBV3_SRC_DIR=$(CBV3_DIR)/svn
+CBV3_BUILD_TARGET=$(CBV3_STAMP_DIR)/.configured
+endif

ifeq ($(CONFIG_COREBOOT_V3_OVERRIDE_ROM_SIZE),y)
    CBV3_ROM_SIZE=CONFIG_COREBOOT_ROMSIZE_KB=$(CONFIG_COREBOOT_V3_ROM_SIZE)
@@ -18,9 +27,6 @@
    CBV3_ROM_SIZE=
 endif

-CBV3_STAMP_DIR=$(CBV3_DIR)/stamps
-CBV3_LOG_DIR=$(CBV3_DIR)/logs
-
 ifeq ($(CONFIG_VERBOSE),y)
 CBV3_FETCH_LOG=/dev/stdout
 CBV3_CONFIG_LOG=/dev/stdout
@@ -73,11 +79,13 @@
 endif
    @ touch $@

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

-$(CBV3_SRC_DIR)/build/util/lar/lar: $(CBV3_STAMP_DIR)/.configured
+$(CBV3_SRC_DIR)/build/util/lar/lar: $(CBV3_BUILD_TARGET)
+	@ echo "Building LAR..."
    @ $(MAKE) -C $(CBV3_SRC_DIR)/util lar > $(CBV3_BUILD_LOG) 2>&1

$(STAGING_DIR)/bin/lar: $(CBV3_SRC_DIR)/build/util/lar/lar