Index: buildrom-devel/config/platforms/Config.in
===================================================================
--- buildrom-devel/config/platforms/Config.in	(revision 106)
+++ buildrom-devel/config/platforms/Config.in	(working copy)
@@ -103,7 +103,6 @@
 config PLATFORM_SERENGETI_CHEETAH
        bool "AMD Serengeti-Cheetah"
        depends VENDOR_AMD
-       depends COREBOOT_V2
        select PLATFORM
        select PLATFORM_SUPPORT_64BIT
 
@@ -117,7 +116,6 @@
 config PLATFORM_CHEETAH_FAM10
 	bool "AMD Serengeti-Cheetah with fam10 processor"
 	depends VENDOR_AMD
-	depends COREBOOT_V2
 	select PLATFORM
 	select PLATFORM_SUPPORT_64BIT
 endchoice
Index: buildrom-devel/config/platforms/serengeti_cheetah.conf
===================================================================
--- buildrom-devel/config/platforms/serengeti_cheetah.conf	(revision 106)
+++ buildrom-devel/config/platforms/serengeti_cheetah.conf	(working copy)
@@ -46,14 +46,18 @@
 CBV2_CONFIG=Config.lb
 CBV2_PAYLOAD_FILE_EXT=elf
 
+CBV3_TAG=HEAD
+
 ifeq ($(CONFIG_PLATFORM_CHEETAH_FAM10),y)
 COREBOOT_BOARD=serengeti_cheetah_fam10
 CBV2_TDIR=serengeti_cheetah_fam10
 CBV2_TAG=3092
+CBV3_CONFIG=serengeti_cheetah_fam10-defconfig
 else
 COREBOOT_BOARD=serengeti_cheetah
 CBV2_TDIR=serengeti_cheetah
 CBV2_TAG=3092
+CBV3_CONFIG=serengeti_cheetah-defconfig
 endif
 
 # FILO configuration