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

chromeos: remove VBOOT2_VERIFY_FIRMWARE option 

There's no need to have the VBOOT2_VERIFY_FIRMWARE
distinction because it's the only game in town.

Change-Id: I82aab665934c27829e1a04115bf499ae527a91aa
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/9958
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
Aaron Durbin 2015-04-22 10:41:42 -05:00 committed by Patrick Georgi
parent 6d65f796db
commit 1124cec59a
14 changed files with 25 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ec/google/chromeec/Makefile.inc
View File

@ -13,11 +13,8 @@ romstage-$(CONFIG_EC_GOOGLE_CHROMEEC_I2C) += ec_i2c.c
romstage-$(CONFIG_EC_GOOGLE_CHROMEEC_LPC) += ec_lpc.c romstage-$(CONFIG_EC_GOOGLE_CHROMEEC_LPC) += ec_lpc.c
romstage-$(CONFIG_EC_GOOGLE_CHROMEEC_MEC) += ec_mec.c romstage-$(CONFIG_EC_GOOGLE_CHROMEEC_MEC) += ec_mec.c
romstage-$(CONFIG_EC_GOOGLE_CHROMEEC_SPI) += ec_spi.c romstage-$(CONFIG_EC_GOOGLE_CHROMEEC_SPI) += ec_spi.c
ifeq ($(CONFIG_VBOOT2_VERIFY_FIRMWARE),y)
verstage-y += ec.c crosec_proto.c verstage-y += ec.c crosec_proto.c
verstage-$(CONFIG_EC_GOOGLE_CHROMEEC_I2C) += ec_i2c.c verstage-$(CONFIG_EC_GOOGLE_CHROMEEC_I2C) += ec_i2c.c
verstage-$(CONFIG_EC_GOOGLE_CHROMEEC_LPC) += ec_lpc.c verstage-$(CONFIG_EC_GOOGLE_CHROMEEC_LPC) += ec_lpc.c
verstage-$(CONFIG_EC_GOOGLE_CHROMEEC_MEC) += ec_mec.c verstage-$(CONFIG_EC_GOOGLE_CHROMEEC_MEC) += ec_mec.c
verstage-$(CONFIG_EC_GOOGLE_CHROMEEC_SPI) += ec_spi.c verstage-$(CONFIG_EC_GOOGLE_CHROMEEC_SPI) += ec_spi.c
endif

2
src/lib/coreboot_table.c
View File

