- get rid of ASM_CONSOLE_LOGLEVEL except in two assembler files.
authorStefan Reinauer <stepan@coresystems.de>
Thu, 1 Apr 2010 09:50:32 +0000 (09:50 +0000)
committerStefan Reinauer <stepan@openbios.org>
Thu, 1 Apr 2010 09:50:32 +0000 (09:50 +0000)
- 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

44 files changed:
src/arch/i386/include/arch/intel.h
src/arch/i386/init/bootblock_prologue.c
src/arch/i386/init/car.S
src/arch/i386/init/crt0.S.lb
src/arch/i386/lib/c_start.S
src/arch/i386/lib/printk_init.c
src/arch/i386/llshell/console.inc
src/arch/i386/llshell/ramtest.inc
src/arch/i386/llshell/readme.coreboot
src/console/console.c
src/cpu/amd/model_lx/cache_as_ram.inc
src/cpu/intel/model_106cx/cache_as_ram.inc
src/cpu/intel/model_6ex/cache_as_ram.inc
src/cpu/intel/model_6fx/cache_as_ram.inc
src/cpu/x86/32bit/entry32.inc
src/include/console/console.h
src/include/console/loglevel.h
src/mainboard/amd/db800/romstage.c
src/mainboard/amd/dbm690t/romstage.c
src/mainboard/amd/mahogany/romstage.c
src/mainboard/amd/norwich/romstage.c
src/mainboard/amd/pistachio/romstage.c
src/mainboard/artecgroup/dbe61/romstage.c
src/mainboard/broadcom/blast/romstage.c
src/mainboard/digitallogic/adl855pc/romstage.c
src/mainboard/digitallogic/msm586seg/romstage.c
src/mainboard/digitallogic/msm800sev/romstage.c
src/mainboard/iei/pcisa-lx-800-r10/romstage.c
src/mainboard/kontron/kt690/romstage.c
src/mainboard/lippert/roadrunner-lx/romstage.c
src/mainboard/lippert/spacerunner-lx/romstage.c
src/mainboard/msi/ms9185/romstage.c
src/mainboard/newisys/khepri/romstage.c
src/mainboard/pcengines/alix1c/romstage.c
src/mainboard/technexion/tim5690/romstage.c
src/mainboard/technexion/tim8690/romstage.c
src/mainboard/technologic/ts5300/romstage.c
src/mainboard/tyan/s2850/romstage.c
src/mainboard/tyan/s2881/romstage.c
src/mainboard/tyan/s2885/romstage.c
src/mainboard/winent/pl6064/romstage.c
src/northbridge/amd/gx2/pll_reset.c
src/northbridge/amd/lx/pll_reset.c
src/northbridge/amd/lx/raminit.c

index d276b32596b761cfd7637492b5b8ad634feb7c92..c6f90cca2e631c4d44ebb2436a4828a501c03c33 100644 (file)
@@ -45,10 +45,8 @@ label##_done:
        jmp *%esp
 
 
-/* originally this macro was from STPC BIOS */
-#define        intel_chip_post_macro(value)                     \
-       movb    $value, %al                             ; \
+#define        post_code(value)        \
+       movb    $value, %al;    \
        outb    %al, $0x80
 
-
 #endif /* ROM_INTEL_H */
index f921c3f8d094ffbaf89ac533bace1e7fbc5c5ac0..4baaa08a6eccf205cd1e844ea7ce9edaac9f6336 100644 (file)
@@ -33,5 +33,5 @@
 .section ".rom.data", "a", @progbits
 .section ".rom.text", "ax", @progbits
 
-       intel_chip_post_macro(0x01)             /* delay for chipsets */
+       post_code(0x01)             /* delay for chipsets */
 
index 107da7b222b3e9419381db2a2c8cc783ff907758..64743ef8fc2ee5304acf4400082cb437db6077bb 100644 (file)
@@ -54,7 +54,7 @@ __protected_stage0:
        /* Save the BIST result. */
        movl    %eax, %ebp
 
-       intel_chip_post_macro(0x01)
+       post_code(0x01)
 
        movw    $ROM_DATA_SEG, %ax
        movw    %ax, %ds
index c4206bf00748991743ca318ba228e4affde737fb..5e7a5fa8c71c44a828b732b9e7fe136c83804949 100644 (file)
 #include <arch/intel.h>
 #include <console/loglevel.h>  
 
+#ifndef ASM_CONSOLE_LOGLEVEL
+#define ASM_CONSOLE_LOGLEVEL CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
+#endif
+
 /*
  * This is the entry code the code in .reset section
  * jumps to this address.
@@ -33,7 +37,7 @@
 .section ".rom.data", "a", @progbits
 .section ".rom.text", "ax", @progbits
 
-       intel_chip_post_macro(0x01)             /* delay for chipsets */
+       post_code(0x01)             /* delay for chipsets */
 
 #include "crt0_includes.h"
 
@@ -61,7 +65,7 @@ __main:
         *      isn\'t really that big we just copy/clear using bytes, not
         *      double words.
         */
-       intel_chip_post_macro(0x11)             /* post 11 */
+       post_code(0x11)         /* post 11 */
 
        cld                             /* clear direction flag */
        
@@ -78,7 +82,7 @@ __main:
        call cbfs_and_run_core
 
 .Lhlt: 
-       intel_chip_post_macro(0xee)     /* post fe */
+       post_code(0xee) /* post fe */
        hlt
        jmp     .Lhlt
 
