r238 - in buildrom-devel: config/platforms packages/coreboot-v3

Author: jcrouse
Date: 2008-09-29 19:40:48 +0200 (Mon, 29 Sep 2008)
New Revision: 238

Modified:
   buildrom-devel/config/platforms/Config.in
   buildrom-devel/config/platforms/serengeti_cheetah.conf
   buildrom-devel/packages/coreboot-v3/coreboot-v3.mk
Log:
buildrom: Add Serengeti-Cheetah to the V3 family

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

Modified: buildrom-devel/config/platforms/Config.in
===================================================================
--- buildrom-devel/config/platforms/Config.in	2008-09-26 22:24:05 UTC (rev 237)
+++ buildrom-devel/config/platforms/Config.in	2008-09-29 17:40:48 UTC (rev 238)
@@ -147,7 +147,6 @@
 config PLATFORM_SERENGETI_CHEETAH
        bool "AMD Serengeti-Cheetah"
        depends on VENDOR_AMD
-       depends on COREBOOT_V2
        select PLATFORM
        select PLATFORM_SUPPORT_64BIT

@@ -209,6 +208,7 @@
 config SIMNOW
    bool "Build for the AMD SimNow (TM) emulator"
    depends on PLATFORM_SERENGETI_CHEETAH || PLATFORM_SERENGETI_CHEETAH_64
+	depends on COREBOOT_V2
    default n
    help
      Say 'y' here to patch the build to work on an

Modified: buildrom-devel/config/platforms/serengeti_cheetah.conf
===================================================================
--- buildrom-devel/config/platforms/serengeti_cheetah.conf	2008-09-26 22:24:05 UTC (rev 237)
+++ buildrom-devel/config/platforms/serengeti_cheetah.conf	2008-09-29 17:40:48 UTC (rev 238)
@@ -34,9 +34,8 @@
 # coreboot configuration

COREBOOT_VENDOR=amd
+CBV3_TAG=875

-CBV3_TAG=HEAD
-
 ifeq ($(CONFIG_PLATFORM_CHEETAH_FAM10),y)
 COREBOOT_BOARD=serengeti_cheetah_fam10
 CBV2_TDIR=serengeti_cheetah_fam10
@@ -45,4 +44,7 @@
 COREBOOT_BOARD=serengeti_cheetah
 CBV2_TDIR=serengeti_cheetah
 CBV2_TAG=3343
+
+# cb-v3 has a different board name
+CBV3_BOARD=serengeti
 endif

Modified: buildrom-devel/packages/coreboot-v3/coreboot-v3.mk
===================================================================
--- buildrom-devel/packages/coreboot-v3/coreboot-v3.mk	2008-09-26 22:24:05 UTC (rev 237)
+++ buildrom-devel/packages/coreboot-v3/coreboot-v3.mk	2008-09-29 17:40:48 UTC (rev 238)
@@ -31,8 +31,13 @@
 CBV3_BUILD_LOG=$(CBV3_LOG_DIR)/build.log
 endif

-TARGET_ROM = $(COREBOOT_VENDOR)-$(COREBOOT_BOARD).rom
+# Set the cb-v3 board name to the default if not otherwise
+# specified

+CBV3_BOARD ?= $(COREBOOOT_BOARD)
+
+TARGET_ROM = $(COREBOOT_VENDOR)-$(CBV3_BOARD).rom
+
 CBV3_OUTPUT=$(CBV3_SRC_DIR)/build/coreboot.rom

CBV3_PATCHES ?=
@@ -57,13 +62,13 @@

$(CBV3_STAMP_DIR)/.configured: $(CBV3_STAMP_DIR)/.patched
    @ echo "Configuring coreboot v3..."
-ifeq ($(shell if [ -f $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) ]; then echo 1; fi),1)
-	@ cp -f $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) $(CBV3_SRC_DIR)/.config
-	@ echo "Using custom config $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD)"
+ifeq ($(shell if [ -f $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(CBV3_BOARD) ]; then echo 1; fi),1)
+	@ cp -f $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(CBV3_BOARD) $(CBV3_SRC_DIR)/.config
+	@ echo "Using custom config $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(CBV3_BOARD)"
    @ make -C $(CBV3_SRC_DIR) oldconfig > $(CBV3_CONFIG_LOG) 2>&1
 else
    @ make -C $(CBV3_SRC_DIR) defconfig \
-		MAINBOARDDIR="$(COREBOOT_VENDOR)/$(COREBOOT_BOARD)" \
+		MAINBOARDDIR="$(COREBOOT_VENDOR)/$(CBV3_BOARD)" \
    	> $(CBV3_CONFIG_LOG) 2>&1
 endif
    @ touch $@
@@ -96,20 +101,20 @@
    @ rm -rf $(STAGING_DIR)/bin/lar

coreboot-v3-config: | $(CBV3_STAMP_DIR)/.configured
-ifeq ($(shell if [ -f $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) ]; then echo 1; fi),1)
-	@ cp -f $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) $(CBV3_SRC_DIR)/.config
+ifeq ($(shell if [ -f $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(CBV3_BOARD) ]; then echo 1; fi),1)
+	@ cp -f $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(CBV3_BOARD) $(CBV3_SRC_DIR)/.config
 endif
    @ echo "Configure coreboot-v3..."
    @ $(MAKE) -C $(CBV3_SRC_DIR) menuconfig
    @ echo
-ifeq ($(shell if [ -f $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) ]; then echo 1; fi),1)
+ifeq ($(shell if [ -f $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(CBV3_BOARD) ]; then echo 1; fi),1)
    @ echo "Found an existing custom configuration file:"
-	@ echo "  $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD)"
+	@ echo "  $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(CBV3_BOARD)"
    @ echo "I've copied it back to the source directory for modification."
    @ echo "Remove the above file and re-run this command if you want to create a new custom configuration from scratch for this payload/board."
    @ echo
 endif
-	@ cp -f $(CBV3_SRC_DIR)/.config $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD)
-	@ echo "Your custom coreboot-v3 config file has been saved as $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD)."
+	@ cp -f $(CBV3_SRC_DIR)/.config $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(CBV3_BOARD)
+	@ echo "Your custom coreboot-v3 config file has been saved as $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(CBV3_BOARD)."
    @ echo
    @ touch $(CBV3_STAMP_DIR)/.configured