<p>Richard Spiegel has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/28296">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vendorcode/amd/pi/00670F00/Include/Ids.h: Remove IDS_ERROR_TRAP<br><br>The macro IDS_ERROR_TRAP is only defined, and never used. Also,<br>IDSOPT_ERROR_TRAP_ENABLED is defined FALSE, so the macro would translate<br>to nothing. Remove the macro and IDSOPT_ERROR_TRAP_ENABLED.<br><br>BUG=b:112885948<br>TEST=Build grunt<br><br>Change-Id: I2c3ca4b0a4a1f96f245ba2f4902fd0051dda77ef<br>Signed-off-by: Richard Spiegel <richard.spiegel@silverbackltd.com><br>---<br>M src/vendorcode/amd/pi/00670F00/Include/Ids.h<br>M src/vendorcode/amd/pi/00670F00/binaryPI/OptionsIds.h<br>2 files changed, 0 insertions(+), 32 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/96/28296/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/vendorcode/amd/pi/00670F00/Include/Ids.h b/src/vendorcode/amd/pi/00670F00/Include/Ids.h</span><br><span>index 96943cf..1cf390d 100644</span><br><span>--- a/src/vendorcode/amd/pi/00670F00/Include/Ids.h</span><br><span>+++ b/src/vendorcode/amd/pi/00670F00/Include/Ids.h</span><br><span>@@ -271,10 +271,6 @@</span><br><span> #define IDSOPT_ASSERT_ENABLED FALSE</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#ifndef IDSOPT_ERROR_TRAP_ENABLED</span><br><span style="color: hsl(0, 100%, 40%);">- #define IDSOPT_ERROR_TRAP_ENABLED FALSE</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> #ifndef IDSOPT_CAR_CORRUPTION_CHECK_ENABLED</span><br><span> #define IDSOPT_CAR_CORRUPTION_CHECK_ENABLED FALSE</span><br><span> #endif</span><br><span>@@ -313,7 +309,6 @@</span><br><span> #undef IDSOPT_PERF_ANALYSIS</span><br><span> #undef IDSOPT_HEAP_CHECKING</span><br><span> #undef IDSOPT_ASSERT_ENABLED</span><br><span style="color: hsl(0, 100%, 40%);">- #undef IDSOPT_ERROR_TRAP_ENABLED</span><br><span> #undef IDSOPT_CAR_CORRUPTION_CHECK_ENABLED</span><br><span> #undef IDSOPT_DEBUG_CODE_ENABLED</span><br><span> #undef IDSOPT_TRACE_USER_OPTIONS</span><br><span>@@ -327,7 +322,6 @@</span><br><span> #define IDSOPT_PERF_ANALYSIS FALSE</span><br><span> #define IDSOPT_HEAP_CHECKING FALSE</span><br><span> #define IDSOPT_ASSERT_ENABLED FALSE</span><br><span style="color: hsl(0, 100%, 40%);">- #define IDSOPT_ERROR_TRAP_ENABLED FALSE</span><br><span> #define IDSOPT_CAR_CORRUPTION_CHECK_ENABLED FALSE</span><br><span> #define IDSOPT_DEBUG_CODE_ENABLED FALSE</span><br><span> #define IDSOPT_TRACE_USER_OPTIONS FALSE</span><br><span>@@ -471,8 +465,6 @@</span><br><span> #endif</span><br><span> </span><br><span> #if IDSOPT_CAR_CORRUPTION_CHECK_ENABLED == TRUE</span><br><span style="color: hsl(0, 100%, 40%);">- #undef IDSOPT_ERROR_TRAP_ENABLED</span><br><span style="color: hsl(0, 100%, 40%);">- #define IDSOPT_ERROR_TRAP_ENABLED TRUE</span><br><span> #define IDS_CAR_CORRUPTION_CHECK(StdHeader) IdsCarCorruptionCheck(StdHeader)</span><br><span> #else</span><br><span> #define IDS_CAR_CORRUPTION_CHECK(StdHeader)</span><br><span>@@ -490,26 +482,6 @@</span><br><span> #endif</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/**</span><br><span style="color: hsl(0, 100%, 40%);">- * @def IDS_ERROR_TRAP</span><br><span style="color: hsl(0, 100%, 40%);">- * Trap AGESA Error events with stop code display.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * Works similarly to use of "ASSERT (FALSE);"</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%);">-#if IDSOPT_ERROR_TRAP_ENABLED == TRUE</span><br><span style="color: hsl(0, 100%, 40%);">- #ifdef STOP_CODE</span><br><span style="color: hsl(0, 100%, 40%);">- #undef STOP_CODE</span><br><span style="color: hsl(0, 100%, 40%);">- #endif</span><br><span style="color: hsl(0, 100%, 40%);">- #define STOP_CODE (((UINT32)FILECODE)*0x10000ul + \</span><br><span style="color: hsl(0, 100%, 40%);">- ((__LINE__) % 10) + (((__LINE__ / 10) % 10)*0x10) + \</span><br><span style="color: hsl(0, 100%, 40%);">- (((__LINE__ / 100) % 10)*0x100) + (((__LINE__ / 1000) % 10)*0x1000))</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- #define IDS_ERROR_TRAP IdsErrorStop (STOP_CODE)</span><br><span style="color: hsl(0, 100%, 40%);">-#else</span><br><span style="color: hsl(0, 100%, 40%);">- #define IDS_ERROR_TRAP</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> ///give the extended Macro default value</span><br><span> #ifndef __IDS_EXTENDED__</span><br><span> #define IDS_EXTENDED_HOOK(idsoption, dataptr, idsnvptr, stdheader) IDS_SUCCESS</span><br><span>diff --git a/src/vendorcode/amd/pi/00670F00/binaryPI/OptionsIds.h b/src/vendorcode/amd/pi/00670F00/binaryPI/OptionsIds.h</span><br><span>index 5811eb0..4cd0575 100644</span><br><span>--- a/src/vendorcode/amd/pi/00670F00/binaryPI/OptionsIds.h</span><br><span>+++ b/src/vendorcode/amd/pi/00670F00/binaryPI/OptionsIds.h</span><br><span>@@ -55,7 +55,6 @@</span><br><span> * Module are listed below:</span><br><span> *</span><br><span> * IDSOPT_IDS_ENABLED</span><br><span style="color: hsl(0, 100%, 40%);">- * IDSOPT_ERROR_TRAP_ENABLED</span><br><span> * IDSOPT_CONTROL_ENABLED</span><br><span> *</span><br><span> * Warning: When you enable the IDSOPT_CONTROL_NV_TO_CMOS feature.</span><br><span>@@ -96,8 +95,6 @@</span><br><span> *</span><br><span> **/</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define IDSOPT_ERROR_TRAP_ENABLED FALSE</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> #define IDS_MMAP_SERIAL_PORT</span><br><span> </span><br><span> #ifdef DEBUG</span><br><span>@@ -122,7 +119,6 @@</span><br><span> //#define IDSOPT_ASSERT_ENABLED TRUE</span><br><span> #else</span><br><span> #define IDSOPT_IDS_ENABLED FALSE</span><br><span style="color: hsl(0, 100%, 40%);">-//#define IDSOPT_ERROR_TRAP_ENABLED FALSE</span><br><span> //#define IDSOPT_CONTROL_ENABLED FALSE</span><br><span> #define IDSOPT_TRACING_ENABLED FALSE</span><br><span> #define IDSOPT_TRACING_CONSOLE_SERIALPORT TRUE</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/28296">change 28296</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/28296"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I2c3ca4b0a4a1f96f245ba2f4902fd0051dda77ef </div>
<div style="display:none"> Gerrit-Change-Number: 28296 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Richard Spiegel <richard.spiegel@silverbackltd.com> </div>