aboutsummaryrefslogtreecommitdiff
path: root/src/mainboard/google/butterfly
diff options
context:
space:
mode:
authorStefan Reinauer <reinauer@chromium.org>2013-03-20 14:08:04 -0700
committerStefan Reinauer <stefan.reinauer@coreboot.org>2013-03-22 00:17:55 +0100
commit3e4e3038584fb2055c482fd346bb821b3d6236fc (patch)
tree6de73a59507af4ce7986f68918d97a080ddb8453 /src/mainboard/google/butterfly
parent93a6665e0cf29971b92550ff020b8c2f67c17202 (diff)
Unify coreboot table generation
coreboot tables are, unlike general system tables, a platform independent concept. Hence, use the same code for coreboot table generation on all platforms. lib/coreboot_tables.c is based on the x86 version of the file, because some important fixes were missed on the ARMv7 version lately. Change-Id: Icc38baf609f10536a320d21ac64408bef44bb77d Signed-off-by: Stefan Reinauer <reinauer@coreboot.org> Reviewed-on: http://review.coreboot.org/2863 Reviewed-by: Ronald G. Minnich <rminnich@gmail.com> Reviewed-by: Aaron Durbin <adurbin@google.com> Tested-by: build bot (Jenkins)
Diffstat (limited to 'src/mainboard/google/butterfly')
-rw-r--r--src/mainboard/google/butterfly/chromeos.c1
-rw-r--r--src/mainboard/google/butterfly/mainboard.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/src/mainboard/google/butterfly/chromeos.c b/src/mainboard/google/butterfly/chromeos.c
index 9821a2fa3a..b5a645fb24 100644
--- a/src/mainboard/google/butterfly/chromeos.c
+++ b/src/mainboard/google/butterfly/chromeos.c
@@ -40,7 +40,6 @@ int get_pch_gpio(unsigned char gpio_num);
#ifndef __PRE_RAM__
#include <boot/coreboot_tables.h>
-#include <arch/coreboot_tables.h>
#define GPIO_COUNT 6
diff --git a/src/mainboard/google/butterfly/mainboard.c b/src/mainboard/google/butterfly/mainboard.c
index beda107047..a1d912643d 100644
--- a/src/mainboard/google/butterfly/mainboard.c
+++ b/src/mainboard/google/butterfly/mainboard.c
@@ -31,7 +31,7 @@
#include <arch/acpi.h>
#include <arch/io.h>
#include <arch/interrupt.h>
-#include <arch/coreboot_tables.h>
+#include <boot/coreboot_tables.h>
#include "hda_verb.h"
#include "onboard.h"
#include "ec.h"