diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2016-06-22 22:50:10 +0300 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2017-03-09 12:47:02 +0100 |
| commit | 86ee4db0d89dfd53a4e153db8e89888a0c762e3e (patch) | |
| tree | 7b124a2d3130c5f54262bac821ae9e7e270c920b | |
| parent | 055be5d1e59bbe85c79db6002aea12f31e429a54 (diff) | |
AGESA: Use printk for IDS output
In all simplicity, with board/OptionsIds.h file having:
IDSOPT_IDS_ENABLED TRUE
IDSOPT_TRACING_ENABLED TRUE
And src/Kconfig modified to:
config WARNINGS_ARE_ERRORS
default n
With these settings AGESA outputs complete debugging log
where-ever you have your coreboot console configured.
Change-Id: Ie5c0de6358b294160f9bf0a202161722f88059c1
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/15320
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Tested-by: build bot (Jenkins)
| -rw-r--r-- | src/vendorcode/amd/agesa/f14/Include/Ids.h | 16 | ||||
| -rw-r--r-- | src/vendorcode/amd/agesa/f15/Include/Ids.h | 29 | ||||
| -rw-r--r-- | src/vendorcode/amd/agesa/f15tn/Include/Ids.h | 16 | ||||
| -rw-r--r-- | src/vendorcode/amd/agesa/f16kb/Include/Ids.h | 16 |
4 files changed, 17 insertions, 60 deletions
diff --git a/src/vendorcode/amd/agesa/f14/Include/Ids.h b/src/vendorcode/amd/agesa/f14/Include/Ids.h index 451c4d6c8f..fa02ec8c23 100644 --- a/src/vendorcode/amd/agesa/f14/Include/Ids.h +++ b/src/vendorcode/amd/agesa/f14/Include/Ids.h @@ -561,19 +561,11 @@ typedef enum { //vv- for debug reference only #define IDS_HDT_CONSOLE_S3_EXIT(x) #define IDS_HDT_CONSOLE_S3_AP_EXIT(x) - #if IDSOPT_C_OPTIMIZATION_DISABLED == TRUE - #ifdef __GNUC__ - #define IDS_HDT_CONSOLE(f, s, ...) - #else - #define IDS_HDT_CONSOLE(f, s, ...) - #endif + #ifndef __GNUC__ + #pragma warning(disable: 4127) + #define IDS_HDT_CONSOLE(f, s, ...) #else - #ifndef __GNUC__ - #pragma warning(disable: 4127) - #define IDS_HDT_CONSOLE(f, s, ...) - #else - #define IDS_HDT_CONSOLE(f, s, ...) printk (BIOS_DEBUG, s, ##__VA_ARGS__); - #endif + #define IDS_HDT_CONSOLE(f, s, ...) printk (BIOS_DEBUG, s, ##__VA_ARGS__); #endif #define IDS_HDT_CONSOLE_FLUSH_BUFFER(x) diff --git a/src/vendorcode/amd/agesa/f15/Include/Ids.h b/src/vendorcode/amd/agesa/f15/Include/Ids.h index 07ceeaf603..e980688711 100644 --- a/src/vendorcode/amd/agesa/f15/Include/Ids.h +++ b/src/vendorcode/amd/agesa/f15/Include/Ids.h @@ -530,30 +530,11 @@ typedef enum { //vv- for debug reference only #define IDS_HDT_CONSOLE_S3_EXIT(x) #define IDS_HDT_CONSOLE_S3_AP_EXIT(x) - #ifdef __GNUC__ - #if CONFIG_REDIRECT_IDS_HDT_CONSOLE_TO_SERIAL - /* print all*/ - //#define IDS_HDT_CONSOLE(f, s, args...) do {do_printk(BIOS_DEBUG, s, ##args);} while (0) - #define IDS_HDT_CONSOLE(f, s, args...) do {\ - if (f == MAIN_FLOW) {\ - do_printk(BIOS_DEBUG, s, ##args);\ - } else if (f == MEM_FLOW) {\ - do_printk(BIOS_DEBUG, s, ##args);\ - } else if (f == CPU_TRACE) {\ - do_printk(BIOS_DEBUG, s, ##args);\ - } else if (f == HT_TRACE) {\ - do_printk(BIOS_DEBUG, s, ##args);\ - } else if (f == GNB_TRACE) {\ - do_printk(BIOS_DEBUG, s, ##args);\ - } else if (f == FCH_TRACE) {\ - do_printk(BIOS_DEBUG, s, ##args);\ - }\ - } while(0) - #else - #define IDS_HDT_CONSOLE(s, args...) do {} while(0) - #endif - #else - #define IDS_HDT_CONSOLE(s, args...) + #ifndef __GNUC__ + #pragma warning(disable: 4127) + #define IDS_HDT_CONSOLE(f, s, ...) + #else + #define IDS_HDT_CONSOLE(f, s, ...) printk (BIOS_DEBUG, s, ##__VA_ARGS__); #endif #define IDS_HDT_CONSOLE_FLUSH_BUFFER(x) diff --git a/src/vendorcode/amd/agesa/f15tn/Include/Ids.h b/src/vendorcode/amd/agesa/f15tn/Include/Ids.h index b2cf9f35e5..95d726dac5 100644 --- a/src/vendorcode/amd/agesa/f15tn/Include/Ids.h +++ b/src/vendorcode/amd/agesa/f15tn/Include/Ids.h @@ -729,19 +729,11 @@ typedef enum { //vv- for debug reference only #define IDS_HDT_CONSOLE_EXIT(x) IDSOPT_CUSTOMIZE_TRACING_SERVICE_EXIT (x) #endif #else - #ifdef VA_ARGS_SUPPORTED - #if IDSOPT_C_OPTIMIZATION_DISABLED == TRUE - #define IDS_HDT_CONSOLE(f, s, ...) AmdIdsDebugPrint (f, s, __VA_ARGS__) - #else - #pragma warning(disable: 4127) - #define IDS_HDT_CONSOLE(f, s, ...) if (f == MEM_FLOW) AmdIdsDebugPrintMem (s, __VA_ARGS__); \ - else if (f == CPU_TRACE) AmdIdsDebugPrintCpu (s, __VA_ARGS__); \ - else if (f == HT_TRACE) AmdIdsDebugPrintHt (s, __VA_ARGS__); \ - else if (f == GNB_TRACE) AmdIdsDebugPrintGnb (s, __VA_ARGS__); \ - else AmdIdsDebugPrint (f, s, __VA_ARGS__) - #endif + #ifndef __GNUC__ + #pragma warning(disable: 4127) + #define IDS_HDT_CONSOLE(f, s, ...) #else - #define IDS_HDT_CONSOLE AmdIdsDebugPrint + #define IDS_HDT_CONSOLE(f, s, ...) printk (BIOS_DEBUG, s, ##__VA_ARGS__); #endif #define CONSOLE AmdIdsDebugPrintAll #endif diff --git a/src/vendorcode/amd/agesa/f16kb/Include/Ids.h b/src/vendorcode/amd/agesa/f16kb/Include/Ids.h index 53477cb866..5aa58f9e34 100644 --- a/src/vendorcode/amd/agesa/f16kb/Include/Ids.h +++ b/src/vendorcode/amd/agesa/f16kb/Include/Ids.h @@ -737,19 +737,11 @@ typedef enum { //vv- for debug reference only /// AGESA tracing service #if IDSOPT_TRACING_ENABLED == TRUE - #ifdef VA_ARGS_SUPPORTED - #if IDSOPT_C_OPTIMIZATION_DISABLED == TRUE - #define IDS_HDT_CONSOLE(f, s, ...) AmdIdsDebugPrint (f, s, __VA_ARGS__) - #else - #pragma warning(disable: 4127) - #define IDS_HDT_CONSOLE(f, s, ...) if (f == MEM_FLOW) AmdIdsDebugPrintMem (s, __VA_ARGS__); \ - else if (f == CPU_TRACE) AmdIdsDebugPrintCpu (s, __VA_ARGS__); \ - else if (f == HT_TRACE) AmdIdsDebugPrintHt (s, __VA_ARGS__); \ - else if (f == GNB_TRACE) AmdIdsDebugPrintGnb (s, __VA_ARGS__); \ - else AmdIdsDebugPrint (f, s, __VA_ARGS__) - #endif + #ifndef __GNUC__ + #pragma warning(disable: 4127) + #define IDS_HDT_CONSOLE(f, s, ...) #else - #define IDS_HDT_CONSOLE AmdIdsDebugPrint + #define IDS_HDT_CONSOLE(f, s, ...) printk (BIOS_DEBUG, s, ##__VA_ARGS__); #endif #define CONSOLE AmdIdsDebugPrintAll #define IDS_HDT_CONSOLE_DEBUG_CODE(Code) Code |