summaryrefslogtreecommitdiff
path: root/src/arch/i386/llshell
diff options
context:
space:
mode:
authorStefan Reinauer <stepan@coresystems.de>2010-04-01 09:50:32 +0000
committerStefan Reinauer <stepan@openbios.org>2010-04-01 09:50:32 +0000
commit0c781b2694b2c137d9761704954ea38be5ba8a15 (patch)
tree55c8bb4ea9f5875da7e4f7ffa6b5e7d2aa87a4b8 /src/arch/i386/llshell
parent84b685af5f1e1cf49c2c2f22ae80a8a0df8472f8 (diff)
- get rid of ASM_CONSOLE_LOGLEVEL except in two assembler files.
- start naming all versions of post code output "post_code()" Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5344 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/arch/i386/llshell')
-rw-r--r--src/arch/i386/llshell/console.inc174
-rw-r--r--src/arch/i386/llshell/ramtest.inc2
-rw-r--r--src/arch/i386/llshell/readme.coreboot2
3 files changed, 2 insertions, 176 deletions
diff --git a/src/arch/i386/llshell/console.inc b/src/arch/i386/llshell/console.inc
index fbe9d632bf..774c9cb158 100644
--- a/src/arch/i386/llshell/console.inc
+++ b/src/arch/i386/llshell/console.inc
@@ -234,180 +234,6 @@ jmp console0
#define CONSOLE_SPEW_TX_STRING(string) __CONSOLE_TX_STRING(string)
#define CONSOLE_SPEW_INLINE_TX_STRING(string) __CONSOLE_INLINE_TX_STRING(string)
-#if 0
-#if ASM_CONSOLE_LOGLEVEL <= BIOS_EMERG
-#undef CONSOLE_EMERG_TX_CHAR
-#undef CONSOLE_EMERG_INLINE_TX_CHAR
-#undef CONSOLE_EMERG_TX_HEX8
-#undef CONSOLE_EMERG_INLINE_TX_HEX8
-#undef CONSOLE_EMERG_TX_HEX32
-#undef CONSOLE_EMERG_INLINE_TX_HEX32
-#undef CONSOLE_EMERG_TX_STRING
-#undef CONSOLE_EMERG_INLINE_TX_STRING
-#define CONSOLE_EMERG_TX_CHAR(byte)
-#define CONSOLE_EMERG_INLINE_TX_CHAR(byte)
-#define CONSOLE_EMERG_TX_HEX8(byte)
-#define CONSOLE_EMERG_INLINE_TX_HEX8(byte)
-#define CONSOLE_EMERG_TX_HEX32(lword)
-#define CONSOLE_EMERG_INLINE_TX_HEX32(lword)
-#define CONSOLE_EMERG_TX_STRING(string)
-#define CONSOLE_EMERG_INLINE_TX_STRING(string)
-#endif
-
-
-#if ASM_CONSOLE_LOGLEVEL <= BIOS_ALERT
-#undef CONSOLE_ALERT_TX_CHAR
-#undef CONSOLE_ALERT_INLINE_TX_CHAR
-#undef CONSOLE_ALERT_TX_HEX8
-#undef CONSOLE_ALERT_INLINE_TX_HEX8
-#undef CONSOLE_ALERT_TX_HEX32
-#undef CONSOLE_ALERT_INLINE_TX_HEX32
-#undef CONSOLE_ALERT_TX_STRING
-#undef CONSOLE_ALERT_INLINE_TX_STRING
-#define CONSOLE_ALERT_TX_CHAR(byte)
-#define CONSOLE_ALERT_INLINE_TX_CHAR(byte)
-#define CONSOLE_ALERT_TX_HEX8(byte)
-#define CONSOLE_ALERT_INLINE_TX_HEX8(byte)
-#define CONSOLE_ALERT_TX_HEX32(lword)
-#define CONSOLE_ALERT_INLINE_TX_HEX32(lword)
-#define CONSOLE_ALERT_TX_STRING(string)
-#define CONSOLE_ALERT_INLINE_TX_STRING(string)
-#endif
-
-#if ASM_CONSOLE_LOGLEVEL <= BIOS_CRIT
-#undef CONSOLE_CRIT_TX_CHAR
-#undef CONSOLE_CRIT_INLINE_TX_CHAR
-#undef CONSOLE_CRIT_TX_HEX8
-#undef CONSOLE_CRIT_INLINE_TX_HEX8
-#undef CONSOLE_CRIT_TX_HEX32
-#undef CONSOLE_CRIT_INLINE_TX_HEX32
-#undef CONSOLE_CRIT_TX_STRING
-#undef CONSOLE_CRIT_INLINE_TX_STRING
-#define CONSOLE_CRIT_TX_CHAR(byte)
-#define CONSOLE_CRIT_INLINE_TX_CHAR(byte)
-#define CONSOLE_CRIT_TX_HEX8(byte)
-#define CONSOLE_CRIT_INLINE_TX_HEX8(byte)
-#define CONSOLE_CRIT_TX_HEX32(lword)
-#define CONSOLE_CRIT_INLINE_TX_HEX32(lword)
-#define CONSOLE_CRIT_TX_STRING(string)
-#define CONSOLE_CRIT_INLINE_TX_STRING(string)
-#endif
-
-#if ASM_CONSOLE_LOGLEVEL <= BIOS_ERR
-#undef CONSOLE_ERR_TX_CHAR
-#undef CONSOLE_ERR_INLINE_TX_CHAR
-#undef CONSOLE_ERR_TX_HEX8
-#undef CONSOLE_ERR_INLINE_TX_HEX8
-#undef CONSOLE_ERR_TX_HEX32
-#undef CONSOLE_ERR_INLINE_TX_HEX32
-#undef CONSOLE_ERR_TX_STRING
-#undef CONSOLE_ERR_INLINE_TX_STRING
-#define CONSOLE_ERR_TX_CHAR(byte)
-#define CONSOLE_ERR_INLINE_TX_CHAR(byte)
-#define CONSOLE_ERR_TX_HEX8(byte)
-#define CONSOLE_ERR_INLINE_TX_HEX8(byte)
-#define CONSOLE_ERR_TX_HEX32(lword)
-#define CONSOLE_ERR_INLINE_TX_HEX32(lword)
-#define CONSOLE_ERR_TX_STRING(string)
-#define CONSOLE_ERR_INLINE_TX_STRING(string)
-#endif
-
-#if ASM_CONSOLE_LOGLEVEL <= BIOS_WARNING
-#undef CONSOLE_WARNING_TX_CHAR
-#undef CONSOLE_WARNING_INLINE_TX_CHAR
-#undef CONSOLE_WARNING_TX_HEX8
-#undef CONSOLE_WARNING_INLINE_TX_HEX8
-#undef CONSOLE_WARNING_TX_HEX32
-#undef CONSOLE_WARNING_INLINE_TX_HEX32
-#undef CONSOLE_WARNING_TX_STRING
-#undef CONSOLE_WARNING_INLINE_TX_STRING
-#define CONSOLE_WARNING_TX_CHAR(byte)
-#define CONSOLE_WARNING_INLINE_TX_CHAR(byte)
-#define CONSOLE_WARNING_TX_HEX8(byte)
-#define CONSOLE_WARNING_INLINE_TX_HEX8(byte)
-#define CONSOLE_WARNING_TX_HEX32(lword)
-#define CONSOLE_WARNING_INLINE_TX_HEX32(lword)
-#define CONSOLE_WARNING_TX_STRING(string)
-#define CONSOLE_WARNING_INLINE_TX_STRING(string)
-#endif
-
-#if ASM_CONSOLE_LOGLEVEL <= BIOS_NOTICE
-#undef CONSOLE_NOTICE_TX_CHAR
-#undef CONSOLE_NOTICE_INLINE_TX_CHAR
-#undef CONSOLE_NOTICE_TX_HEX8
-#undef CONSOLE_NOTICE_INLINE_TX_HEX8
-#undef CONSOLE_NOTICE_TX_HEX32
-#undef CONSOLE_NOTICE_INLINE_TX_HEX32
-#undef CONSOLE_NOTICE_TX_STRING
-#undef CONSOLE_NOTICE_INLINE_TX_STRING
-#define CONSOLE_NOTICE_TX_CHAR(byte)
-#define CONSOLE_NOTICE_INLINE_TX_CHAR(byte)
-#define CONSOLE_NOTICE_TX_HEX8(byte)
-#define CONSOLE_NOTICE_INLINE_TX_HEX8(byte)
-#define CONSOLE_NOTICE_TX_HEX32(lword)
-#define CONSOLE_NOTICE_INLINE_TX_HEX32(lword)
-#define CONSOLE_NOTICE_TX_STRING(string)
-#define CONSOLE_NOTICE_INLINE_TX_STRING(string)
-#endif
-
-#if ASM_CONSOLE_LOGLEVEL <= BIOS_INFO
-#undef CONSOLE_INFO_TX_CHAR
-#undef CONSOLE_INFO_INLINE_TX_CHAR
-#undef CONSOLE_INFO_TX_HEX8
-#undef CONSOLE_INFO_INLINE_TX_HEX8
-#undef CONSOLE_INFO_TX_HEX32
-#undef CONSOLE_INFO_INLINE_TX_HEX32
-#undef CONSOLE_INFO_TX_STRING
-#undef CONSOLE_INFO_INLINE_TX_STRING
-#define CONSOLE_INFO_TX_CHAR(byte)
-#define CONSOLE_INFO_INLINE_TX_CHAR(byte)
-#define CONSOLE_INFO_TX_HEX8(byte)
-#define CONSOLE_INFO_INLINE_TX_HEX8(byte)
-#define CONSOLE_INFO_TX_HEX32(lword)
-#define CONSOLE_INFO_INLINE_TX_HEX32(lword)
-#define CONSOLE_INFO_TX_STRING(string)
-#define CONSOLE_INFO_INLINE_TX_STRING(string)
-#endif
-
-#if ASM_CONSOLE_LOGLEVEL <= BIOS_DEBUG
-#undef CONSOLE_DEBUG_TX_CHAR
-#undef CONSOLE_DEBUG_INLINE_TX_CHAR
-#undef CONSOLE_DEBUG_TX_HEX8
-#undef CONSOLE_DEBUG_INLINE_TX_HEX8
-#undef CONSOLE_DEBUG_TX_HEX32
-#undef CONSOLE_DEBUG_INLINE_TX_HEX32
-#undef CONSOLE_DEBUG_TX_STRING
-#undef CONSOLE_DEBUG_INLINE_TX_STRING
-#define CONSOLE_DEBUG_TX_CHAR(byte)
-#define CONSOLE_DEBUG_INLINE_TX_CHAR(byte)
-#define CONSOLE_DEBUG_TX_HEX8(byte)
-#define CONSOLE_DEBUG_INLINE_TX_HEX8(byte)
-#define CONSOLE_DEBUG_TX_HEX32(lword)
-#define CONSOLE_DEBUG_INLINE_TX_HEX32(lword)
-#define CONSOLE_DEBUG_TX_STRING(string)
-#define CONSOLE_DEBUG_INLINE_TX_STRING(string)
-#endif
-
-#if ASM_CONSOLE_LOGLEVEL <= BIOS_SPEW
-#undef CONSOLE_SPEW_TX_CHAR
-#undef CONSOLE_SPEW_INLINE_TX_CHAR
-#undef CONSOLE_SPEW_TX_HEX8
-#undef CONSOLE_SPEW_INLINE_TX_HEX8
-#undef CONSOLE_SPEW_TX_HEX32
-#undef CONSOLE_SPEW_INLINE_TX_HEX32
-#undef CONSOLE_SPEW_TX_STRING
-#undef CONSOLE_SPEW_INLINE_TX_STRING
-#define CONSOLE_SPEW_TX_CHAR(byte)
-#define CONSOLE_SPEW_INLINE_TX_CHAR(byte)
-#define CONSOLE_SPEW_TX_HEX8(byte)
-#define CONSOLE_SPEW_INLINE_TX_HEX8(byte)
-#define CONSOLE_SPEW_TX_HEX32(lword)
-#define CONSOLE_SPEW_INLINE_TX_HEX32(lword)
-#define CONSOLE_SPEW_TX_STRING(string)
-#define CONSOLE_SPEW_INLINE_TX_STRING(string)
-#endif
-#endif
-
/* uses: esp, ax, dx */
console_tx_al:
__CONSOLE_INLINE_TX_AL
diff --git a/src/arch/i386/llshell/ramtest.inc b/src/arch/i386/llshell/ramtest.inc
index dfe06adf71..910f01608f 100644
--- a/src/arch/i386/llshell/ramtest.inc
+++ b/src/arch/i386/llshell/ramtest.inc
@@ -112,7 +112,7 @@ ramtest:
jmp 3b
5:
CONSOLE_INFO_TX_STRING($rt_toomany)
- intel_chip_post_macro(0xf1)
+ post_code(0xf1)
jmp .Lhlt
6:
diff --git a/src/arch/i386/llshell/readme.coreboot b/src/arch/i386/llshell/readme.coreboot
index fb23d1a9d4..ae7dcbecd0 100644
--- a/src/arch/i386/llshell/readme.coreboot
+++ b/src/arch/i386/llshell/readme.coreboot
@@ -16,7 +16,7 @@ llshell_ret1:
3) Optionally, comment out two lines in ramtest.inc:
5:
CONSOLE_INFO_TX_STRING($rt_toomany)
- // intel_chip_post_macro(0xf1)
+ // post_code(0xf1)
// jmp .Lhlt
otherwise, a ramtest failure will hang