<p>Patrick Georgi <strong>merged</strong> this change.</p><p><a href="https://review.coreboot.org/29046">View Change</a></p><div style="white-space:pre-wrap">Approvals:
build bot (Jenkins): Verified
Patrick Rudolph: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/cavium/cn81xx: Drop dead do_soft_reset() implementation<br><br>Change-Id: I85f357739220f16497f65df1bb317d9d6eb54d9f<br>Signed-off-by: Nico Huber <nico.h@gmx.de><br>Reviewed-on: https://review.coreboot.org/29046<br>Tested-by: build bot (Jenkins) <no-reply@coreboot.org><br>Reviewed-by: Patrick Rudolph <siro@das-labor.org><br>---<br>M src/soc/cavium/cn81xx/Makefile.inc<br>M src/soc/cavium/cn81xx/include/soc/addressmap.h<br>D src/soc/cavium/cn81xx/reset.c<br>3 files changed, 0 insertions(+), 28 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/soc/cavium/cn81xx/Makefile.inc b/src/soc/cavium/cn81xx/Makefile.inc</span><br><span>index d212715..ede7d73 100644</span><br><span>--- a/src/soc/cavium/cn81xx/Makefile.inc</span><br><span>+++ b/src/soc/cavium/cn81xx/Makefile.inc</span><br><span>@@ -25,7 +25,6 @@</span><br><span> bootblock-y += spi.c</span><br><span> bootblock-y += uart.c</span><br><span> bootblock-y += cpu.c</span><br><span style="color: hsl(0, 100%, 40%);">-bootblock-y += reset.c</span><br><span> ifeq ($(CONFIG_BOOTBLOCK_CONSOLE),y)</span><br><span> bootblock-$(CONFIG_DRIVERS_UART) += uart.c</span><br><span> endif</span><br><span>@@ -40,7 +39,6 @@</span><br><span> verstage-y += spi.c</span><br><span> verstage-$(CONFIG_DRIVERS_UART) += uart.c</span><br><span> verstage-y += cbmem.c</span><br><span style="color: hsl(0, 100%, 40%);">-verstage-y += reset.c</span><br><span> </span><br><span> ################################################################################</span><br><span> # romstage</span><br><span>@@ -53,7 +51,6 @@</span><br><span> romstage-y += uart.c</span><br><span> romstage-$(CONFIG_DRIVERS_UART) += uart.c</span><br><span> romstage-y += cbmem.c</span><br><span style="color: hsl(0, 100%, 40%);">-romstage-y += reset.c</span><br><span> </span><br><span> romstage-y += sdram.c</span><br><span> romstage-y += mmu.c</span><br><span>@@ -74,7 +71,6 @@</span><br><span> ramstage-y += cpu_secondary.S</span><br><span> ramstage-y += ecam0.c</span><br><span> ramstage-y += cbmem.c</span><br><span style="color: hsl(0, 100%, 40%);">-ramstage-y += reset.c</span><br><span> </span><br><span> ramstage-$(CONFIG_ARM64_USE_ARM_TRUSTED_FIRMWARE) += bl31_plat_params.c</span><br><span> </span><br><span>diff --git a/src/soc/cavium/cn81xx/include/soc/addressmap.h b/src/soc/cavium/cn81xx/include/soc/addressmap.h</span><br><span>index f188961..f698306 100644</span><br><span>--- a/src/soc/cavium/cn81xx/include/soc/addressmap.h</span><br><span>+++ b/src/soc/cavium/cn81xx/include/soc/addressmap.h</span><br><span>@@ -62,7 +62,6 @@</span><br><span> </span><br><span> /* RST */</span><br><span> #define RST_PF_BAR0 (0x87E006000000ULL + 0x1600)</span><br><span style="color: hsl(0, 100%, 40%);">-#define RST_SOFT_RESET (RST_PF_BAR0 + 0x80ULL)</span><br><span> #define RST_PP_AVAILABLE (RST_PF_BAR0 + 0x138ULL)</span><br><span> #define RST_PP_RESET (RST_PF_BAR0 + 0x140ULL)</span><br><span> #define RST_PP_PENDING (RST_PF_BAR0 + 0x148ULL)</span><br><span>diff --git a/src/soc/cavium/cn81xx/reset.c b/src/soc/cavium/cn81xx/reset.c</span><br><span>deleted file mode 100644</span><br><span>index d3be7c9..0000000</span><br><span>--- a/src/soc/cavium/cn81xx/reset.c</span><br><span>+++ /dev/null</span><br><span>@@ -1,23 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-/*</span><br><span style="color: hsl(0, 100%, 40%);">- * This file is part of the coreboot project.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * Copyright 2018-present Facebook, Inc.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(0, 100%, 40%);">- * it under the terms of the GNU General Public License as published by</span><br><span style="color: hsl(0, 100%, 40%);">- * the Free Software Foundation; version 2 of the License.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(0, 100%, 40%);">- * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(0, 100%, 40%);">- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(0, 100%, 40%);">- * GNU General Public License for more details.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <arch/io.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <soc/addressmap.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <reset.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void do_soft_reset(void)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- write64((void *)RST_SOFT_RESET, 1);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/29046">change 29046</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/29046"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I85f357739220f16497f65df1bb317d9d6eb54d9f </div>
<div style="display:none"> Gerrit-Change-Number: 29046 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Nico Huber <nico.h@gmx.de> </div>
<div style="display:none"> Gerrit-Reviewer: Patrick Georgi <pgeorgi@google.com> </div>
<div style="display:none"> Gerrit-Reviewer: Patrick Rudolph <siro@das-labor.org> </div>
<div style="display:none"> Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org> </div>