summaryrefslogtreecommitdiff
path: root/src/mainboard/google
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2015-05-01 16:48:54 -0500
committerPatrick Georgi <pgeorgi@google.com>2015-05-05 17:46:28 +0200
commit0946a1bb21594d274fd21df7a9e40f3d90b0ba84 (patch)
treed5c3dc9159b3c3cba46e10e81468d265e36a41f0 /src/mainboard/google
parentc3b0e29b4396f1fbcc213bf2319c8ffd624bae1a (diff)
vboot: remove uses of vboot2_verify_firmware()
The vboot mechanism will be implemented within the program loader subsystem to make it transparent to mainboards and chipsets. Change-Id: Icd0bdcba06cdc30591f9b25068b3fa3a112e58fb Signed-off-by: Aaron Durbin <adurbin@chromium.org> Signed-off-by: Patrick Georgi <pgeorgi@chromium.org> Reviewed-on: http://review.coreboot.org/10094 Tested-by: build bot (Jenkins)
Diffstat (limited to 'src/mainboard/google')
-rw-r--r--src/mainboard/google/nyan_blaze/romstage.c7
-rw-r--r--src/mainboard/google/veyron_brain/romstage.c6
-rw-r--r--src/mainboard/google/veyron_danger/romstage.c6
-rw-r--r--src/mainboard/google/veyron_jerry/romstage.c6
-rw-r--r--src/mainboard/google/veyron_mighty/romstage.c6
-rw-r--r--src/mainboard/google/veyron_pinky/romstage.c6
-rw-r--r--src/mainboard/google/veyron_rialto/romstage.c6
-rw-r--r--src/mainboard/google/veyron_speedy/romstage.c6
8 files changed, 0 insertions, 49 deletions
diff --git a/src/mainboard/google/nyan_blaze/romstage.c b/src/mainboard/google/nyan_blaze/romstage.c
index 12b2ffb366..e56683d68d 100644
--- a/src/mainboard/google/nyan_blaze/romstage.c
+++ b/src/mainboard/google/nyan_blaze/romstage.c
@@ -95,13 +95,6 @@ static void __attribute__((noinline)) romstage(void)
early_mainboard_init();
-#if CONFIG_VBOOT_VERIFY_FIRMWARE
- entry = vboot2_load_ramstage();
-#else
- early_mainboard_init();
- vboot_verify_firmware(romstage_handoff_find_or_add());
-#endif
-
run_ramstage();
}
diff --git a/src/mainboard/google/veyron_brain/romstage.c b/src/mainboard/google/veyron_brain/romstage.c
index 4156401cc0..0be99ced4b 100644
--- a/src/mainboard/google/veyron_brain/romstage.c
+++ b/src/mainboard/google/veyron_brain/romstage.c
@@ -117,11 +117,5 @@ void main(void)
timestamp_add_now(TS_END_ROMSTAGE);
#endif
-#if IS_ENABLED(CONFIG_VBOOT_VERIFY_FIRMWARE)
- void *entry = vboot2_load_ramstage();
- if (entry != NULL)
- stage_exit(entry);
-#endif
-
run_ramstage();
}
diff --git a/src/mainboard/google/veyron_danger/romstage.c b/src/mainboard/google/veyron_danger/romstage.c
index 9be13fe894..d1dfb84b99 100644
--- a/src/mainboard/google/veyron_danger/romstage.c
+++ b/src/mainboard/google/veyron_danger/romstage.c
@@ -127,11 +127,5 @@ void main(void)
timestamp_add_now(TS_END_ROMSTAGE);
#endif
-#if IS_ENABLED(CONFIG_VBOOT_VERIFY_FIRMWARE)
- void *entry = vboot2_load_ramstage();
- if (entry != NULL)
- stage_exit(entry);
-#endif
-
run_ramstage();
}
diff --git a/src/mainboard/google/veyron_jerry/romstage.c b/src/mainboard/google/veyron_jerry/romstage.c
index e8f54deedd..0ff4585737 100644
--- a/src/mainboard/google/veyron_jerry/romstage.c
+++ b/src/mainboard/google/veyron_jerry/romstage.c
@@ -126,11 +126,5 @@ void main(void)
timestamp_add_now(TS_END_ROMSTAGE);
#endif
-#if IS_ENABLED(CONFIG_VBOOT_VERIFY_FIRMWARE)
- void *entry = vboot2_load_ramstage();
- if (entry != NULL)
- stage_exit(entry);
-#endif
-
run_ramstage();
}
diff --git a/src/mainboard/google/veyron_mighty/romstage.c b/src/mainboard/google/veyron_mighty/romstage.c
index e8f54deedd..0ff4585737 100644
--- a/src/mainboard/google/veyron_mighty/romstage.c
+++ b/src/mainboard/google/veyron_mighty/romstage.c
@@ -126,11 +126,5 @@ void main(void)
timestamp_add_now(TS_END_ROMSTAGE);
#endif
-#if IS_ENABLED(CONFIG_VBOOT_VERIFY_FIRMWARE)
- void *entry = vboot2_load_ramstage();
- if (entry != NULL)
- stage_exit(entry);
-#endif
-
run_ramstage();
}
diff --git a/src/mainboard/google/veyron_pinky/romstage.c b/src/mainboard/google/veyron_pinky/romstage.c
index 3e885647c7..742522e4fd 100644
--- a/src/mainboard/google/veyron_pinky/romstage.c
+++ b/src/mainboard/google/veyron_pinky/romstage.c
@@ -134,11 +134,5 @@ void main(void)
timestamp_add_now(TS_END_ROMSTAGE);
#endif
-#if IS_ENABLED(CONFIG_VBOOT_VERIFY_FIRMWARE)
- void *entry = vboot2_load_ramstage();
- if (entry != NULL)
- stage_exit(entry);
-#endif
-
run_ramstage();
}
diff --git a/src/mainboard/google/veyron_rialto/romstage.c b/src/mainboard/google/veyron_rialto/romstage.c
index 9be13fe894..d1dfb84b99 100644
--- a/src/mainboard/google/veyron_rialto/romstage.c
+++ b/src/mainboard/google/veyron_rialto/romstage.c
@@ -127,11 +127,5 @@ void main(void)
timestamp_add_now(TS_END_ROMSTAGE);
#endif
-#if IS_ENABLED(CONFIG_VBOOT_VERIFY_FIRMWARE)
- void *entry = vboot2_load_ramstage();
- if (entry != NULL)
- stage_exit(entry);
-#endif
-
run_ramstage();
}
diff --git a/src/mainboard/google/veyron_speedy/romstage.c b/src/mainboard/google/veyron_speedy/romstage.c
index 9be13fe894..d1dfb84b99 100644
--- a/src/mainboard/google/veyron_speedy/romstage.c
+++ b/src/mainboard/google/veyron_speedy/romstage.c
@@ -127,11 +127,5 @@ void main(void)
timestamp_add_now(TS_END_ROMSTAGE);
#endif
-#if IS_ENABLED(CONFIG_VBOOT_VERIFY_FIRMWARE)
- void *entry = vboot2_load_ramstage();
- if (entry != NULL)
- stage_exit(entry);
-#endif
-
run_ramstage();
}