index 4ef59799a9ff3769932e178e60527851fe3c863b..312f0cb206c31e05582e2b3842a44db63da62440 100644 (file)
@@ -15,7 +15,7 @@ _start:
        movl    %eax, %fs
        movl    %eax, %gs
 
-       intel_chip_post_macro(0x13)             /* post 13 */
+       post_code(0x13)         /* post 13 */
 
        /** clear stack */
        cld
@@ -74,7 +74,7 @@ _start:
         *      bss is cleared.   Now we call the main routine and
         *      let it do the rest.
         */ 
-       intel_chip_post_macro(0xfe)     /* post fe */
+       post_code(0xfe) /* post fe */
 
        /* Restore the stack location */
        movl    %ebp, %esp
@@ -83,7 +83,7 @@ _start:
        call    hardwaremain
        /*NOTREACHED*/
 .Lhlt:
-       intel_chip_post_macro(0xee)     /* post ee */
+       post_code(0xee) /* post ee */
        hlt
        jmp     .Lhlt
        
index f3add87111069aa81d4f741686f4a1aaf4602eaa..d3064046f7b51bdc6c944a82ead7ac207b634422 100644 (file)
 
 #include <console/console.h>
 #include <console/vtxprintf.h>
-#include <console/loglevel.h>
 #include <uart8250.h>
 
