diff options
author | Angel Pons <th3fanbus@gmail.com> | 2021-05-09 12:54:52 +0200 |
---|---|---|
committer | David Hendricks <david.hendricks@gmail.com> | 2021-08-22 22:14:43 +0000 |
commit | 90afa3c28c14de77f94c7f07ca56e611029112b7 (patch) | |
tree | db61eb282df1fb60818af450ce94819ba06713b7 /src/mainboard/asus | |
parent | 2dc73aa4a79bbab7493193c6cec3e5c03e540111 (diff) |
AGESA f15tn: Drop `IDSOPT_ASSERT_ENABLED`
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 <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/53983
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Michał Żygowski <michal.zygowski@3mdeb.com>
Diffstat (limited to 'src/mainboard/asus')
-rw-r--r-- | src/mainboard/asus/a88xm-e/OptionsIds.h | 2 | ||||
-rw-r--r-- | src/mainboard/asus/f2a85-m/OptionsIds.h | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/src/mainboard/asus/a88xm-e/OptionsIds.h b/src/mainboard/asus/a88xm-e/OptionsIds.h index 33b0232a06..77b239db50 100644 --- a/src/mainboard/asus/a88xm-e/OptionsIds.h +++ b/src/mainboard/asus/a88xm-e/OptionsIds.h @@ -21,7 +21,6 @@ * IDSOPT_CONTROL_ENABLED * IDSOPT_TRACING_ENABLED * IDSOPT_PERF_ANALYSIS - * IDSOPT_ASSERT_ENABLED * IDSOPT_CAR_CORRUPTION_CHECK_ENABLED **/ @@ -30,6 +29,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/asus/f2a85-m/OptionsIds.h b/src/mainboard/asus/f2a85-m/OptionsIds.h index 130d8525ab..d109d2f95d 100644 --- a/src/mainboard/asus/f2a85-m/OptionsIds.h +++ b/src/mainboard/asus/f2a85-m/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 |