From 65bba289ee81da76b900719293da762ed78d19e7 Mon Sep 17 00:00:00 2001 From: Richard Spiegel Date: Thu, 23 Aug 2018 14:09:02 -0700 Subject: vendorcode/amd/pi/00670F00/Include/Ids.h: Remove IDS_ERROR_TRAP The macro IDS_ERROR_TRAP is only defined, and never used. Also, IDSOPT_ERROR_TRAP_ENABLED is defined FALSE, so the macro would translate to nothing. Remove the macro and IDSOPT_ERROR_TRAP_ENABLED. BUG=b:112885948 TEST=Build grunt Change-Id: I2c3ca4b0a4a1f96f245ba2f4902fd0051dda77ef Signed-off-by: Richard Spiegel Reviewed-on: https://review.coreboot.org/28296 Tested-by: build bot (Jenkins) Reviewed-by: Marshall Dawson --- src/vendorcode/amd/pi/00670F00/Include/Ids.h | 28 ---------------------- .../amd/pi/00670F00/binaryPI/OptionsIds.h | 4 ---- 2 files changed, 32 deletions(-) (limited to 'src/vendorcode/amd') diff --git a/src/vendorcode/amd/pi/00670F00/Include/Ids.h b/src/vendorcode/amd/pi/00670F00/Include/Ids.h index 96943cf40f..1cf390d522 100644 --- a/src/vendorcode/amd/pi/00670F00/Include/Ids.h +++ b/src/vendorcode/amd/pi/00670F00/Include/Ids.h @@ -271,10 +271,6 @@ typedef enum { //vv- for debug reference only #define IDSOPT_ASSERT_ENABLED FALSE #endif -#ifndef IDSOPT_ERROR_TRAP_ENABLED - #define IDSOPT_ERROR_TRAP_ENABLED FALSE -#endif - #ifndef IDSOPT_CAR_CORRUPTION_CHECK_ENABLED #define IDSOPT_CAR_CORRUPTION_CHECK_ENABLED FALSE #endif @@ -313,7 +309,6 @@ typedef enum { //vv- for debug reference only #undef IDSOPT_PERF_ANALYSIS #undef IDSOPT_HEAP_CHECKING #undef IDSOPT_ASSERT_ENABLED - #undef IDSOPT_ERROR_TRAP_ENABLED #undef IDSOPT_CAR_CORRUPTION_CHECK_ENABLED #undef IDSOPT_DEBUG_CODE_ENABLED #undef IDSOPT_TRACE_USER_OPTIONS @@ -327,7 +322,6 @@ typedef enum { //vv- for debug reference only #define IDSOPT_PERF_ANALYSIS FALSE #define IDSOPT_HEAP_CHECKING FALSE #define IDSOPT_ASSERT_ENABLED FALSE - #define IDSOPT_ERROR_TRAP_ENABLED FALSE #define IDSOPT_CAR_CORRUPTION_CHECK_ENABLED FALSE #define IDSOPT_DEBUG_CODE_ENABLED FALSE #define IDSOPT_TRACE_USER_OPTIONS FALSE @@ -471,8 +465,6 @@ typedef enum { //vv- for debug reference only #endif #if IDSOPT_CAR_CORRUPTION_CHECK_ENABLED == TRUE - #undef IDSOPT_ERROR_TRAP_ENABLED - #define IDSOPT_ERROR_TRAP_ENABLED TRUE #define IDS_CAR_CORRUPTION_CHECK(StdHeader) IdsCarCorruptionCheck(StdHeader) #else #define IDS_CAR_CORRUPTION_CHECK(StdHeader) @@ -490,26 +482,6 @@ typedef enum { //vv- for debug reference only #endif #endif -/** - * @def IDS_ERROR_TRAP - * Trap AGESA Error events with stop code display. - * - * Works similarly to use of "ASSERT (FALSE);" - * - */ -#if IDSOPT_ERROR_TRAP_ENABLED == TRUE - #ifdef STOP_CODE - #undef STOP_CODE - #endif - #define STOP_CODE (((UINT32)FILECODE)*0x10000ul + \ - ((__LINE__) % 10) + (((__LINE__ / 10) % 10)*0x10) + \ - (((__LINE__ / 100) % 10)*0x100) + (((__LINE__ / 1000) % 10)*0x1000)) - - #define IDS_ERROR_TRAP IdsErrorStop (STOP_CODE) -#else - #define IDS_ERROR_TRAP -#endif - ///give the extended Macro default value #ifndef __IDS_EXTENDED__ #define IDS_EXTENDED_HOOK(idsoption, dataptr, idsnvptr, stdheader) IDS_SUCCESS diff --git a/src/vendorcode/amd/pi/00670F00/binaryPI/OptionsIds.h b/src/vendorcode/amd/pi/00670F00/binaryPI/OptionsIds.h index 5811eb07c4..4cd0575d25 100644 --- a/src/vendorcode/amd/pi/00670F00/binaryPI/OptionsIds.h +++ b/src/vendorcode/amd/pi/00670F00/binaryPI/OptionsIds.h @@ -55,7 +55,6 @@ * Module are listed below: * * IDSOPT_IDS_ENABLED - * IDSOPT_ERROR_TRAP_ENABLED * IDSOPT_CONTROL_ENABLED * * Warning: When you enable the IDSOPT_CONTROL_NV_TO_CMOS feature. @@ -96,8 +95,6 @@ * **/ -#define IDSOPT_ERROR_TRAP_ENABLED FALSE - #define IDS_MMAP_SERIAL_PORT #ifdef DEBUG @@ -122,7 +119,6 @@ //#define IDSOPT_ASSERT_ENABLED TRUE #else #define IDSOPT_IDS_ENABLED FALSE -//#define IDSOPT_ERROR_TRAP_ENABLED FALSE //#define IDSOPT_CONTROL_ENABLED FALSE #define IDSOPT_TRACING_ENABLED FALSE #define IDSOPT_TRACING_CONSOLE_SERIALPORT TRUE -- cgit v1.2.3