-/* Using a global varible can cause problems when we reset the stack 
- * from cache as ram to ram. If we make this a define USE_SHARED_STACK
- * we could use the same code on all architectures.
- */
-#if 0
-int console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL;
-#else
-#define console_loglevel CONFIG_DEFAULT_CONSOLE_LOGLEVEL
-#endif
-
 static void console_tx_byte(unsigned char byte)
 {
        if (byte == '\n')
index fbe9d632bf07bd7af6a86ff62cbc9e1da1320109..774c9cb1584b9e25315ae9fcc0339e2beb646b68 100644 (file)
@@ -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
index dfe06adf71c10960b825853b54098cddde40ea31..910f01608f03f8fc1219009c2f8f8fb90a2a6c29 100644 (file)
@@ -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:
index fb23d1a9d4123272b3f70773733dadc6e7bbb149..ae7dcbecd05ea9ad26ed3eef0130bbdd6d5bcc86 100644 (file)
@@ -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
 
index 6b4173c8648efd188485553e7f6d0d5cf77f0ec0..327ad19017a5340b0f43e820051d418918bdf7c9 100644 (file)
@@ -76,7 +76,7 @@ int console_tst_byte(void)
 /*
  *    Write POST information
  */
-void post_code(uint8_t value)
+void post_code(u8 value)
 {
 #if !defined(CONFIG_NO_POST) || CONFIG_NO_POST==0
 #if CONFIG_SERIAL_POST==1
index 659e0141a83f7fc66e6f779951e57c87c27a401d..7e6a68a5ad4967ab039a4a7ca45df4415d342c5b 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#ifndef ASM_CONSOLE_LOGLEVEL
+#define ASM_CONSOLE_LOGLEVEL CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
+#endif
+
 #define        LX_STACK_BASE           CONFIG_DCACHE_RAM_BASE          /* this is where the DCache will be mapped and be used as stack, It would be cool if it was the same base as coreboot normal stack */
 #define        LX_STACK_END            LX_STACK_BASE+(CONFIG_DCACHE_RAM_SIZE-1)
 
@@ -206,7 +210,7 @@ __main:
         *      isn\'t really that big we just copy/clear using bytes, not
         *      double words.
         */
-       intel_chip_post_macro(0x11)             /* post 11 */
+       post_code(0x11)         /* post 11 */
 
        cld                             /* clear direction flag */
 
@@ -220,7 +224,7 @@ __main:
        call cbfs_and_run_core
 
 .Lhlt:
-       intel_chip_post_macro(0xee)     /* post fail ee */
+       post_code(0xee) /* post fail ee */
        hlt
        jmp     .Lhlt
 
index 4781b0521cc456e0b6099180f1a457c8a3936457..da42d4dc6624f43a92fa2932cd78cb5331087653 100644 (file)
@@ -20,7 +20,6 @@
 
 #define CACHE_AS_RAM_SIZE CONFIG_DCACHE_RAM_SIZE
 #define CACHE_AS_RAM_BASE CONFIG_DCACHE_RAM_BASE
-#define post_code(x) intel_chip_post_macro(x)
 
 #include <cpu/x86/mtrr.h>
 #include <cpu/amd/mtrr.h>
index 848c84d2c224773a6c7f9569313d5e73838bbf14..ad0567e102fee1b5881db9ce263c8d8c867f67cf 100644 (file)
@@ -20,7 +20,6 @@
 
 #define CACHE_AS_RAM_SIZE CONFIG_DCACHE_RAM_SIZE
 #define CACHE_AS_RAM_BASE CONFIG_DCACHE_RAM_BASE
-#define post_code(x) intel_chip_post_macro(x)
 
 #include <cpu/x86/mtrr.h>
 #include <cpu/amd/mtrr.h>
index 50f9608dcc85272deb5a3e29b42e45b222085b4b..b902b1dbf6bd385cebe7a5a5f687efb3a2534505 100644 (file)
@@ -20,7 +20,6 @@
 
 #define CACHE_AS_RAM_SIZE CONFIG_DCACHE_RAM_SIZE
 #define CACHE_AS_RAM_BASE CONFIG_DCACHE_RAM_BASE
-#define post_code(x) intel_chip_post_macro(x)
 
 #include <cpu/x86/mtrr.h>
 #include <cpu/amd/mtrr.h>
index 2cea40f8a71d8efcda5d98a2389cf132521dd950..bc5e4436aeaa09a37c667d10e27ed5d8a5ca26fc 100644 (file)
@@ -50,7 +50,7 @@ __protected_start:
        /* Save the BIST value */
        movl    %eax, %ebp
 
-       intel_chip_post_macro(0x10)     /* post 10 */
+       post_code(0x10) /* post 10 */
 
        movw    $ROM_DATA_SEG, %ax
        movw    %ax, %ds
index fe7ea0b1e6b1342e3e7eb8691257f583d22216e9..98ee4581f1b64fc20f6c8f9e566f2c4f64261c8f 100644 (file)
@@ -10,7 +10,7 @@ void console_tx_byte(unsigned char byte);
 void console_tx_flush(void);
 unsigned char console_rx_byte(void);
 int console_tst_byte(void);
-void post_code(uint8_t value);
+void post_code(u8 value);
 void __attribute__ ((noreturn)) die(const char *msg);
 #if CONFIG_CONSOLE_VGA == 1
 void vga_console_init(void);
@@ -31,7 +31,14 @@ extern struct console_driver console_drivers[];
 extern struct console_driver econsole_drivers[];
 
 extern int console_loglevel;
-#endif /* !__PRE_RAM__ */
+#else
+/* __PRE_RAM__ */
+/* Using a global varible can cause problems when we reset the stack 
+ * from cache as ram to ram. If we make this a define USE_SHARED_STACK
+ * we could use the same code on all architectures.
+ */
+#define console_loglevel CONFIG_DEFAULT_CONSOLE_LOGLEVEL
+#endif
 
 #ifndef __ROMCC__
 int do_printk(int msg_level, const char *fmt, ...) __attribute__((format(printf, 2, 3)));
@@ -121,6 +128,8 @@ int do_printk(int msg_level, const char *fmt, ...) __attribute__((format(printf,
 #define print_debug_hex32(HEX)   printk(BIOS_DEBUG,  "%08x", (HEX))
 #define print_spew_hex32(HEX)    printk(BIOS_SPEW,   "%08x", (HEX))
 #else
+
+
 /* __ROMCC__ */
 static void __console_tx_byte(unsigned char byte)
 {
@@ -139,14 +148,14 @@ static void __console_tx_nibble(unsigned nibble)
 
 static void __console_tx_char(int loglevel, unsigned char byte)
 {
-       if (ASM_CONSOLE_LOGLEVEL >= loglevel) {
+       if (console_loglevel >= loglevel) {
                uart_tx_byte(byte);
        }
 }
 
 static void __console_tx_hex8(int loglevel, unsigned char value)
 {
-       if (ASM_CONSOLE_LOGLEVEL >= loglevel) {
+       if (console_loglevel >= loglevel) {
                __console_tx_nibble((value >>  4U) & 0x0fU);
                __console_tx_nibble(value & 0x0fU);
        }
@@ -154,7 +163,7 @@ static void __console_tx_hex8(int loglevel, unsigned char value)
 
 static void __console_tx_hex16(int loglevel, unsigned short value)
 {
-       if (ASM_CONSOLE_LOGLEVEL >= loglevel) {
+       if (console_loglevel >= loglevel) {
                __console_tx_nibble((value >> 12U) & 0x0fU);
                __console_tx_nibble((value >>  8U) & 0x0fU);
                __console_tx_nibble((value >>  4U) & 0x0fU);
@@ -164,7 +173,7 @@ static void __console_tx_hex16(int loglevel, unsigned short value)
 
 static void __console_tx_hex32(int loglevel, unsigned int value)
 {
-       if (ASM_CONSOLE_LOGLEVEL >= loglevel) {
+       if (console_loglevel >= loglevel) {
                __console_tx_nibble((value >> 28U) & 0x0fU);
                __console_tx_nibble((value >> 24U) & 0x0fU);
                __console_tx_nibble((value >> 20U) & 0x0fU);
@@ -178,7 +187,7 @@ static void __console_tx_hex32(int loglevel, unsigned int value)
 
 static void __console_tx_string(int loglevel, const char *str)
 {
-       if (ASM_CONSOLE_LOGLEVEL >= loglevel) {
+       if (console_loglevel >= loglevel) {
                unsigned char ch;
                while((ch = *str++) != '\0') {
                        if (ch == '\n')
index f306744d9e658e414131013cd7fb1e68fcc6e5de..290cd891eb994b34a5060a469bde9589e1419f90 100644 (file)
@@ -2,11 +2,6 @@
 #define LOGLEVEL_H
 
 /* Safe for inclusion in assembly */
-
-#ifndef ASM_CONSOLE_LOGLEVEL
-#define ASM_CONSOLE_LOGLEVEL CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
-#endif
-
 #define BIOS_EMERG      0   /* system is unusable                   */
 #define BIOS_ALERT      1   /* action must be taken immediately     */
 #define BIOS_CRIT       2   /* critical conditions                  */
index 510b8f86f0c323169b5ab930617fa59b5edfddea..33ca9a2210b4ca1abd250b7546c8f2c355cfacbd 100644 (file)
@@ -33,7 +33,6 @@
 #include "southbridge/amd/cs5536/cs5536.h"
 
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
-#define POST_CODE(x) outb(x, 0x80)
 #define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1)
 
 #include "southbridge/amd/cs5536/cs5536_early_smbus.c"
@@ -98,7 +97,7 @@ static void mb_gpio_init(void)
 
 void cache_as_ram_main(void)
 {
-       POST_CODE(0x01);
+       post_code(0x01);
 
        static const struct mem_controller memctrl[] = {
                {.channel0 = {(0xa << 3) | 0, (0xa << 3) | 1}}
index 3c808d41cb3a450b2b78438163627c9a98c53d21..676ce4ef9cf16ea7d9c220225bf0b6d8b561afe3 100644 (file)
@@ -45,8 +45,6 @@
 #include "pc80/serial.c"
 #include "console/console.c"
 
-#define post_code(x) outb(x, 0x80)
-
 #include <cpu/amd/model_fxx_rev.h>
 #include "northbridge/amd/amdk8/raminit.h"
 #include "cpu/amd/model_fxx/apic_timer.c"
index 3dc28015463afd14c2abe212d835c881c1c3ee0f..97c198895d77f6dc74926d51e4056c5b65c6be0a 100644 (file)
@@ -45,8 +45,6 @@
 #include "pc80/serial.c"
 #include "console/console.c"
 
-#define post_code(x) outb(x, 0x80)
-
 #include <cpu/amd/model_fxx_rev.h>
 #include "northbridge/amd/amdk8/raminit.h"
 #include "cpu/amd/model_fxx/apic_timer.c"
index 8c17b0affa6eb6d7396bb95a0fe1423b0982a10f..d742f5002678c536f8b6b33f94b634e369ee2a5f 100644 (file)
@@ -32,8 +32,6 @@
 #include <cpu/amd/geode_post_code.h>
 #include "southbridge/amd/cs5536/cs5536.h"
 
-#define POST_CODE(x) outb(x, 0x80)
-
 #include "southbridge/amd/cs5536/cs5536_early_smbus.c"
 #include "southbridge/amd/cs5536/cs5536_early_setup.c"
 
@@ -95,7 +93,7 @@ static void mb_gpio_init(void)
 
 void cache_as_ram_main(void)
 {
-       POST_CODE(0x01);
+       post_code(0x01);
 
        static const struct mem_controller memctrl[] = {
                {.channel0 = {(0xa << 3) | 0, (0xa << 3) | 1}}
index 6cdaf42df58c862bd6a7d1542bd0e42f3299e011..a3a34d6987b8c2bd7148390ee4bac97da004d97b 100644 (file)
@@ -39,8 +39,6 @@
 #include "pc80/serial.c"
 #include "console/console.c"
 
-#define post_code(x) outb(x, 0x80)
-
 #include <cpu/amd/model_fxx_rev.h>
 #include "northbridge/amd/amdk8/raminit.h"
 #include "cpu/amd/model_fxx/apic_timer.c"
index 2172338685c0cc07356d84e45f853b877cde9523..2fb86f1dacdeb1465e4a739e7e5870877b3b40b7 100644 (file)
@@ -35,8 +35,6 @@
 #include "southbridge/amd/cs5536/cs5536.h"
 #include "spd_table.h"
 
-#define POST_CODE(x) outb(x, 0x80)
-
 #include "southbridge/amd/cs5536/cs5536_early_smbus.c"
 #include "southbridge/amd/cs5536/cs5536_early_setup.c"
 
@@ -112,7 +110,7 @@ static void mb_gpio_init(void)
 
 void cache_as_ram_main(void)
 {
-       POST_CODE(0x01);
+       post_code(0x01);
 
        static const struct mem_controller memctrl[] = {
                {.channel0 = {(0xa << 3) | 0, (0xa << 3) | 1}}
index 37751ce27a5838d7e15c28e93482884e3e3e61e4..03a32883587c3314e92dc37f74bed9f283611fbd 100644 (file)
 #include "console/console.c"
 #include "lib/ramtest.c"
 
-#if 0
-static void post_code(uint8_t value) {
-#if 0
-        int i;
-        for(i=0;i<0x80000;i++) {
-                outb(value, 0x80);
-        }
-#endif
-}
-#endif
-
 #include <cpu/amd/model_fxx_rev.h>
 #include "northbridge/amd/amdk8/incoherent_ht.c"
 #include "southbridge/broadcom/bcm5785/bcm5785_early_smbus.c"
index 6bd7068a8a8789ef4175204cc7e32398facb0f42..59e21388e8e42acc2644fb1b5208baa5d3b91130 100644 (file)
@@ -1,4 +1,3 @@
-#define ASM_CONSOLE_LOGLEVEL 8
 #include <stdint.h>
 #include <device/pci_def.h>
 #include <arch/io.h>
index 181463427774b83acc3604d62d20a2b7ad2fbbbc..0859e370c0296a3241c1e4b9040293d511f609cf 100644 (file)
@@ -1,4 +1,3 @@
-#define ASM_CONSOLE_LOGLEVEL 8
 #include <stdint.h>
 #include <device/pci_def.h>
 #include <arch/io.h>
index 1983b9678fa9ca17df2a2e7f2b6f80089563daca..1e4ee4c7ebb2709140d763ae4bccef7e056db2fb 100644 (file)
@@ -13,7 +13,6 @@
 #include <cpu/amd/geode_post_code.h>
 #include "southbridge/amd/cs5536/cs5536.h"
 
-#define POST_CODE(x) outb(x, 0x80)
 #define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1)
 
 #include "southbridge/amd/cs5536/cs5536_early_smbus.c"
@@ -63,7 +62,7 @@ static void mb_gpio_init(void)
 void cache_as_ram_main(void)
 {
        extern void RestartCAR();
-       POST_CODE(0x01);
+       post_code(0x01);
 
        static const struct mem_controller memctrl [] = {
                {.channel0 = {(0xa<<3)|0, (0xa<<3)|1}}
@@ -105,7 +104,7 @@ void cache_as_ram_main(void)
 
         We use method 1 on Norwich.
        */
-       POST_CODE(0x02);
+       post_code(0x02);
        print_err("POST 02\n");
        __asm__("wbinvd\n");
        print_err("Past wbinvd\n");
index 80226a940de11c0f6187dc34a7dd8e83261c5863..f5fa9e9b0aa8cfe3ce7318e87e1335b5734192ca 100644 (file)
@@ -32,7 +32,6 @@
 #include <cpu/amd/geode_post_code.h>
 #include "southbridge/amd/cs5536/cs5536.h"
 
-#define POST_CODE(x) outb(x, 0x80)
 #define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1)
 
 #include "southbridge/amd/cs5536/cs5536_early_smbus.c"
@@ -102,7 +101,7 @@ static void mb_gpio_init(void)
 
 void cache_as_ram_main(void)
 {
-       POST_CODE(0x01);
+       post_code(0x01);
 
        static const struct mem_controller memctrl[] = {
                {.channel0 = {(0xa << 3) | 0, (0xa << 3) | 1}}
index 753488933ea6b023f05ffb0bcd8b03672e13a946..4b82aa4d88f225a91a12035f0eb52380a102a55d 100644 (file)
@@ -46,8 +46,6 @@
 #include "pc80/serial.c"
 #include "console/console.c"
 
-#define post_code(x) outb(x, 0x80)
-
 #include <cpu/amd/model_fxx_rev.h>
 #include "northbridge/amd/amdk8/raminit.h"
 #include "cpu/amd/model_fxx/apic_timer.c"
index 67f4c3c38187e3bf203486a805453106c8e7bfda..efaf1dd6bedcf24fddba2c0d8382a1965ddd7a41 100644 (file)
@@ -36,8 +36,6 @@
 #include <cpu/amd/geode_post_code.h>
 #include "southbridge/amd/cs5536/cs5536.h"
 
-#define POST_CODE(x) outb(x, 0x80)
-
 #include "southbridge/amd/cs5536/cs5536_early_smbus.c"
 #include "southbridge/amd/cs5536/cs5536_early_setup.c"
 #include "superio/ite/it8712f/it8712f_early_serial.c"
@@ -132,7 +130,7 @@ static void mb_gpio_init(void)
 
 void cache_as_ram_main(void)
 {
-       POST_CODE(0x01);
+       post_code(0x01);
 
        static const struct mem_controller memctrl[] = {
                {.channel0 = {(0xa << 3) | 0, (0xa << 3) | 1}}
index 344e0eed84e3092dc259dc0b77d62e2c3ce3cd88..51b1cf6d1d0eb1ec0389dd57325ab46b9804bf14 100644 (file)
@@ -37,8 +37,6 @@
 #include <cpu/amd/geode_post_code.h>
 #include "southbridge/amd/cs5536/cs5536.h"
 
-#define POST_CODE(x) outb(x, 0x80)
-
 #include "southbridge/amd/cs5536/cs5536_early_smbus.c"
 #include "southbridge/amd/cs5536/cs5536_early_setup.c"
 #include "superio/ite/it8712f/it8712f_early_serial.c"
@@ -194,7 +192,7 @@ static void mb_gpio_init(void)
 void cache_as_ram_main(void)
 {
        int err;
-       POST_CODE(0x01);
+       post_code(0x01);
 
        static const struct mem_controller memctrl[] = {
                {.channel0 = {(0xa << 3) | 0, (0xa << 3) | 1}}
index ecc95d5d6756a0cb300b977fbe1adbf30985da2d..04c8dbd54019d9a8743c7a416fd4e0d603954bb8 100644 (file)
 #include "pc80/serial.c"
 #include "console/console.c"
 
-#if 0
-static void post_code(uint8_t value) {
-#if 1
-        int i;
-        for(i=0;i<0x80000;i++) {
-                outb(value, 0x80);
-        }
-#endif
-}
-#endif
-
 #include <cpu/amd/model_fxx_rev.h>
 #include "southbridge/broadcom/bcm5785/bcm5785_early_smbus.c"
 #include "northbridge/amd/amdk8/raminit.h"
index 0174b7b567483f054433de74e97b923ae7ed5ac4..00e5991bf66e732ce7c8401506a034fd6b42d22e 100644 (file)
 #include "console/console.c"
 #include "lib/ramtest.c"
 
-#if 0
-static void post_code(uint8_t value) {
-#if 1
-        int i;
-        for(i=0;i<0x80000;i++) {
-                outb(value, 0x80);
-        }
-#endif
-}
-#endif
-
 #include <cpu/amd/model_fxx_rev.h>
 
 #include "northbridge/amd/amdk8/incoherent_ht.c"
index 236e53025801791905f0a6aa9377656379afcd13..1ba44403246d19f4ddf2e80527d134b235a8eecc 100644 (file)
@@ -33,7 +33,6 @@
 #include <cpu/amd/geode_post_code.h>
 #include "southbridge/amd/cs5536/cs5536.h"
 
-#define POST_CODE(x) outb(x, 0x80)
 #define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1)
 
 /* The ALIX1.C has no SMBus; the setup is hard-wired. */
@@ -148,7 +147,7 @@ void cache_as_ram_main(void)
 
        extern void RestartCAR();
 
-       POST_CODE(0x01);
+       post_code(0x01);
 
        SystemPreInit();
        msr_init();
@@ -195,7 +194,7 @@ void cache_as_ram_main(void)
         *
         * We use method 1 on Norwich and on this board too.
         */
-       POST_CODE(0x02);
+       post_code(0x02);
        print_err("POST 02\n");
        __asm__("wbinvd\n");
        print_err("Past wbinvd\n");
index f3d6be0a1f4e588d140cb3c779f7516677fb7b01..2b7ede214b43b429b5d1145cc1a5a87e3b9df400 100644 (file)
@@ -45,8 +45,6 @@
 #include "pc80/serial.c"
 #include "console/console.c"
 
-#define post_code(x) outb(x, 0x80)
-
 #include <cpu/amd/model_fxx_rev.h>
 #include "northbridge/amd/amdk8/raminit.h"
 #include "cpu/amd/model_fxx/apic_timer.c"
index a16bf7ca51ba1840681d134740e5b45a5b4fc0e1..71ae749ca2add278540cc0d29a974e307035a6c3 100644 (file)
@@ -45,8 +45,6 @@
 #include "pc80/serial.c"
 #include "console/console.c"
 
-#define post_code(x) outb(x, 0x80)
-
 #include <cpu/amd/model_fxx_rev.h>
 #include "northbridge/amd/amdk8/raminit.h"
 #include "cpu/amd/model_fxx/apic_timer.c"
index d585edd4762f92eb8f12023f8eb46f92c69cd7ab..4379c2457d319496655a8b689bdf724c8074b7cf 100644 (file)
@@ -4,7 +4,6 @@
  *   (c) 2006 coresystems GmbH
  */
 
-#define ASM_CONSOLE_LOGLEVEL 6
 #include <stdint.h>
 #include <device/pci_def.h>
 #include <arch/io.h>
index c251e6dcec2999ca6750574a1daefd6ed0da2c92..750ca9c4900209ffe51299725622825423be5ed3 100644 (file)
 #include "console/console.c"
 #include "lib/ramtest.c"
 
-#if 0
-static void post_code(uint8_t value) {
-#if 1
-        int i;
-        for(i=0;i<0x80000;i++) {
-                outb(value, 0x80);
-        }
-#endif
-}
-#endif
-
 #include <cpu/amd/model_fxx_rev.h>
 #include "northbridge/amd/amdk8/incoherent_ht.c"
 #include "southbridge/amd/amd8111/amd8111_early_smbus.c"
index bb13bb4246d1723025e59f07ede555df8df1a2ae..eb6873c4e4b05c40b370ebcba541e9f65259f294 100644 (file)
 #include "console/console.c"
 #include "lib/ramtest.c"
 
-#if 0
-static void post_code(uint8_t value) {
-#if 1
-        int i;
-        for(i=0;i<0x80000;i++) {
-                outb(value, 0x80);
-        }
-#endif
-}
-#endif
-
 #include <cpu/amd/model_fxx_rev.h>
 
 #include "northbridge/amd/amdk8/incoherent_ht.c"
index 0f1b09e20b0dcc72e61ad2e3df8dca1a986d79b4..eafe326c7a621225f21332cbdae60e0b6cac42c4 100644 (file)
 #include "console/console.c"
 #include "lib/ramtest.c"
 
-#if 0
-static void post_code(uint8_t value) {
-#if 1
-        int i;
-        for(i=0;i<0x80000;i++) {
-                outb(value, 0x80);
-        }
-#endif
-}
-#endif
-
 #include <cpu/amd/model_fxx_rev.h>
 
 #include "northbridge/amd/amdk8/incoherent_ht.c"
index 5a8e94bde4998a6adce1625052e9071d50975169..60f2d2109338c94150fbc2285c3610fcead99e10 100644 (file)
@@ -34,7 +34,6 @@
 #include "southbridge/amd/cs5536/cs5536.h"
 
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
-#define POST_CODE(x) outb(x, 0x80)
 #define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1)
 
 #include "southbridge/amd/cs5536/cs5536_early_smbus.c"
@@ -99,7 +98,7 @@ static void mb_gpio_init(void)
 
 void cache_as_ram_main(void)
 {
-       POST_CODE(0x01);
+       post_code(0x01);
 
        static const struct mem_controller memctrl[] = {
                {.channel0 = {(0xa << 3) | 0, (0xa << 3) | 1}}
index 040d7b7a4ed7a91eec4b728861e513468b2f6fe3..898e31dcd4a30b7addffd3926057820f8fa173d3 100644 (file)
@@ -115,7 +115,6 @@ static unsigned int get_memory_speed(void)
 #if USE_GOODRICH_VERSION
 ///////////////////////////////////////////////////////////////////////////////
 // Goodrich Version of pll_reset
-#define POST_CODE(x) outb(x, 0x80)
 
 // PLLCHECK_COMPLETED is the "we've already done this" flag
 #define PLLCHECK_COMPLETED (1 << RSTPLL_LOWER_SWFLAGS_SHIFT)
@@ -149,7 +148,7 @@ static void pll_reset(void)
        
                // Store PCI33(0)/66(1), SDR(0)/DDR(1), and CRT(0)/TFT(1) in upper esi to get to the
                // correct Strap Table.
-               POST_CODE(POST_PLL_INIT);
+               post_code(POST_PLL_INIT);
                
                // configure for DDR
                msrGlcpSysRstpll.lo &= ~(1 << RSTPPL_LOWER_SDRMODE_SHIFT);
@@ -157,7 +156,7 @@ static void pll_reset(void)
                
                // Use Manual settings
                //      UseManual:
-               POST_CODE(POST_PLL_MANUAL);
+               post_code(POST_PLL_MANUAL);
 
                // DIV settings manually entered.
                // ax = VDIV, upper eax = MDIV, upper ecx = FbDIV
@@ -237,7 +236,7 @@ static void pll_reset(void)
                wrmsr(GLCP_SYS_RSTPLL, msrGlcpSysRstpll);
                
                // You should never get here..... The chip has reset.
-               POST_CODE(POST_PLL_RESET_FAIL);
+               post_code(POST_PLL_RESET_FAIL);
                while (1);
 
        } // we haven't configured the PLL; do it now
index 08c19b48e5cd7fe3815ea9347a407161cedc04fe..188a96e85c0e10dbfb8de793203ab18a95a9cc6f 100644 (file)
@@ -31,12 +31,12 @@ static void pll_reset(char manualconf)
        print_debug(":");
        print_debug_hex32(msrGlcpSysRstpll.lo);
        print_debug("\n");
-       POST_CODE(POST_PLL_INIT);
+       post_code(POST_PLL_INIT);
 
        if (!(msrGlcpSysRstpll.lo & (1 << RSTPLL_LOWER_SWFLAGS_SHIFT))) {
                print_debug("Configuring PLL\n");
                if (manualconf) {
-                       POST_CODE(POST_PLL_MANUAL);
+                       post_code(POST_PLL_MANUAL);
                        /* CPU and GLIU mult/div (GLMC_CLK = GLIU_CLK / 2)  */
                        msrGlcpSysRstpll.hi = PLLMSRhi;
 
@@ -44,7 +44,7 @@ static void pll_reset(char manualconf)
                        msrGlcpSysRstpll.lo = PLLMSRlo;
                } else {
                        /*automatic configuration (straps) */
-                       POST_CODE(POST_PLL_STRAP);
+                       post_code(POST_PLL_STRAP);
                        msrGlcpSysRstpll.lo &=
                            ~(0xFF << RSTPPL_LOWER_HOLD_COUNT_SHIFT);
                        msrGlcpSysRstpll.lo |=
@@ -64,7 +64,7 @@ static void pll_reset(char manualconf)
 
                /*      You should never get here..... The chip has reset. */
                print_debug("CONFIGURING PLL FAILURE\n");
-               POST_CODE(POST_PLL_RESET_FAIL);
+               post_code(POST_PLL_RESET_FAIL);
                __asm__ __volatile__("hlt\n");
 
        }
index 15b5be6ea420aad2d49a1884634813ec421a9274..10717add086c625f654028ad7b34bb8e36399c3d 100644 (file)
@@ -67,7 +67,7 @@ static void auto_size_dimm(unsigned int dimm)
        spd_byte = spd_read_byte(dimm, SPD_NUM_DIMM_BANKS);
        if ((MIN_MOD_BANKS > spd_byte) || (spd_byte > MAX_MOD_BANKS)) {
                print_emerg("Number of module banks not compatible\n");
-               POST_CODE(ERROR_BANK_SET);
+               post_code(ERROR_BANK_SET);
                hcf();
        }
        dimm_setting |= (spd_byte >> 1) << CF07_UPPER_D0_MB_SHIFT;
@@ -78,7 +78,7 @@ static void auto_size_dimm(unsigned int dimm)
        spd_byte = spd_read_byte(dimm, SPD_NUM_BANKS_PER_SDRAM);
        if ((MIN_DEV_BANKS > spd_byte) || (spd_byte > MAX_DEV_BANKS)) {
                print_emerg("Number of device banks not compatible\n");
-               POST_CODE(ERROR_BANK_SET);
+               post_code(ERROR_BANK_SET);
                hcf();
        }
        dimm_setting |= (spd_byte >> 2) << CF07_UPPER_D0_CB_SHIFT;
@@ -94,7 +94,7 @@ static void auto_size_dimm(unsigned int dimm)
        if ((spd_read_byte(dimm, SPD_NUM_ROWS) & 0xF0)
            || (spd_read_byte(dimm, SPD_NUM_COLUMNS) & 0xF0)) {
                print_emerg("Assymetirc DIMM not compatible\n");
-               POST_CODE(ERROR_UNSUPPORTED_DIMM);
+               post_code(ERROR_UNSUPPORTED_DIMM);
                hcf();
        }
        banner("SPDBANKDENSITY");
@@ -111,7 +111,7 @@ static void auto_size_dimm(unsigned int dimm)
        banner("TEST DIMM SIZE>8");
        if (dimm_size > 8) {    /* 8 is 1GB only support 1GB per DIMM */
                print_emerg("Only support up to 1 GB per DIMM\n");
-               POST_CODE(ERROR_DENSITY_DIMM);
+               post_code(ERROR_DENSITY_DIMM);
                hcf();
        }
        dimm_setting |= dimm_size << CF07_UPPER_D0_SZ_SHIFT;
@@ -144,7 +144,7 @@ static void auto_size_dimm(unsigned int dimm)
        banner("MAXCOLADDR");
        if (spd_byte > MAX_COL_ADDR) {
                print_emerg("DIMM page size not compatible\n");
-               POST_CODE(ERROR_SET_PAGE);
+               post_code(ERROR_SET_PAGE);
                hcf();
        }
        banner(">12address test");
@@ -186,7 +186,7 @@ static void checkDDRMax(void)
        /* I don't think you need this check.
           if (spd_byte0 >= 0xA0 || spd_byte1 >= 0xA0){
           print_emerg("DIMM overclocked. Check GeodeLink Speed\n");
-          POST_CODE(POST_PLL_MEM_FAIL);
+          post_code(POST_PLL_MEM_FAIL);
           hcf();
           } */
 
@@ -201,7 +201,7 @@ static void checkDDRMax(void)
        /* current speed > max speed? */
        if (GeodeLinkSpeed() > speed) {
                print_emerg("DIMM overclocked. Check GeodeLink Speed\n");
-               POST_CODE(POST_PLL_MEM_FAIL);
+               post_code(POST_PLL_MEM_FAIL);
                hcf();
        }
 }
@@ -341,7 +341,7 @@ static void setCAS(void)
                spd_byte = CASDDR[__builtin_ctz((uint32_t) casmap0)];
        } else {
                print_emerg("DIMM CAS Latencies not compatible\n");
-               POST_CODE(ERROR_DIFF_DIMMS);
+               post_code(ERROR_DIFF_DIMMS);
                hcf();
        }
 
@@ -570,41 +570,41 @@ static void sdram_set_spd_registers(const struct mem_controller *ctrl)
        uint8_t spd_byte;
 
        banner("sdram_set_spd_register\n");
-       POST_CODE(POST_MEM_SETUP);      // post_70h
+       post_code(POST_MEM_SETUP);      // post_70h
 
        spd_byte = spd_read_byte(DIMM0, SPD_MODULE_ATTRIBUTES);
        banner("Check DIMM 0");
        /* Check DIMM is not Register and not Buffered DIMMs. */
        if ((spd_byte != 0xFF) && (spd_byte & 3)) {
                print_emerg("DIMM0 NOT COMPATIBLE\n");
-               POST_CODE(ERROR_UNSUPPORTED_DIMM);
+               post_code(ERROR_UNSUPPORTED_DIMM);
                hcf();
        }
        banner("Check DIMM 1");
        spd_byte = spd_read_byte(DIMM1, SPD_MODULE_ATTRIBUTES);
        if ((spd_byte != 0xFF) && (spd_byte & 3)) {
                print_emerg("DIMM1 NOT COMPATIBLE\n");
-               POST_CODE(ERROR_UNSUPPORTED_DIMM);
+               post_code(ERROR_UNSUPPORTED_DIMM);
                hcf();
        }
 
-       POST_CODE(POST_MEM_SETUP2);     // post_72h
+       post_code(POST_MEM_SETUP2);     // post_72h
        banner("Check DDR MAX");
 
        /* Check that the memory is not overclocked. */
        checkDDRMax();
 
        /* Size the DIMMS */
-       POST_CODE(POST_MEM_SETUP3);     // post_73h
+       post_code(POST_MEM_SETUP3);     // post_73h
        banner("AUTOSIZE DIMM 0");
        auto_size_dimm(DIMM0);
-       POST_CODE(POST_MEM_SETUP4);     // post_74h
+       post_code(POST_MEM_SETUP4);     // post_74h
        banner("AUTOSIZE DIMM 1");
        auto_size_dimm(DIMM1);
 
        /* Set CAS latency */
        banner("set cas latency");
-       POST_CODE(POST_MEM_SETUP5);     // post_75h
+       post_code(POST_MEM_SETUP5);     // post_75h
        setCAS();
 
        /* Set all the other latencies here (tRAS, tRP....) */
@@ -640,7 +640,7 @@ static void sdram_enable(int controllers, const struct mem_controller *ctrl)
 ;* 9) MRS w/ memory config & reset DLL clear
 ;* 8) DDR SDRAM ready for normal operation
 ;********************************************************************/
-       POST_CODE(POST_MEM_ENABLE);     // post_76h
+       post_code(POST_MEM_ENABLE);     // post_76h
 
        /* Only enable MTest for TLA memory debug */
        /*EnableMTest(); */
@@ -650,7 +650,7 @@ static void sdram_enable(int controllers, const struct mem_controller *ctrl)
        if ((msr.hi & ((7 << CF07_UPPER_D1_PSZ_SHIFT) | (7 << CF07_UPPER_D0_PSZ_SHIFT))) == 
                        ((7 << CF07_UPPER_D1_PSZ_SHIFT) | (7 << CF07_UPPER_D0_PSZ_SHIFT))) {
                print_emerg("No memory in the system\n");
-               POST_CODE(ERROR_NO_DIMMS);
+               post_code(ERROR_NO_DIMMS);
                hcf();
        }
 
@@ -760,7 +760,7 @@ static void sdram_enable(int controllers, const struct mem_controller *ctrl)
        wrmsr(msrnum, msr);
 
        print_emerg("DRAM controller init done.\n");
-       POST_CODE(POST_MEM_SETUP_GOOD); //0x7E
+       post_code(POST_MEM_SETUP_GOOD); //0x7E
 
        /* make sure there is nothing stale in the cache */
        /* CAR stack is in the cache __asm__ __volatile__("wbinvd\n"); */