Philipp Deppenwiese has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/29840
Change subject: security/vboot: Fix measured boot issues ......................................................................
security/vboot: Fix measured boot issues
* Remove legacy and never published google purin. * Increase Tegra210 and Rockchip3228 SRAM for romstage/verstage.
Change-Id: I35a85b8f137f28cd9960f2c5ce95f8fa31185b82 Signed-off-by: Philipp Deppenwiese zaolin.daisuki@gmail.com --- D src/mainboard/google/purin/Kconfig D src/mainboard/google/purin/Kconfig.name D src/mainboard/google/purin/Makefile.inc D src/mainboard/google/purin/board_info.txt D src/mainboard/google/purin/boardid.c D src/mainboard/google/purin/bootblock.c D src/mainboard/google/purin/chromeos.c D src/mainboard/google/purin/chromeos.fmd D src/mainboard/google/purin/devicetree.cb D src/mainboard/google/purin/mainboard.c D src/mainboard/google/purin/memlayout.ld D src/mainboard/google/purin/reset.c 12 files changed, 0 insertions(+), 296 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/40/29840/1
diff --git a/src/mainboard/google/purin/Kconfig b/src/mainboard/google/purin/Kconfig deleted file mode 100644 index 4666453..0000000 --- a/src/mainboard/google/purin/Kconfig +++ /dev/null @@ -1,53 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright 2015 Google Inc. -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; version 2 of the License. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## - -if BOARD_GOOGLE_PURIN - -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - select BOARD_ROMSIZE_KB_2048 - select COMMON_CBFS_SPI_WRAPPER - select MAINBOARD_HAS_CHROMEOS - select SOC_BROADCOM_CYGNUS - select SPI_FLASH - select SPI_FLASH_SPANSION - select SPI_FLASH_STMICRO # required for the reference board BCM958305K - select MAINBOARD_HAS_I2C_TPM_GENERIC - select MAINBOARD_HAS_TPM1 - -config VBOOT - select VBOOT_VBNV_FLASH - -config MAINBOARD_DIR - string - default google/purin - -config MAINBOARD_PART_NUMBER - string - default "Purin" - -config MAINBOARD_VENDOR - string - default "Google" - -config DRAM_SIZE_MB - int - default 256 - -config GBB_HWID - string - depends on CHROMEOS - default "Purin TEST 1" -endif # BOARD_GOOGLE_PURIN diff --git a/src/mainboard/google/purin/Kconfig.name b/src/mainboard/google/purin/Kconfig.name deleted file mode 100644 index db960087..0000000 --- a/src/mainboard/google/purin/Kconfig.name +++ /dev/null @@ -1,2 +0,0 @@ -config BOARD_GOOGLE_PURIN - bool "Purin" diff --git a/src/mainboard/google/purin/Makefile.inc b/src/mainboard/google/purin/Makefile.inc deleted file mode 100644 index 5f13a8b..0000000 --- a/src/mainboard/google/purin/Makefile.inc +++ /dev/null @@ -1,36 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright 2015 Google Inc. -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; version 2 of the License. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -bootblock-y += bootblock.c -bootblock-y += boardid.c -bootblock-y += chromeos.c -bootblock-y += reset.c - -verstage-y += boardid.c -verstage-y += chromeos.c -verstage-y += reset.c - -romstage-y += boardid.c -romstage-y += chromeos.c -romstage-y += reset.c - -ramstage-y += boardid.c -ramstage-y += chromeos.c -ramstage-y += mainboard.c -ramstage-y += reset.c - -bootblock-y += memlayout.ld -verstage-y += memlayout.ld -romstage-y += memlayout.ld -ramstage-y += memlayout.ld diff --git a/src/mainboard/google/purin/board_info.txt b/src/mainboard/google/purin/board_info.txt deleted file mode 100644 index 878db18..0000000 --- a/src/mainboard/google/purin/board_info.txt +++ /dev/null @@ -1,6 +0,0 @@ -Vendor name: Google -Board name: Purin Broadcom Cygnus reference board -Category: eval -ROM protocol: SPI -ROM socketed: n -Flashrom support: y diff --git a/src/mainboard/google/purin/boardid.c b/src/mainboard/google/purin/boardid.c deleted file mode 100644 index 901d837..0000000 --- a/src/mainboard/google/purin/boardid.c +++ /dev/null @@ -1,21 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright 2015 Google Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include <boardid.h> - -uint32_t board_id(void) -{ - return -1; -} diff --git a/src/mainboard/google/purin/bootblock.c b/src/mainboard/google/purin/bootblock.c deleted file mode 100644 index 18c1f5f..0000000 --- a/src/mainboard/google/purin/bootblock.c +++ /dev/null @@ -1,20 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright 20145Google Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include <bootblock_common.h> - -void bootblock_mainboard_init(void) -{ -} diff --git a/src/mainboard/google/purin/chromeos.c b/src/mainboard/google/purin/chromeos.c deleted file mode 100644 index 5e7cdfe..0000000 --- a/src/mainboard/google/purin/chromeos.c +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright 2015 Google Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include <boot/coreboot_tables.h> -#include <vendorcode/google/chromeos/chromeos.h> - -void fill_lb_gpios(struct lb_gpios *gpios) -{ -} - -int get_recovery_mode_switch(void) -{ - return 0; -} - -int get_write_protect_state(void) -{ - return 0; -} diff --git a/src/mainboard/google/purin/chromeos.fmd b/src/mainboard/google/purin/chromeos.fmd deleted file mode 100644 index 3f4ca84..0000000 --- a/src/mainboard/google/purin/chromeos.fmd +++ /dev/null @@ -1,32 +0,0 @@ -FLASH@0x0 0x200000 { - WP_RO@0x0 0x100000 { - RO_SECTION@0x0 0xf0000 { - BOOTBLOCK@0 128K - COREBOOT(CBFS)@0x20000 0x60000 - FMAP@0x80000 0x1000 - GBB@0x81000 0x6ef00 - RO_FRID@0xeff00 0x100 - } - RO_VPD@0xf0000 0x10000 - } - RW_SECTION_A@0x100000 0x58000 { - VBLOCK_A@0x0 0x2000 - FW_MAIN_A(CBFS)@0x2000 0x55f00 - RW_FWID_A@0x57f00 0x100 - } - RW_SHARED@0x158000 0x4000 { - SHARED_DATA@0x0 0x4000 - } - RW_ELOG@0x15c000 0x4000 - RW_GPT@0x160000 0x20000 { - RW_GPT_PRIMARY@0x0 0x10000 - RW_GPT_SECONDARY@0x10000 0x10000 - } - RW_SECTION_B@0x180000 0x58000 { - VBLOCK_B@0x0 0x2000 - FW_MAIN_B(CBFS)@0x2000 0x55f00 - RW_FWID_B@0x57f00 0x100 - } - RW_VPD@0x1d8000 0x8000 - RW_NVRAM@0x1e0000 0x10000 -} diff --git a/src/mainboard/google/purin/devicetree.cb b/src/mainboard/google/purin/devicetree.cb deleted file mode 100644 index 6ef5c3b..0000000 --- a/src/mainboard/google/purin/devicetree.cb +++ /dev/null @@ -1,19 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright 2015 Google Inc. -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; version 2 of the License. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## - -# TODO fill with Versatile Express board data in QEMU. -chip soc/broadcom/cygnus - device cpu_cluster 0 on end -end diff --git a/src/mainboard/google/purin/mainboard.c b/src/mainboard/google/purin/mainboard.c deleted file mode 100644 index bc7b545..0000000 --- a/src/mainboard/google/purin/mainboard.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright 2015 Google Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include <device/device.h> -#include <boot/coreboot_tables.h> -#include <symbols.h> - -static void mainboard_init(struct device *dev) -{ -} - -static void mainboard_enable(struct device *dev) -{ - dev->ops->init = &mainboard_init; -} - -struct chip_operations mainboard_ops = { - .enable_dev = mainboard_enable, -}; - -void lb_board(struct lb_header *header) -{ - struct lb_range *dma; - - dma = (struct lb_range *)lb_new_record(header); - dma->tag = LB_TAB_DMA; - dma->size = sizeof(*dma); - dma->range_start = (uintptr_t)_dma_coherent; - dma->range_size = _dma_coherent_size; -} diff --git a/src/mainboard/google/purin/memlayout.ld b/src/mainboard/google/purin/memlayout.ld deleted file mode 100644 index 2c33306..0000000 --- a/src/mainboard/google/purin/memlayout.ld +++ /dev/null @@ -1,14 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include <soc/memlayout.ld> diff --git a/src/mainboard/google/purin/reset.c b/src/mainboard/google/purin/reset.c deleted file mode 100644 index 51a2187..0000000 --- a/src/mainboard/google/purin/reset.c +++ /dev/null @@ -1,20 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright 2015 Google Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include <reset.h> - -void do_board_reset(void) -{ -}