Change in coreboot[master]: mb/facebook/fbg1701: Remove some preprocessor guards

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/36633 )

Change subject: mb/facebook/fbg1701: Remove some preprocessor guards
......................................................................

mb/facebook/fbg1701: Remove some preprocessor guards

Change-Id: Ia7289fa8337e1a93e620a52a67ca8cbdd78a66bc
Signed-off-by: Kyösti Mälkki 
---
M src/mainboard/facebook/fbg1701/board_verified_boot.c
1 file changed, 2 insertions(+), 12 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/33/36633/1

diff --git a/src/mainboard/facebook/fbg1701/board_verified_boot.c b/src/mainboard/facebook/fbg1701/board_verified_boot.c
index 1ccb0b8e..bb5768f 100644
--- a/src/mainboard/facebook/fbg1701/board_verified_boot.c
+++ b/src/mainboard/facebook/fbg1701/board_verified_boot.c
@@ -15,7 +15,6 @@

#include "board_verified_boot.h"

-#ifdef __BOOTBLOCK__
 /* The items verified by the bootblock, the bootblock will not measure the
  * items to the TPM
  */
@@ -32,9 +31,7 @@
    	MBOOT_PCR_INDEX_0 },
    { VERIFY_TERMINATOR, NULL, { { NULL, 0 } }, 0, 0 }
 };
-#endif

-#if defined(__ROMSTAGE__) || defined(__POSTCAR__)
 /* The FSP is already checked in romstage */
 static const verify_item_t ram_stage_additional_list[] = {
    { VERIFY_FILE, OP_ROM_VBT, { { NULL, CBFS_TYPE_RAW } },
@@ -44,10 +41,8 @@
    { VERIFY_FILE, "fallback/dsdt.aml", { { NULL, CBFS_TYPE_RAW } },
    	HASH_IDX_DSDT, MBOOT_PCR_INDEX_2 },
    { VERIFY_TERMINATOR, NULL, { { NULL, 0 } }, 0, 0 }
-	};
-#endif
+};

-#ifdef __ROMSTAGE__
 /* The items used by the romstage */
 const verify_item_t romstage_verify_list[] = {
    { VERIFY_FILE, ROMSTAGE, { { NULL, CBFS_TYPE_STAGE } },
@@ -75,10 +70,8 @@
    	CBFS_TYPE_STAGE } }, HASH_IDX_RAM_STAGE, MBOOT_PCR_INDEX_0 },
    { VERIFY_TERMINATOR, NULL, { { NULL, 0 } }, 0, 0 }
 };
-#endif

-#ifdef __POSTCAR__
-/* POSTSTAGE */
+/* POSTCAR */
 /* The items used by the postcar stage */
 const verify_item_t postcar_verify_list[] = {
    { VERIFY_FILE, RAMSTAGE, { { ram_stage_additional_list,
@@ -91,9 +84,7 @@
    	MBOOT_PCR_INDEX_1 },
    { VERIFY_TERMINATOR, NULL, { { NULL, 0 } }, 0, 0 }
 };
-#endif

-#ifdef __RAMSTAGE__
 /* RAMSTAGE */
 const verify_item_t payload_verify_list[] = {
    { VERIFY_FILE, PAYLOAD, { { NULL, CBFS_TYPE_SELF |
@@ -105,4 +96,3 @@
 const verify_item_t oprom_verify_list[] = {
    { VERIFY_TERMINATOR, NULL, { { NULL, 0 } }, 0, 0 }
 };
-#endif

[Wim Vervoorn (Code Review)]

Wim Vervoorn has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36633 )

Change subject: mb/facebook/fbg1701: Remove some preprocessor guards
......................................................................

Patch Set 2: Code-Review+1

[Frans Hendriks (Code Review)]

Frans Hendriks has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36633 )

Change subject: mb/facebook/fbg1701: Remove some preprocessor guards
......................................................................

Patch Set 2: Code-Review+2

Working fine on Facebook FBG1701

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/36633 )

Change subject: mb/facebook/fbg1701: Remove some preprocessor guards
......................................................................

mb/facebook/fbg1701: Remove some preprocessor guards

Change-Id: Ia7289fa8337e1a93e620a52a67ca8cbdd78a66bc
Signed-off-by: Kyösti Mälkki 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36633
Tested-by: build bot (Jenkins) 
Reviewed-by: Wim Vervoorn 
Reviewed-by: Frans Hendriks 
---
M src/mainboard/facebook/fbg1701/board_verified_boot.c
1 file changed, 2 insertions(+), 12 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Wim Vervoorn: Looks good to me, but someone else must approve
  Frans Hendriks: Looks good to me, approved

diff --git a/src/mainboard/facebook/fbg1701/board_verified_boot.c b/src/mainboard/facebook/fbg1701/board_verified_boot.c
index 1ccb0b8e..bb5768f 100644
--- a/src/mainboard/facebook/fbg1701/board_verified_boot.c
+++ b/src/mainboard/facebook/fbg1701/board_verified_boot.c
@@ -15,7 +15,6 @@

#include "board_verified_boot.h"

-#ifdef __BOOTBLOCK__
 /* The items verified by the bootblock, the bootblock will not measure the
  * items to the TPM
  */
@@ -32,9 +31,7 @@
    	MBOOT_PCR_INDEX_0 },
    { VERIFY_TERMINATOR, NULL, { { NULL, 0 } }, 0, 0 }
 };
-#endif

-#if defined(__ROMSTAGE__) || defined(__POSTCAR__)
 /* The FSP is already checked in romstage */
 static const verify_item_t ram_stage_additional_list[] = {
    { VERIFY_FILE, OP_ROM_VBT, { { NULL, CBFS_TYPE_RAW } },
@@ -44,10 +41,8 @@
    { VERIFY_FILE, "fallback/dsdt.aml", { { NULL, CBFS_TYPE_RAW } },
    	HASH_IDX_DSDT, MBOOT_PCR_INDEX_2 },
    { VERIFY_TERMINATOR, NULL, { { NULL, 0 } }, 0, 0 }
-	};
-#endif
+};

-#ifdef __ROMSTAGE__
 /* The items used by the romstage */
 const verify_item_t romstage_verify_list[] = {
    { VERIFY_FILE, ROMSTAGE, { { NULL, CBFS_TYPE_STAGE } },
@@ -75,10 +70,8 @@
    	CBFS_TYPE_STAGE } }, HASH_IDX_RAM_STAGE, MBOOT_PCR_INDEX_0 },
    { VERIFY_TERMINATOR, NULL, { { NULL, 0 } }, 0, 0 }
 };
-#endif

-#ifdef __POSTCAR__
-/* POSTSTAGE */
+/* POSTCAR */
 /* The items used by the postcar stage */
 const verify_item_t postcar_verify_list[] = {
    { VERIFY_FILE, RAMSTAGE, { { ram_stage_additional_list,
@@ -91,9 +84,7 @@
    	MBOOT_PCR_INDEX_1 },
    { VERIFY_TERMINATOR, NULL, { { NULL, 0 } }, 0, 0 }
 };
-#endif

-#ifdef __RAMSTAGE__
 /* RAMSTAGE */
 const verify_item_t payload_verify_list[] = {
    { VERIFY_FILE, PAYLOAD, { { NULL, CBFS_TYPE_SELF |
@@ -105,4 +96,3 @@
 const verify_item_t oprom_verify_list[] = {
    { VERIFY_TERMINATOR, NULL, { { NULL, 0 } }, 0, 0 }
 };
-#endif