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>
This commit is contained in:
Kyösti Mälkki 2014-04-28 23:25:01 +03:00
parent 604559c193
commit dfdf001392
2 changed files with 3 additions and 8 deletions

View File

@ -17,8 +17,6 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## 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 romstage-$(CONFIG_ARCH_ROMSTAGE_X86_32) += vbnv.c
ramstage-$(CONFIG_ARCH_RAMSTAGE_X86_32) += vbnv.c ramstage-$(CONFIG_ARCH_RAMSTAGE_X86_32) += vbnv.c
romstage-$(CONFIG_ARCH_ROMSTAGE_X86_32) += vboot.c romstage-$(CONFIG_ARCH_ROMSTAGE_X86_32) += vboot.c
@ -35,6 +33,8 @@ CFLAGS_common += -DMOCK_TPM=0
endif endif
ifeq ($(CONFIG_VBOOT_VERIFY_FIRMWARE),y) ifeq ($(CONFIG_VBOOT_VERIFY_FIRMWARE),y)
romstage-y += vboot_handoff.c
ramstage-y += vboot_handoff.c
romstage-y += vboot_loader.c romstage-y += vboot_loader.c
rmodules-y += vboot_wrapper.c rmodules-y += vboot_wrapper.c

View File

@ -19,15 +19,11 @@
#include <stddef.h> #include <stddef.h>
#include "chromeos.h" #include "chromeos.h"
#if CONFIG_VBOOT_VERIFY_FIRMWARE
#include "vboot_handoff.h"
#endif
#include <boot/coreboot_tables.h> #include <boot/coreboot_tables.h>
#include <cbmem.h> #include <cbmem.h>
#include <console/console.h> #include <console/console.h>
#if CONFIG_VBOOT_VERIFY_FIRMWARE
#include <payload_loader.h> #include <payload_loader.h>
#include "vboot_handoff.h"
int vboot_enable_developer(void) int vboot_enable_developer(void)
{ {
@ -117,4 +113,3 @@ int vboot_get_handoff_info(void **addr, uint32_t *size)
*size = sizeof(*vboot_handoff); *size = sizeof(*vboot_handoff);
return 0; return 0;
} }
#endif