aboutsummaryrefslogtreecommitdiff
path: root/src/mainboard/google/nyan_blaze/romstage.c
diff options
context:
space:
mode:
authorDaisuke Nojiri <dnojiri@chromium.org>2014-08-15 17:07:39 -0700
committerStefan Reinauer <stefan.reinauer@coreboot.org>2015-04-02 22:53:27 +0200
commit512bfbc1c7d7fbee8d3e394c4ce8a9e440adbc9a (patch)
treef1f19e041c2cd7ae3cd7c8d4036700af3b87c4e6 /src/mainboard/google/nyan_blaze/romstage.c
parentb71d9b8a0f02d5f458620cb21cdfe7799b1faf84 (diff)
Nyans: replace cpu_reset with hard_reset
The existing cpu_reset does board-wide reset, thus, should be renamed. BUG=none BRANCH=none TEST=Built firmware for Nyans. Ran faft on Blaze. Original-Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org> Original-Change-Id: I5dc4fa9bae328001a897a371d4f23632701f1dd9 Original-Reviewed-on: https://chromium-review.googlesource.com/212982 Original-Reviewed-by: Julius Werner <jwerner@chromium.org> Original-Commit-Queue: Daisuke Nojiri <dnojiri@chromium.org> Original-Tested-by: Daisuke Nojiri <dnojiri@chromium.org> (cherry picked from commit 29753b9c1dfe7ecd156042d69b74e9fe4244f455) Signed-off-by: Marc Jones <marc.jones@se-eng.com> Change-Id: I98eca40c50637bda01a9029a904bca6880cd081f Reviewed-on: http://review.coreboot.org/9179 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@google.com>
Diffstat (limited to 'src/mainboard/google/nyan_blaze/romstage.c')
-rw-r--r--src/mainboard/google/nyan_blaze/romstage.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mainboard/google/nyan_blaze/romstage.c b/src/mainboard/google/nyan_blaze/romstage.c
index 65596a28d3..fca705df03 100644
--- a/src/mainboard/google/nyan_blaze/romstage.c
+++ b/src/mainboard/google/nyan_blaze/romstage.c
@@ -24,7 +24,7 @@
#include <cbfs.h>
#include <cbmem.h>
#include <console/console.h>
-#include <mainboard/google/nyan/reset.h>
+#include <reset.h>
#include <program_loading.h>
#include <romstage_handoff.h>
#include <vendorcode/google/chromeos/chromeos.h>
@@ -82,7 +82,7 @@ static void __attribute__((noinline)) romstage(void)
*/
if (power_reset_status() == POWER_RESET_WATCHDOG) {
printk(BIOS_INFO, "Watchdog reset detected, rebooting.\n");
- cpu_reset();
+ hard_reset();
}
cbmem_initialize_empty();