reset: Convert individual boards to `board_reset()`

Change-Id: I6182da172ae2f4107a9b5d8190e4b3b10ed2f0b9
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/29048
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
This commit is contained in:
Nico Huber 2018-10-06 17:53:14 +02:00 committed by Patrick Georgi
parent 4f32b64e4f
commit e8791361b5
27 changed files with 19 additions and 33 deletions

View File

@ -44,7 +44,7 @@ static void pmic_write_reg(unsigned bus, uint8_t reg, uint8_t val, int delay)
printk(BIOS_ERR, "%s: reg = 0x%02X, value = 0x%02X failed!\n", printk(BIOS_ERR, "%s: reg = 0x%02X, value = 0x%02X failed!\n",
__func__, reg, val); __func__, reg, val);
/* Reset the board on any PMIC write error */ /* Reset the board on any PMIC write error */
hard_reset(); board_reset();
} else { } else {
if (delay) if (delay)
udelay(500); udelay(500);

View File

@ -18,7 +18,7 @@
#include <gpio.h> #include <gpio.h>
#include <reset.h> #include <reset.h>
void do_hard_reset(void) void do_board_reset(void)
{ {
gpio_output(GPIO(I5), 0); gpio_output(GPIO(I5), 0);
} }

View File

@ -21,7 +21,6 @@ config BOARD_SPECIFIC_OPTIONS
select BOARD_ROMSIZE_KB_8192 select BOARD_ROMSIZE_KB_8192
select COMMON_CBFS_SPI_WRAPPER select COMMON_CBFS_SPI_WRAPPER
select DRIVERS_I2C_WW_RING select DRIVERS_I2C_WW_RING
select HAVE_HARD_RESET
select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_CHROMEOS
select SPI_FLASH select SPI_FLASH
select SPI_FLASH_GIGADEVICE select SPI_FLASH_GIGADEVICE

View File

@ -19,7 +19,7 @@
#include <soc/iomap.h> #include <soc/iomap.h>
#include <reset.h> #include <reset.h>
void do_hard_reset(void) void do_board_reset(void)
{ {
/* /*
* At boot time the boot loaders would have set a magic cookie * At boot time the boot loaders would have set a magic cookie

View File

@ -61,7 +61,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", printk(BIOS_ERR, "%s: reg = 0x%02X, value = 0x%02X failed!\n",
__func__, reg, val); __func__, reg, val);
/* Reset the SoC on any PMIC write error */ /* Reset the SoC on any PMIC write error */
hard_reset(); board_reset();
} else { } else {
if (do_delay) if (do_delay)
udelay(500); udelay(500);

View File

@ -13,11 +13,10 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#include <arch/io.h>
#include <gpio.h> #include <gpio.h>
#include <reset.h> #include <reset.h>
void do_hard_reset(void) void do_board_reset(void)
{ {
gpio_output(GPIO(I5), 0); gpio_output(GPIO(I5), 0);
} }

View File

@ -76,7 +76,7 @@ static void __attribute__((noinline)) romstage(void)
*/ */
if (power_reset_status() == POWER_RESET_WATCHDOG) { if (power_reset_status() == POWER_RESET_WATCHDOG) {
printk(BIOS_INFO, "Watchdog reset detected, rebooting.\n"); printk(BIOS_INFO, "Watchdog reset detected, rebooting.\n");
hard_reset(); board_reset();
} }
/* FIXME: this may require coordination with moving timestamps */ /* FIXME: this may require coordination with moving timestamps */

View File

@ -61,7 +61,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", printk(BIOS_ERR, "%s: reg = 0x%02X, value = 0x%02X failed!\n",
__func__, reg, val); __func__, reg, val);
/* Reset the SoC on any PMIC write error */ /* Reset the SoC on any PMIC write error */
hard_reset(); board_reset();
} else { } else {
if (do_delay) if (do_delay)
udelay(500); udelay(500);

View File

@ -13,11 +13,10 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#include <arch/io.h>
#include <gpio.h> #include <gpio.h>
#include <reset.h> #include <reset.h>
void do_hard_reset(void) void do_board_reset(void)
{ {
gpio_output(GPIO(I5), 0); gpio_output(GPIO(I5), 0);
} }

View File

@ -76,7 +76,7 @@ static void __attribute__((noinline)) romstage(void)
*/ */
if (power_reset_status() == POWER_RESET_WATCHDOG) { if (power_reset_status() == POWER_RESET_WATCHDOG) {
printk(BIOS_INFO, "Watchdog reset detected, rebooting.\n"); printk(BIOS_INFO, "Watchdog reset detected, rebooting.\n");
hard_reset(); board_reset();
} }
/* FIXME: this may require coordination with moving timestamps */ /* FIXME: this may require coordination with moving timestamps */

View File

@ -61,7 +61,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", printk(BIOS_ERR, "%s: reg = 0x%02X, value = 0x%02X failed!\n",
__func__, reg, val); __func__, reg, val);
/* Reset the SoC on any PMIC write error */ /* Reset the SoC on any PMIC write error */
hard_reset(); board_reset();
} else { } else {
if (do_delay) if (do_delay)
udelay(500); udelay(500);

View File

@ -13,11 +13,10 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#include <arch/io.h>
#include <gpio.h> #include <gpio.h>
#include <reset.h> #include <reset.h>
void do_hard_reset(void) void do_board_reset(void)
{ {
gpio_output(GPIO(I5), 0); gpio_output(GPIO(I5), 0);
} }

View File

@ -80,7 +80,7 @@ static void __attribute__((noinline)) romstage(void)
*/ */
if (power_reset_status() == POWER_RESET_WATCHDOG) { if (power_reset_status() == POWER_RESET_WATCHDOG) {
printk(BIOS_INFO, "Watchdog reset detected, rebooting.\n"); printk(BIOS_INFO, "Watchdog reset detected, rebooting.\n");
hard_reset(); board_reset();
} }
/* FIXME: this may require coordination with moving timestamps */ /* FIXME: this may require coordination with moving timestamps */

View File

@ -19,7 +19,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y def_bool y
select BOARD_ROMSIZE_KB_2048 select BOARD_ROMSIZE_KB_2048
select COMMON_CBFS_SPI_WRAPPER select COMMON_CBFS_SPI_WRAPPER
select HAVE_HARD_RESET
select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_CHROMEOS
select SOC_BROADCOM_CYGNUS select SOC_BROADCOM_CYGNUS
select SPI_FLASH select SPI_FLASH

View File

@ -15,6 +15,6 @@
#include <reset.h> #include <reset.h>
void do_hard_reset(void) void do_board_reset(void)
{ {
} }

View File

@ -47,7 +47,7 @@ static void pmic_write_reg(unsigned bus, uint8_t chip, uint8_t reg, uint8_t val,
printk(BIOS_ERR, "%s: reg = 0x%02X, value = 0x%02X failed!\n", printk(BIOS_ERR, "%s: reg = 0x%02X, value = 0x%02X failed!\n",
__func__, reg, val); __func__, reg, val);
/* Reset the board on any PMIC write error */ /* Reset the board on any PMIC write error */
hard_reset(); board_reset();
} else { } else {
if (delay) if (delay)
udelay(500); udelay(500);

View File

@ -18,7 +18,7 @@
#include "gpio.h" #include "gpio.h"
void do_hard_reset(void) void do_board_reset(void)
{ {
gpio_output(AP_SYS_RESET_L, 0); gpio_output(AP_SYS_RESET_L, 0);
} }

View File

@ -21,7 +21,6 @@ config BOARD_SPECIFIC_OPTIONS
select BOARD_ROMSIZE_KB_8192 select BOARD_ROMSIZE_KB_8192
select COMMON_CBFS_SPI_WRAPPER select COMMON_CBFS_SPI_WRAPPER
select DRIVERS_I2C_WW_RING select DRIVERS_I2C_WW_RING
select HAVE_HARD_RESET
select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_CHROMEOS
select SPI_FLASH select SPI_FLASH
select SPI_FLASH_SPANSION select SPI_FLASH_SPANSION

View File

@ -39,7 +39,7 @@ static void wdog_reset(void)
write32(APCS_WDT0_CPU0_WDOG_EXPIRED_ENABLE, 1); write32(APCS_WDT0_CPU0_WDOG_EXPIRED_ENABLE, 1);
} }
void do_hard_reset(void) void do_board_reset(void)
{ {
wdog_reset(); wdog_reset();
} }

