GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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@gmail.com>
Reviewed-on: http://review.coreboot.org/4307
Tested-by: build bot (Jenkins)
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
This commit is contained in:
Kyösti Mälkki 2013-11-28 18:10:03 +02:00 committed by Alexandru Gagniuc
parent e4c657c4af
commit fab0c9f35d
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/mainboard/google/butterfly/mainboard.c
View File

@ -39,7 +39,11 @@
#include <smbios.h> #include <smbios.h>
#include <device/pci.h> #include <device/pci.h>
#include <ec/quanta/ene_kb3940q/ec.h> #include <ec/quanta/ene_kb3940q/ec.h>
#if CONFIG_CHROMEOS
#include <vendorcode/google/chromeos/fmap.h> #include <vendorcode/google/chromeos/fmap.h>
#else
#include <cbfs.h>
#endif
static unsigned int search(char *p, char *a, unsigned int lengthp, static unsigned int search(char *p, char *a, unsigned int lengthp,
unsigned int lengtha) unsigned int lengtha)
@ -294,11 +298,21 @@ static void verb_setup(void)
static void mainboard_init(device_t dev) static void mainboard_init(device_t dev)
{ {
char **vpd_region_ptr = NULL; u32 search_address = 0x0;
u32 search_length = find_fmap_entry("RO_VPD", (void **)vpd_region_ptr); u32 search_length = -1;
u32 search_address = (unsigned long)(*vpd_region_ptr);
u16 io_base = 0; u16 io_base = 0;
struct device *ethernet_dev = NULL; 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 */ /* Initialize the Embedded Controller */
butterfly_ec_init(); butterfly_ec_init();