3 files changed, 6 insertions, 30 deletions
diff --git a/src/mainboard/google/rush_ryu/Makefile.inc b/src/mainboard/google/rush_ryu/Makefile.inc
index 9faba250d4..4f50c6be5c 100644
--- a/src/mainboard/google/rush_ryu/Makefile.inc
+++ b/src/mainboard/google/rush_ryu/Makefile.inc
@@ -32,8 +32,10 @@ bootblock-y += pmic.c
 bootblock-y += reset.c
 
 romstage-y += reset.c
+romstage-y += reset.c
 romstage-y += romstage.c
 romstage-y += sdram_configs.c
 
 ramstage-y += boardid.c
 ramstage-y += mainboard.c
+ramstage-y += reset.c
diff --git a/src/mainboard/google/rush_ryu/reset.c b/src/mainboard/google/rush_ryu/reset.c
index 381634078b..f3057cac90 100644
--- a/src/mainboard/google/rush_ryu/reset.c
+++ b/src/mainboard/google/rush_ryu/reset.c
@@ -18,12 +18,11 @@
  */
 
 #include <arch/io.h>
+#include <reset.h>
 #include <soc/nvidia/tegra132/gpio.h>
 
-#include "reset.h"
-
-void cpu_reset(void)
+void hard_reset(void)
 {
-        gpio_output(GPIO(I5), 0);
-        while(1);
+	gpio_output(GPIO(I5), 0);
+	while(1);
 }
diff --git a/src/mainboard/google/rush_ryu/reset.h b/src/mainboard/google/rush_ryu/reset.h
deleted file mode 100644
index be723ce316..0000000000
--- a/src/mainboard/google/rush_ryu/reset.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright 2014 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef __MAINBOARD_GOOGLE_RUSH_BOOTBLOCK_H__
-#define __MAINBOARD_GOOGLE_RUSH_BOOTBLOCK_H__
-
-void cpu_reset(void);
-
-#endif /* __MAINBOARD_GOOGLE_RUSH_BOOTBLOCK_H__ */