View File

@ -36,7 +36,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select SOC_ROCKCHIP_RK3288 select SOC_ROCKCHIP_RK3288
select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_CHROMEOS
select BOARD_ROMSIZE_KB_4096 select BOARD_ROMSIZE_KB_4096
select HAVE_HARD_RESET
select SPI_FLASH select SPI_FLASH
select SPI_FLASH_GIGADEVICE select SPI_FLASH_GIGADEVICE
select SPI_FLASH_WINBOND select SPI_FLASH_WINBOND

View File

@ -13,13 +13,12 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#include <arch/io.h>
#include <gpio.h> #include <gpio.h>
#include <reset.h> #include <reset.h>
#include "board.h" #include "board.h"
void do_hard_reset(void) void do_board_reset(void)
{ {
gpio_output(GPIO_RESET, 1); gpio_output(GPIO_RESET, 1);
} }

View File

@ -19,7 +19,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y def_bool y
select BOARD_ROMSIZE_KB_4096 select BOARD_ROMSIZE_KB_4096
select COMMON_CBFS_SPI_WRAPPER select COMMON_CBFS_SPI_WRAPPER
select HAVE_HARD_RESET
select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_CHROMEOS
select SOC_ROCKCHIP_RK3288 select SOC_ROCKCHIP_RK3288
select SPI_FLASH select SPI_FLASH

