diff options
Diffstat (limited to 'src/mainboard/google/nyan')
| -rw-r--r-- | src/mainboard/google/nyan/Makefile.inc | 1 | ||||
| -rw-r--r-- | src/mainboard/google/nyan/pmic.c | 4 | ||||
| -rw-r--r-- | src/mainboard/google/nyan/reset.c | 5 | ||||
| -rw-r--r-- | src/mainboard/google/nyan/reset.h | 25 | ||||
| -rw-r--r-- | src/mainboard/google/nyan/romstage.c | 4 |
5 files changed, 7 insertions, 32 deletions
diff --git a/src/mainboard/google/nyan/Makefile.inc b/src/mainboard/google/nyan/Makefile.inc index de1e127f59..7ac11e8a33 100644 --- a/src/mainboard/google/nyan/Makefile.inc +++ b/src/mainboard/google/nyan/Makefile.inc @@ -38,6 +38,7 @@ romstage-y += sdram_configs.c romstage-$(CONFIG_CHROMEOS) += chromeos.c romstage-y += early_configs.c +ramstage-y += reset.c ramstage-y += boardid.c ramstage-y += mainboard.c ramstage-$(CONFIG_CHROMEOS) += chromeos.c diff --git a/src/mainboard/google/nyan/pmic.c b/src/mainboard/google/nyan/pmic.c index 2a65719fab..b2908712d5 100644 --- a/src/mainboard/google/nyan/pmic.c +++ b/src/mainboard/google/nyan/pmic.c @@ -26,7 +26,7 @@ #include <boardid.h> #include "pmic.h" -#include "reset.h" +#include <reset.h> enum { AS3722_I2C_ADDR = 0x40 @@ -65,7 +65,7 @@ static void pmic_write_reg(unsigned bus, uint8_t reg, uint8_t val, int do_delay) printk(BIOS_ERR, "%s: reg = 0x%02X, value = 0x%02X failed!\n", __func__, reg, val); /* Reset the SoC on any PMIC write error */ - cpu_reset(); + hard_reset(); } else { if (do_delay) udelay(500); diff --git a/src/mainboard/google/nyan/reset.c b/src/mainboard/google/nyan/reset.c index 7f1fff922a..05cca2777e 100644 --- a/src/mainboard/google/nyan/reset.c +++ b/src/mainboard/google/nyan/reset.c @@ -19,10 +19,9 @@ #include <arch/io.h> #include <soc/nvidia/tegra124/gpio.h> +#include <reset.h> -#include "reset.h" - -void cpu_reset(void) +void hard_reset(void) { gpio_output(GPIO(I5), 0); while(1); diff --git a/src/mainboard/google/nyan/reset.h b/src/mainboard/google/nyan/reset.h deleted file mode 100644 index debe83818b..0000000000 --- a/src/mainboard/google/nyan/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_NYAN_BOOTBLOCK_H__ -#define __MAINBOARD_GOOGLE_NYAN_BOOTBLOCK_H__ - -void cpu_reset(void); - -#endif /* __MAINBOARD_GOOGLE_NYAN_BOOTBLOCK_H__ */ diff --git a/src/mainboard/google/nyan/romstage.c b/src/mainboard/google/nyan/romstage.c index fffe0de282..1ff500b5d3 100644 --- a/src/mainboard/google/nyan/romstage.c +++ b/src/mainboard/google/nyan/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> @@ -79,7 +79,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(); |