From 24d4dae00f5bb2c1d921ec28726826ddaa3e1564 Mon Sep 17 00:00:00 2001 From: Daisuke Nojiri Date: Tue, 3 Feb 2015 14:44:55 -0800 Subject: vboot: remove vboot_handoff.h from chromeos.h chromeos.h includes vboot_handoff.h, which includes vboot_api.h. since vboot_api.h is not available to non-chromeos projects, build fails for some boards (e.g. glados). this change removes (unnecessary) inclusion of vboot_handoff.h in chromeos.h and fixes other files which rely on indirect inclusion of vboot_handoff.h by making it direct. BUG=none BRANCH=tot TEST=built for cosmos, falco, lumpy, nyan_blaze, parrot, rambi, rush_ryu, samus, storm, veyron_pinky Change-Id: I465e3657c6a0944bc75a669e5e52e74d46b3ec6c Signed-off-by: Stefan Reinauer Original-Commit-Id: 6ace70d721aceae9257288815ce8fd7c6c74b8f5 Original-Signed-off-by: Daisuke Nojiri Original-Change-Id: I12612773372e358584d12fffaf5f968a46083fab Original-Reviewed-on: https://chromium-review.googlesource.com/245864 Original-Tested-by: Leroy P Leahy Original-Reviewed-by: Leroy P Leahy Original-Reviewed-by: Julius Werner Reviewed-on: http://review.coreboot.org/9566 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/vendorcode/google/chromeos/chromeos.c | 1 + src/vendorcode/google/chromeos/vboot_common.c | 1 + src/vendorcode/google/chromeos/vboot_context.h | 1 + 3 files changed, 3 insertions(+) (limited to 'src/vendorcode/google') diff --git a/src/vendorcode/google/chromeos/chromeos.c b/src/vendorcode/google/chromeos/chromeos.c index 437e128e7b..97c7e4f614 100644 --- a/src/vendorcode/google/chromeos/chromeos.c +++ b/src/vendorcode/google/chromeos/chromeos.c @@ -24,6 +24,7 @@ #include #include #include +#include "vboot_handoff.h" static int vboot_enable_developer(void) { diff --git a/src/vendorcode/google/chromeos/vboot_common.c b/src/vendorcode/google/chromeos/vboot_common.c index b2893d9fa9..ef47fc8a56 100644 --- a/src/vendorcode/google/chromeos/vboot_common.c +++ b/src/vendorcode/google/chromeos/vboot_common.c @@ -25,6 +25,7 @@ #include #include "chromeos.h" #include "vboot_common.h" +#include "vboot_handoff.h" void vboot_locate_region(const char *name, struct vboot_region *region) { diff --git a/src/vendorcode/google/chromeos/vboot_context.h b/src/vendorcode/google/chromeos/vboot_context.h index 2517f63e63..703d69bebc 100644 --- a/src/vendorcode/google/chromeos/vboot_context.h +++ b/src/vendorcode/google/chromeos/vboot_context.h @@ -22,6 +22,7 @@ #include #include #include "chromeos.h" +#include "vboot_handoff.h" struct cbmem_entry; -- cgit v1.2.3