summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2014-04-28 23:25:01 +0300
committerKyösti Mälkki <kyosti.malkki@gmail.com>2014-05-25 08:10:49 +0200
commitdfdf001392c172738593149be21ad614839c30a3 (patch)
tree4701dc66c1e4f6b3052770ff8e8d68fe24ace541 /src
parent604559c193af7decd7a4593ec1b4aa71d86b9531 (diff)
downloadcoreboot-dfdf001392c172738593149be21ad614839c30a3.tar.xz
ChromeOS: Rename chromeos.c in vendorcode
Rename the file to vboot_handoff.c and compile it conditionally with VBOOT_VERIFY_FIRMWARE. Change-Id: I8b6fd91063b54cb8f5927c6483a398b75e1d262a Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: http://review.coreboot.org/5645 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@google.com>
Diffstat (limited to 'src')
-rw-r--r--src/vendorcode/google/chromeos/Makefile.inc4
-rw-r--r--src/vendorcode/google/chromeos/vboot_handoff.c (renamed from src/vendorcode/google/chromeos/chromeos.c)7
2 files changed, 3 insertions, 8 deletions
diff --git a/src/vendorcode/google/chromeos/Makefile.inc b/src/vendorcode/google/chromeos/Makefile.inc
index 56c976d6f4..9bd5091e76 100644
--- a/src/vendorcode/google/chromeos/Makefile.inc
+++ b/src/vendorcode/google/chromeos/Makefile.inc
@@ -17,8 +17,6 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-romstage-y += chromeos.c
-ramstage-y += chromeos.c
romstage-$(CONFIG_ARCH_ROMSTAGE_X86_32) += vbnv.c
ramstage-$(CONFIG_ARCH_RAMSTAGE_X86_32) += vbnv.c
romstage-$(CONFIG_ARCH_ROMSTAGE_X86_32) += vboot.c
@@ -35,6 +33,8 @@ CFLAGS_common += -DMOCK_TPM=0
endif
ifeq ($(CONFIG_VBOOT_VERIFY_FIRMWARE),y)
+romstage-y += vboot_handoff.c
+ramstage-y += vboot_handoff.c
romstage-y += vboot_loader.c
rmodules-y += vboot_wrapper.c
diff --git a/src/vendorcode/google/chromeos/chromeos.c b/src/vendorcode/google/chromeos/vboot_handoff.c
index f8dd7dc3d8..937b2e31c0 100644
--- a/src/vendorcode/google/chromeos/chromeos.c
+++ b/src/vendorcode/google/chromeos/vboot_handoff.c
@@ -19,15 +19,11 @@
#include <stddef.h>
#include "chromeos.h"
-#if CONFIG_VBOOT_VERIFY_FIRMWARE
-#include "vboot_handoff.h"
-#endif
#include <boot/coreboot_tables.h>
#include <cbmem.h>
#include <console/console.h>
-
-#if CONFIG_VBOOT_VERIFY_FIRMWARE
#include <payload_loader.h>
+#include "vboot_handoff.h"
int vboot_enable_developer(void)
{
@@ -117,4 +113,3 @@ int vboot_get_handoff_info(void **addr, uint32_t *size)
*size = sizeof(*vboot_handoff);
return 0;
}
-#endif