[coreboot-gerrit] New patch to review for coreboot: 84b07f9 butterfly: Fix build without ChromeOS

[Kyösti Mälkki (kyosti.malkki@gmail.com)]

Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4307

-gerrit

commit 84b07f9eadc8df6e79f2284321ea8578e57b3711
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date:   Thu Nov 28 18:10:03 2013 +0200

    butterfly: Fix build without ChromeOS
    
    Use a file in CBFS for keyboard layout and ethernet MAC instead
    of scanning FMAP.
    
    Change-Id: I7658c7c4e389deb20d7d8f57cce8b568efdc575d
    Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
 src/mainboard/google/butterfly/mainboard.c | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/mainboard/google/butterfly/mainboard.c b/src/mainboard/google/butterfly/mainboard.c
index b11c226..eb7d363 100644
--- a/src/mainboard/google/butterfly/mainboard.c
+++ b/src/mainboard/google/butterfly/mainboard.c
@@ -39,7 +39,11 @@
 #include <smbios.h>
 #include <device/pci.h>
 #include <ec/quanta/ene_kb3940q/ec.h>
+#if CONFIG_CHROMEOS
 #include <vendorcode/google/chromeos/fmap.h>
+#else
+#include <cbfs.h>
+#endif
 
 static unsigned int search(char *p, char *a, unsigned int lengthp,
 			   unsigned int lengtha)
@@ -294,11 +298,21 @@ static void verb_setup(void)
 
 static void mainboard_init(device_t dev)
 {
-	char **vpd_region_ptr = NULL;
-	u32 search_length = find_fmap_entry("RO_VPD", (void **)vpd_region_ptr);
-	u32 search_address = (unsigned long)(*vpd_region_ptr);
+	u32 search_address = 0x0;
+	u32 search_length = -1;
 	u16 io_base = 0;
 	struct device *ethernet_dev = NULL;
+#if CONFIG_CHROMEOS
+	char **vpd_region_ptr = NULL;
+	search_length = find_fmap_entry("RO_VPD", (void **)vpd_region_ptr);
+	search_address = (unsigned long)(*vpd_region_ptr);
+#else
+	struct cbfs_file *vpd_file = cbfs_get_file(CBFS_DEFAULT_MEDIA, "vpd.bin");
+	if (vpd_file) {
+		search_length = ntohl(vpd_file->len);
+		search_address = (unsigned long)CBFS_SUBHEADER(vpd_file);
+	}
+#endif
 
 	/* Initialize the Embedded Controller */
 	butterfly_ec_init();