@ -195,7 +195,7 @@ static void lb_vbnv(struct lb_header *header)
#endif #endif
} }
#if CONFIG_VBOOT_VERIFY_FIRMWARE || CONFIG_VBOOT2_VERIFY_FIRMWARE #if CONFIG_VBOOT_VERIFY_FIRMWARE
static void lb_vboot_handoff(struct lb_header *header) static void lb_vboot_handoff(struct lb_header *header)
{ {
void *addr; void *addr;

3
src/mainboard/google/nyan_blaze/Kconfig
View File

@ -85,8 +85,7 @@ config EC_GOOGLE_CHROMEEC_SPI_BUS
config VBOOT_RAMSTAGE_INDEX config VBOOT_RAMSTAGE_INDEX
hex hex
default 0x3 if VBOOT2_VERIFY_FIRMWARE default 0x3
default 0x2
config FLASHMAP_OFFSET config FLASHMAP_OFFSET
hex hex

6
src/mainboard/google/nyan_blaze/romstage.c
View File

@ -58,7 +58,7 @@ static void __attribute__((noinline)) romstage(void)
u32 dram_end_mb = sdram_max_addressable_mb(); u32 dram_end_mb = sdram_max_addressable_mb();
u32 dram_size_mb = dram_end_mb - dram_start_mb; u32 dram_size_mb = dram_end_mb - dram_start_mb;
#if !CONFIG_VBOOT2_VERIFY_FIRMWARE #if !CONFIG_VBOOT_VERIFY_FIRMWARE
configure_l2_cache(); configure_l2_cache();
mmu_init(); mmu_init();
/* Device memory below DRAM is uncached. */ /* Device memory below DRAM is uncached. */
@ -95,7 +95,7 @@ static void __attribute__((noinline)) romstage(void)
early_mainboard_init(); early_mainboard_init();
#if CONFIG_VBOOT2_VERIFY_FIRMWARE #if CONFIG_VBOOT_VERIFY_FIRMWARE
entry = vboot2_load_ramstage(); entry = vboot2_load_ramstage();
#else #else
early_mainboard_init(); early_mainboard_init();
@ -108,7 +108,7 @@ static void __attribute__((noinline)) romstage(void)
/* Stub to force arm_init_caches to the top, before any stack/memory accesses */ /* Stub to force arm_init_caches to the top, before any stack/memory accesses */
void main(void) void main(void)
{ {
#if !CONFIG_VBOOT2_VERIFY_FIRMWARE #if !CONFIG_VBOOT_VERIFY_FIRMWARE
asm volatile ("bl arm_init_caches" asm volatile ("bl arm_init_caches"
::: "r0","r1","r2","r3","r4","r5","ip"); ::: "r0","r1","r2","r3","r4","r5","ip");
#endif #endif

2
src/mainboard/google/rush/memlayout.ld
View File

@ -1,4 +1,4 @@
#if IS_ENABLED(CONFIG_VBOOT2_VERIFY_FIRMWARE) #if IS_ENABLED(CONFIG_VBOOT_VERIFY_FIRMWARE)
#include <soc/memlayout_vboot2.ld> #include <soc/memlayout_vboot2.ld>
#else #else
#include <soc/memlayout.ld> #include <soc/memlayout.ld>

2
src/mainboard/google/rush_ryu/memlayout.ld
View File

@ -1,4 +1,4 @@
#if IS_ENABLED(CONFIG_VBOOT2_VERIFY_FIRMWARE) #if IS_ENABLED(CONFIG_VBOOT_VERIFY_FIRMWARE)
#include <soc/memlayout_vboot2.ld> #include <soc/memlayout_vboot2.ld>
#else #else
#include <soc/memlayout.ld> #include <soc/memlayout.ld>

2
src/soc/marvell/bg4cd/Kconfig
View File

@ -24,7 +24,7 @@ config SOC_MARVELL_BG4CD
select ARCH_RAMSTAGE_ARMV7 select ARCH_RAMSTAGE_ARMV7
select ARCH_ROMSTAGE_ARMV7 select ARCH_ROMSTAGE_ARMV7
select ARCH_VERSTAGE_ARMV7_M select ARCH_VERSTAGE_ARMV7_M
select ARM_BOOTBLOCK_CUSTOM if VBOOT2_VERIFY_FIRMWARE select ARM_BOOTBLOCK_CUSTOM if VBOOT_VERIFY_FIRMWARE
select BOOTBLOCK_CONSOLE select BOOTBLOCK_CONSOLE
select CPU_HAS_BOOTBLOCK_INIT select CPU_HAS_BOOTBLOCK_INIT
select DYNAMIC_CBMEM select DYNAMIC_CBMEM

4
src/soc/marvell/bg4cd/Makefile.inc
View File

@ -17,8 +17,8 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
## ##
bootblock-$(CONFIG_VBOOT2_VERIFY_FIRMWARE) += bootblock_asm.S bootblock-$(CONFIG_VBOOT_VERIFY_FIRMWARE) += bootblock_asm.S
bootblock-$(CONFIG_VBOOT2_VERIFY_FIRMWARE) += bootblock.c bootblock-$(CONFIG_VBOOT_VERIFY_FIRMWARE) += bootblock.c
bootblock-y += cbmem.c bootblock-y += cbmem.c
bootblock-y += i2c.c bootblock-y += i2c.c

12
src/vendorcode/google/chromeos/Kconfig
View File

@ -104,7 +104,7 @@ config FLASHMAP_OFFSET
config EC_SOFTWARE_SYNC config EC_SOFTWARE_SYNC
bool "Enable EC software sync" bool "Enable EC software sync"
default n default n
depends on VBOOT_VERIFY_FIRMWARE || VBOOT2_VERIFY_FIRMWARE depends on VBOOT_VERIFY_FIRMWARE
help help
EC software sync is a mechanism where the AP helps the EC verify its EC software sync is a mechanism where the AP helps the EC verify its
firmware similar to how vboot verifies the main system firmware. This firmware similar to how vboot verifies the main system firmware. This
@ -128,14 +128,14 @@ config VBOOT_OPROM_MATTERS
config VIRTUAL_DEV_SWITCH config VIRTUAL_DEV_SWITCH
bool "Virtual developer switch support" bool "Virtual developer switch support"
default n default n
depends on VBOOT_VERIFY_FIRMWARE || VBOOT2_VERIFY_FIRMWARE depends on VBOOT_VERIFY_FIRMWARE
help help
Whether this platform has a virtual developer switch. Whether this platform has a virtual developer switch.
config VBOOT_VERIFY_FIRMWARE config VBOOT_VERIFY_FIRMWARE
bool "Verify firmware with vboot." bool "Verify firmware with vboot."
default n default n
depends on CHROMEOS depends on CHROMEOS && HAVE_HARD_RESET
help help
Enabling VBOOT_VERIFY_FIRMWARE will use vboot to verify the components Enabling VBOOT_VERIFY_FIRMWARE will use vboot to verify the components
of the firmware (stages, payload, etc). of the firmware (stages, payload, etc).
@ -148,7 +148,7 @@ config VBOOT_VERIFY_FIRMWARE
config VBOOT_BOOT_LOADER_INDEX config VBOOT_BOOT_LOADER_INDEX
hex "Bootloader component index" hex "Bootloader component index"
default 0 default 0
depends on VBOOT_VERIFY_FIRMWARE || VBOOT2_VERIFY_FIRMWARE depends on VBOOT_VERIFY_FIRMWARE
help help
This is the index of the bootloader component in the verified This is the index of the bootloader component in the verified
firmware block. firmware block.
@ -164,7 +164,7 @@ config VBOOT_REFCODE_INDEX
config VBOOT_RAMSTAGE_INDEX config VBOOT_RAMSTAGE_INDEX
hex "Ramstage component index" hex "Ramstage component index"
default 1 default 1
depends on VBOOT_VERIFY_FIRMWARE || VBOOT2_VERIFY_FIRMWARE depends on VBOOT_VERIFY_FIRMWARE
help help
This is the index of the ramstage component in the verified This is the index of the ramstage component in the verified
firmware block. firmware block.
@ -172,7 +172,7 @@ config VBOOT_RAMSTAGE_INDEX
config VBOOT_ROMSTAGE_INDEX config VBOOT_ROMSTAGE_INDEX
hex "Romstage component index" hex "Romstage component index"
default 2 default 2
depends on VBOOT2_VERIFY_FIRMWARE depends on VBOOT_VERIFY_FIRMWARE
help help
This is the index of the romstage component in the verified This is the index of the romstage component in the verified
firmware block. firmware block.

2
src/vendorcode/google/chromeos/Makefile.inc
View File

@ -54,5 +54,5 @@ CFLAGS_common += -DMOCK_TPM=0
endif endif
VB_SOURCE := vboot_reference VB_SOURCE := vboot_reference
subdirs-$(CONFIG_VBOOT2_VERIFY_FIRMWARE) += vboot2 subdirs-$(CONFIG_VBOOT_VERIFY_FIRMWARE) += vboot2
CPPFLAGS_common += -I$(VB_SOURCE)/firmware/include CPPFLAGS_common += -I$(VB_SOURCE)/firmware/include

6
src/vendorcode/google/chromeos/chromeos.h
View File

@ -62,18 +62,18 @@ static inline int vboot_skip_display_init(void) { return 0; }
struct romstage_handoff; struct romstage_handoff;
#if CONFIG_VBOOT_VERIFY_FIRMWARE || CONFIG_VBOOT2_VERIFY_FIRMWARE #if CONFIG_VBOOT_VERIFY_FIRMWARE
/* Returns 0 on success < 0 on error. */ /* Returns 0 on success < 0 on error. */
int vboot_get_handoff_info(void **addr, uint32_t *size); int vboot_get_handoff_info(void **addr, uint32_t *size);
void *vboot_get_payload(int *len); void *vboot_get_payload(int *len);
#else /* CONFIG_VBOOT_VERIFY_FIRMWARE || CONFIG_VBOOT2_VERIFY_FIRMWARE */ #else /* CONFIG_VBOOT_VERIFY_FIRMWARE */
static inline void vboot_verify_firmware(struct romstage_handoff *h) {} static inline void vboot_verify_firmware(struct romstage_handoff *h) {}
static inline void *vboot_get_payload(int *len) { return NULL; } static inline void *vboot_get_payload(int *len) { return NULL; }
static inline int vboot_get_handoff_info(void **addr, uint32_t *size) static inline int vboot_get_handoff_info(void **addr, uint32_t *size)
{ {
return -1; return -1;
} }
#endif /* CONFIG_VBOOT_VERIFY_FIRMWARE || CONFIG_VBOOT2_VERIFY_FIRMWARE */ #endif /* CONFIG_VBOOT_VERIFY_FIRMWARE */
int vboot_get_sw_write_protect(void); int vboot_get_sw_write_protect(void);

6
src/vendorcode/google/chromeos/vbnv_flash.c
View File

@ -29,13 +29,7 @@
#include "chromeos.h" #include "chromeos.h"
#include "vbnv_layout.h" #include "vbnv_layout.h"
#if IS_ENABLED(CONFIG_VBOOT_VERIFY_FIRMWARE)
#define BLOB_SIZE VBNV_BLOCK_SIZE
#elif IS_ENABLED(CONFIG_VBOOT2_VERIFY_FIRMWARE)
#define BLOB_SIZE VB2_NVDATA_SIZE #define BLOB_SIZE VB2_NVDATA_SIZE
#else
#error unable to determine BLOB_SIZE
#endif
/* FMAP descriptor of the NVRAM area */ /* FMAP descriptor of the NVRAM area */
static struct vboot_region nvram_region; static struct vboot_region nvram_region;

19
src/vendorcode/google/chromeos/vboot2/Kconfig
View File

@ -16,19 +16,10 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
## ##
config VBOOT2_VERIFY_FIRMWARE
bool "Firmware Verification with vboot2"
default y if VBOOT_VERIFY_FIRMARE
depends on CHROMEOS && HAVE_HARD_RESET
select COLLECT_TIMESTAMPS
help
Enabling VBOOT2_VERIFY_FIRMWARE will use vboot2 to verify the romstage
and boot loader.
config VBOOT2_MOCK_SECDATA config VBOOT2_MOCK_SECDATA
bool "Mock secdata for firmware verification" bool "Mock secdata for firmware verification"
default n default n
depends on VBOOT2_VERIFY_FIRMWARE depends on VBOOT_VERIFY_FIRMWARE
help help
Enabling VBOOT2_MOCK_SECDATA will mock secdata for the firmware Enabling VBOOT2_MOCK_SECDATA will mock secdata for the firmware
verification to avoid access to a secdata storage (typically TPM). verification to avoid access to a secdata storage (typically TPM).
@ -39,7 +30,7 @@ config VBOOT2_MOCK_SECDATA
config RETURN_FROM_VERSTAGE config RETURN_FROM_VERSTAGE
bool "return from verstage" bool "return from verstage"
default n default n
depends on VBOOT2_VERIFY_FIRMWARE depends on VBOOT_VERIFY_FIRMWARE
help help
If this is set, the verstage returns back to the bootblock instead of If this is set, the verstage returns back to the bootblock instead of
exits to the romstage so that the verstage space can be reused by the exits to the romstage so that the verstage space can be reused by the
@ -49,7 +40,7 @@ config RETURN_FROM_VERSTAGE
config VBOOT_DISABLE_DEV_ON_RECOVERY config VBOOT_DISABLE_DEV_ON_RECOVERY
bool "Disable dev mode on recovery requests" bool "Disable dev mode on recovery requests"
default n default n
depends on VBOOT2_VERIFY_FIRMWARE depends on VBOOT_VERIFY_FIRMWARE
help help
When this option is enabled, the Chrome OS device leaves the When this option is enabled, the Chrome OS device leaves the
developer mode as soon as recovery request is detected. This is developer mode as soon as recovery request is detected. This is
@ -58,9 +49,9 @@ config VBOOT_DISABLE_DEV_ON_RECOVERY
config VERSTAGE_IN_BOOTBLOCK config VERSTAGE_IN_BOOTBLOCK
bool bool
default n default n
depends on VBOOT2_VERIFY_FIRMWARE depends on VBOOT_VERIFY_FIRMWARE
config SEPARATE_VERSTAGE config SEPARATE_VERSTAGE
bool bool
default !VERSTAGE_IN_BOOTBLOCK default !VERSTAGE_IN_BOOTBLOCK
depends on VBOOT2_VERIFY_FIRMWARE depends on VBOOT_VERIFY_FIRMWARE

7
src/vendorcode/google/chromeos/vboot_helper.c
View File

@ -105,12 +105,6 @@ int __attribute((weak)) vboot_get_sw_write_protect(void)
return 0; return 0;
} }
#if CONFIG_VBOOT2_VERIFY_FIRMWARE
void *vboot_get_payload(int *len) { return NULL; }
#else /* CONFIG_VBOOT2_VERIFY_FIRMWARE */
static void *vboot_get_payload(size_t *len) static void *vboot_get_payload(size_t *len)
{ {
struct vboot_handoff *vboot_handoff; struct vboot_handoff *vboot_handoff;
@ -137,7 +131,6 @@ static void *vboot_get_payload(size_t *len)
return (void *)fwc->address; return (void *)fwc->address;
} }
#endif
static int vboot_locate_payload(struct payload *payload) static int vboot_locate_payload(struct payload *payload)
{ {