From 90afa3c28c14de77f94c7f07ca56e611029112b7 Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Sun, 9 May 2021 12:54:52 +0200 Subject: AGESA f15tn: Drop `IDSOPT_ASSERT_ENABLED` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The `ASSERT` macro is already defined in `src/include/assert.h`, and AGESA's definition is never used. On Asus A88XM-E, toggling the value of the `IDSOPT_ASSERT_ENABLED` macro does not change the resulting binary when using reproducible builds. Attempting to use AGESA's definition of the `ASSERT` macro results in build errors: In file included from src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuDmi.c:56: src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuDmi.c: In function 'GetType4Type7Info': src/vendorcode/amd/agesa/f15tn/Include/Ids.h:371:33: error: statement with no effect [-Werror=unused-value] #define ASSERT(conditional) ((conditional) ? 0 : IdsAssert (STOP_CODE)); Given that coreboot's definition of `ASSERT` is more useful, drop AGESA's broken definition and the useless `IDSOPT_ASSERT_ENABLED` macro. Also remove the `IdsAssert` function, as it is no longer used anywhere. Tested with BUILD_TIMELESS=1, Asus A88XM-E remains identical. Change-Id: Ia4e5dbfd3d2e5cec979b8b16fbc11d1ca8a0661e Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/coreboot/+/53983 Tested-by: build bot (Jenkins) Reviewed-by: Michał Żygowski --- src/mainboard/amd/parmer/OptionsIds.h | 2 -- src/mainboard/amd/thatcher/OptionsIds.h | 2 -- 2 files changed, 4 deletions(-) (limited to 'src/mainboard/amd') diff --git a/src/mainboard/amd/parmer/OptionsIds.h b/src/mainboard/amd/parmer/OptionsIds.h index 130d8525ab..d109d2f95d 100644 --- a/src/mainboard/amd/parmer/OptionsIds.h +++ b/src/mainboard/amd/parmer/OptionsIds.h @@ -23,7 +23,6 @@ * IDSOPT_CONTROL_ENABLED * IDSOPT_TRACING_ENABLED * IDSOPT_PERF_ANALYSIS - * IDSOPT_ASSERT_ENABLED * IDSOPT_CAR_CORRUPTION_CHECK_ENABLED * **/ @@ -33,6 +32,5 @@ //#define IDSOPT_TRACING_ENABLED TRUE #define IDSOPT_TRACING_CONSOLE_SERIALPORT TRUE //#define IDSOPT_PERF_ANALYSIS TRUE -#define IDSOPT_ASSERT_ENABLED TRUE #endif diff --git a/src/mainboard/amd/thatcher/OptionsIds.h b/src/mainboard/amd/thatcher/OptionsIds.h index 130d8525ab..d109d2f95d 100644 --- a/src/mainboard/amd/thatcher/OptionsIds.h +++ b/src/mainboard/amd/thatcher/OptionsIds.h @@ -23,7 +23,6 @@ * IDSOPT_CONTROL_ENABLED * IDSOPT_TRACING_ENABLED * IDSOPT_PERF_ANALYSIS - * IDSOPT_ASSERT_ENABLED * IDSOPT_CAR_CORRUPTION_CHECK_ENABLED * **/ @@ -33,6 +32,5 @@ //#define IDSOPT_TRACING_ENABLED TRUE #define IDSOPT_TRACING_CONSOLE_SERIALPORT TRUE //#define IDSOPT_PERF_ANALYSIS TRUE -#define IDSOPT_ASSERT_ENABLED TRUE #endif -- cgit v1.2.3