Julius Werner has submitted this change and it was merged. ( https://review.coreboot.org/19786 )
Change subject: tegra210: Remove fake cpu_reset() ......................................................................
tegra210: Remove fake cpu_reset()
The Tegra210 SoC never had a proper cpu_reset() implementation, so it's pointless to pretend there is one. Most ARM SoCs/boards only define hard_reset() at the moment anyway, so let's stick with that.
Change-Id: I40f39921fa99d6dfabf818e7abe7a5732341cf4f Signed-off-by: Julius Werner jwerner@chromium.org Reviewed-on: https://review.coreboot.org/19786 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Aaron Durbin adurbin@chromium.org Reviewed-by: Paul Menzel paulepanter@users.sourceforge.net Reviewed-by: Philippe Mathieu-Daudé philippe.mathieu.daude@gmail.com --- M src/mainboard/google/foster/pmic.c M src/mainboard/google/smaug/pmic.c M src/soc/nvidia/tegra210/Makefile.inc D src/soc/nvidia/tegra210/reset.c 4 files changed, 4 insertions(+), 32 deletions(-)
Approvals: Aaron Durbin: Looks good to me, approved Philippe Mathieu-Daudé: Looks good to me, but someone else must approve Paul Menzel: Looks good to me, but someone else must approve build bot (Jenkins): Verified
diff --git a/src/mainboard/google/foster/pmic.c b/src/mainboard/google/foster/pmic.c index 2e655b5..2eeccb2 100644 --- a/src/mainboard/google/foster/pmic.c +++ b/src/mainboard/google/foster/pmic.c @@ -43,8 +43,8 @@ if (i2c_writeb(bus, MAX77620_I2C_ADDR, reg, val)) { 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(); + /* Reset the board on any PMIC write error */ + hard_reset(); } else { if (delay) udelay(500); diff --git a/src/mainboard/google/smaug/pmic.c b/src/mainboard/google/smaug/pmic.c index cba555a..25e870a 100644 --- a/src/mainboard/google/smaug/pmic.c +++ b/src/mainboard/google/smaug/pmic.c @@ -46,8 +46,8 @@ if (i2c_writeb(bus, chip, reg, val)) { 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(); + /* Reset the board on any PMIC write error */ + hard_reset(); } else { if (delay) udelay(500); diff --git a/src/soc/nvidia/tegra210/Makefile.inc b/src/soc/nvidia/tegra210/Makefile.inc index 756d413..a2b50c9 100644 --- a/src/soc/nvidia/tegra210/Makefile.inc +++ b/src/soc/nvidia/tegra210/Makefile.inc @@ -12,7 +12,6 @@ bootblock-y += padconfig.c bootblock-y += power.c bootblock-y += funitcfg.c -bootblock-y += reset.c bootblock-y += ../tegra/gpio.c bootblock-y += ../tegra/i2c.c bootblock-y += ../tegra/pingroup.c @@ -41,7 +40,6 @@ romstage-y += ccplex.c romstage-y += clock.c romstage-y += cpu.c -romstage-y += reset.c romstage-y += spi.c romstage-y += i2c.c romstage-y += dma.c @@ -87,7 +85,6 @@ ramstage-y += monotonic_timer.c ramstage-y += padconfig.c ramstage-y += funitcfg.c -ramstage-y += reset.c ramstage-y += ram_code.c ramstage-y += ../tegra/apbmisc.c ramstage-y += ../tegra/gpio.c diff --git a/src/soc/nvidia/tegra210/reset.c b/src/soc/nvidia/tegra210/reset.c deleted file mode 100644 index 38a97d8..0000000 --- a/src/soc/nvidia/tegra210/reset.c +++ /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. - */ - -#include <reset.h> - -/* - * Promote cpu_reset() to a hard_reset(). A shallower reset can be added, - * if needed, at a later time. - */ -void cpu_reset(void) -{ - hard_reset(); -}