View File

@ -13,13 +13,12 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#include <arch/io.h>
#include <gpio.h> #include <gpio.h>
#include <reset.h> #include <reset.h>
#include "board.h" #include "board.h"
void do_hard_reset(void) void do_board_reset(void)
{ {
gpio_output(GPIO_RESET, 1); gpio_output(GPIO_RESET, 1);
} }

View File

@ -19,7 +19,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y def_bool y
select BOARD_ROMSIZE_KB_4096 select BOARD_ROMSIZE_KB_4096
select COMMON_CBFS_SPI_WRAPPER select COMMON_CBFS_SPI_WRAPPER
select HAVE_HARD_RESET
select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_CHROMEOS
select SOC_ROCKCHIP_RK3288 select SOC_ROCKCHIP_RK3288
select SPI_FLASH select SPI_FLASH

View File

@ -13,13 +13,12 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#include <arch/io.h>
#include <gpio.h> #include <gpio.h>
#include <reset.h> #include <reset.h>
#include "board.h" #include "board.h"
void do_hard_reset(void) void do_board_reset(void)
{ {
gpio_output(GPIO_RESET, 1); gpio_output(GPIO_RESET, 1);
} }

View File

@ -7,7 +7,6 @@ config SOC_NVIDIA_TEGRA124
select ARCH_ROMSTAGE_ARMV7 select ARCH_ROMSTAGE_ARMV7
select ARCH_RAMSTAGE_ARMV7 select ARCH_RAMSTAGE_ARMV7
select HAVE_UART_SPECIAL select HAVE_UART_SPECIAL
select HAVE_HARD_RESET
select HAVE_MONOTONIC_TIMER select HAVE_MONOTONIC_TIMER
select GENERIC_UDELAY select GENERIC_UDELAY
select BOOTBLOCK_CONSOLE select BOOTBLOCK_CONSOLE

View File

@ -10,7 +10,6 @@ config SOC_NVIDIA_TEGRA210
select GIC select GIC
select HAVE_MONOTONIC_TIMER select HAVE_MONOTONIC_TIMER
select GENERIC_UDELAY select GENERIC_UDELAY
select HAVE_HARD_RESET
select HAVE_UART_SPECIAL select HAVE_UART_SPECIAL
select ARM64_USE_ARM_TRUSTED_FIRMWARE select ARM64_USE_ARM_TRUSTED_FIRMWARE
select GENERIC_GPIO_LIB select GENERIC_GPIO_LIB