mpspec.h: Tweak the write_smp_table macro so that it is safe if passed a complex expression.

crt0.S.lb: Modified so that it is safe to include console.inc
console.c:  Added print_debug_ and frieds which are non inline variants of the normal console functions
div64.h:   Only include limits.h if  ULONG_MAX is not defined and define ULONG_MAX on ppc
socket_754/Config.lb Conditionally set config chip.h
socket_940.c We don't need and #if CONFIG_CHIP_NAME we won't be linked in if there are no references.
slot_2/chip.h: The operations struct need to be spelled cpu_intelt_slot_2_ops
slot_2/slot2.c: The same spelling fix
socket_mPGA603/chip.h: again
socket_mPGA603/socket_mPGA603_400Mhz.c: and again
socket_mPGA604_533Mhz/Config.lb: Conditionally defing CONFIG_CHIP_NAME
socket_mPGA604_800Mhz/chip.h: Another spelling fix
socket_mPGA604_800Mhz.c     and again
via/model_centaur/model_centaur_init.c: It's not an intel CPU so don't worry about Intel microcode uptdates
earlymtrr.c:  Remove work around for older versions of romcc
pci_ids.h:  More ids.
malloc.c:   We don't need string.h any longer
uart8250.c: Be consistent when delcaring functions static inline
arima/hdama/mptable.c: Cleanup to be a little more consistent
amdk8/coherent_ht.c:
 - Talk about nodes not cpus (In preparation for dual cores)
 - Remove clear_temp_row (as it is no longer needed)
 - Demoted the failure messages to spew.
 - Modified to gracefully handle failure (It should work now if cpus are removed)
 - Handle the non-SMP case in verify_mp_capabilities
 - Add clear_dead_routes which replaces clear_temp_row and does more
 - Reorganize setup_coherent_ht_domain to cleanly handle failure.
 - incoherent_ht.c: Clean up the indenation a little.
i8259.c: remove blank lines at the start of the file.
keyboard.c: Make pc_keyboard_init static
ramtest.c: Add a print out limiter, and cleanup the printout a little.
amd8111/Config.lb: Mention amd8111_smbus.c
amd8111_usb.c: Call the structure usb_ops not smbus_ops.
NSC/pc97307/chip.h: Fix spelling issue
pc97307/superio.c: Use &ops no &pnp_ops.
w83627hf/suerio.c: ditto
w83627thf/suerio.c: ditto
buildrom.c: Use braces around the body of a for loop.  It's more maintainable.


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1778 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

6 files changed, 66 insertions, 24 deletions

diff --git a/src/arch/i386/include/arch/smp/mpspec.h b/src/arch/i386/include/arch/smp/mpspec.h
index 98c21c5bcc..32ed2d752a 100644
--- a/src/arch/i386/include/arch/smp/mpspec.h
+++ b/src/arch/i386/include/arch/smp/mpspec.h
@@ -274,7 +274,7 @@ unsigned long write_smp_table(unsigned long addr)
 	return addr;
 }
 #endif
-#define write_smp_table(addr)	addr
+#define write_smp_table(addr)	(addr)
 #endif /* HAVE_MP_TABLE */
 
 #endif
diff --git a/src/arch/i386/init/crt0.S.lb b/src/arch/i386/init/crt0.S.lb
index 29e3e28277..f0326fa8f8 100644
--- a/src/arch/i386/init/crt0.S.lb
+++ b/src/arch/i386/init/crt0.S.lb
@@ -37,15 +37,17 @@
 
 #include "crt0_includes.h"
 
+#ifndef CONSOLE_DEBUG_TX_STRING
 	/* uses:	 esp, ebx, ax, dx */
-#define __CONSOLE_TX_STRING(string)	\
+# define __CRT_CONSOLE_TX_STRING(string) \
 	mov	string, %ebx	; \
-	CALLSP(console_tx_string)
+	CALLSP(crt_console_tx_string)
 
-#if ASM_CONSOLE_LOGLEVEL > BIOS_DEBUG
-#define CONSOLE_DEBUG_TX_STRING(string)        __CONSOLE_TX_STRING(string)
-#else
-#define CONSOLE_DEBUG_TX_STRING(string)
+# if defined(TTYS0_BASE) && (ASM_CONSOLE_LOGLEVEL > BIOS_DEBUG)
+#  define CONSOLE_DEBUG_TX_STRING(string)        __CRT_CONSOLE_TX_STRING(string)
+# else
+#  define CONSOLE_DEBUG_TX_STRING(string)
+# endif
 #endif
 
 	/* clear boot_complete flag */
@@ -167,9 +169,9 @@ decompr_end_n2b:
 	hlt
 	jmp	.Lhlt
 
-#if ASM_CONSOLE_LOGLEVEL > BIOS_DEBUG
+#ifdef __CRT_CONSOLE_TX_STRING
 	/* Uses esp, ebx, ax, dx  */
-console_tx_string:
+crt_console_tx_string:
 	mov	(%ebx), %al
 	inc	%ebx
 	cmp	$0, %al
@@ -207,8 +209,10 @@ console_tx_string:
 	mov	%ah, %al
 	outb	%al, %dx
 
-	jmp console_tx_string	
+	jmp crt_console_tx_string
+#endif /* __CRT_CONSOLE_TX_STRING */
 
+#if defined(CONSOLE_DEBUG_TX_STRING) && (ASM_CONSOLE_LOGLEVEL > BIOS_DEBUG)
 .section ".rom.data"
 str_copying_to_ram:  .string "Copying LinuxBIOS to ram.\r\n"
 str_pre_main:        .string "Jumping to LinuxBIOS.\r\n"
diff --git a/src/arch/i386/lib/console.c b/src/arch/i386/lib/console.c
index d9e06e0f6b..f667795f05 100644
--- a/src/arch/i386/lib/console.c
+++ b/src/arch/i386/lib/console.c
@@ -64,6 +64,7 @@ static void __console_tx_string(int loglevel, const char *str)
 	}
 }
 
+#define NOINLINE __attribute__((noinline))
 static void print_emerg_char(unsigned char byte) { __console_tx_char(BIOS_EMERG, byte); }
 static void print_emerg_hex8(unsigned char value){ __console_tx_hex8(BIOS_EMERG, value); }
 static void print_emerg_hex16(unsigned short value){ __console_tx_hex16(BIOS_EMERG, value); }
@@ -111,18 +112,6 @@ static void print_debug_hex8(unsigned char value) { __console_tx_hex8(BIOS_DEBUG
 static void print_debug_hex16(unsigned short value){ __console_tx_hex16(BIOS_DEBUG, value); }
 static void print_debug_hex32(unsigned int value) { __console_tx_hex32(BIOS_DEBUG, value); }
 static void print_debug(const char *str) { __console_tx_string(BIOS_DEBUG, str); }
-static void print_debug_hex8_(unsigned char value) __attribute__((noinline))
-{
-	print_debug_hex8(value);
-}
-static void print_debug_hex32_(unsigned int value) __attribute__((noinline))
-{
-	print_debug_hex32(value);
-}
-static void print_debug_(const char *str) __attribute__((noinline))
-{
-	print_debug(str);
-}
 
 static void print_spew_char(unsigned char byte) { __console_tx_char(BIOS_SPEW, byte); }
 static void print_spew_hex8(unsigned char value) { __console_tx_hex8(BIOS_SPEW, value); }
@@ -130,6 +119,56 @@ static void print_spew_hex16(unsigned short value){ __console_tx_hex16(BIOS_SPEW
 static void print_spew_hex32(unsigned int value) { __console_tx_hex32(BIOS_SPEW, value); }
 static void print_spew(const char *str) { __console_tx_string(BIOS_SPEW, str); }
 
+/* Non inline versions.... */
+
+static void print_alert_char_(unsigned char value) NOINLINE   { print_alert_char(value); }
+static void print_alert_hex8_(unsigned char value) NOINLINE   { print_alert_hex8(value); }
+static void print_alert_hex16_(unsigned short value) NOINLINE { print_alert_hex16(value); }
+static void print_alert_hex32_(unsigned int value) NOINLINE   { print_alert_hex32(value); }
+static void print_alert_(const char *str) NOINLINE            { print_alert(str); }
+
+static void print_crit_char_(unsigned char value) NOINLINE   { print_crit_char(value); }
+static void print_crit_hex8_(unsigned char value) NOINLINE   { print_crit_hex8(value); }
+static void print_crit_hex16_(unsigned short value) NOINLINE { print_crit_hex16(value); }
+static void print_crit_hex32_(unsigned int value) NOINLINE   { print_crit_hex32(value); }
+static void print_crit_(const char *str) NOINLINE            { print_crit(str); }
+
+static void print_err_char_(unsigned char value) NOINLINE   { print_err_char(value); }
+static void print_err_hex8_(unsigned char value) NOINLINE   { print_err_hex8(value); }
+static void print_err_hex16_(unsigned short value) NOINLINE { print_err_hex16(value); }
+static void print_err_hex32_(unsigned int value) NOINLINE   { print_err_hex32(value); }
+static void print_err_(const char *str) NOINLINE            { print_err(str); }
+
+static void print_warning_char_(unsigned char value) NOINLINE   { print_warning_char(value); }
+static void print_warning_hex8_(unsigned char value) NOINLINE   { print_warning_hex8(value); }
+static void print_warning_hex16_(unsigned short value) NOINLINE { print_warning_hex16(value); }
+static void print_warning_hex32_(unsigned int value) NOINLINE   { print_warning_hex32(value); }
+static void print_warning_(const char *str) NOINLINE            { print_warning(str); }
+
+static void print_notice_char_(unsigned char value) NOINLINE   { print_notice_char(value); }
+static void print_notice_hex8_(unsigned char value) NOINLINE   { print_notice_hex8(value); }
+static void print_notice_hex16_(unsigned short value) NOINLINE { print_notice_hex16(value); }
+static void print_notice_hex32_(unsigned int value) NOINLINE   { print_notice_hex32(value); }
+static void print_notice_(const char *str) NOINLINE            { print_notice(str); }
+
+static void print_info_char_(unsigned char value) NOINLINE   { print_info_char(value); }
+static void print_info_hex8_(unsigned char value) NOINLINE   { print_info_hex8(value); }
+static void print_info_hex16_(unsigned short value) NOINLINE { print_info_hex16(value); }
+static void print_info_hex32_(unsigned int value) NOINLINE   { print_info_hex32(value); }
+static void print_info_(const char *str) NOINLINE            { print_info(str); }
+
+static void print_debug_char_(unsigned char value) NOINLINE   { print_debug_char(value); }
+static void print_debug_hex8_(unsigned char value) NOINLINE   { print_debug_hex8(value); }
+static void print_debug_hex16_(unsigned short value) NOINLINE { print_debug_hex16(value); }
+static void print_debug_hex32_(unsigned int value) NOINLINE   { print_debug_hex32(value); }
+static void print_debug_(const char *str) NOINLINE            { print_debug(str); }
+
+static void print_spew_char_(unsigned char value) NOINLINE   { print_spew_char(value); }
+static void print_spew_hex8_(unsigned char value) NOINLINE   { print_spew_hex8(value); }
+static void print_spew_hex16_(unsigned short value) NOINLINE { print_spew_hex16(value); }
+static void print_spew_hex32_(unsigned int value) NOINLINE   { print_spew_hex32(value); }
+static void print_spew_(const char *str) NOINLINE            { print_spew(str); }
+
 #ifndef LINUXBIOS_EXTRA_VERSION
 #define LINUXBIOS_EXTRA_VERSION ""
 #endif
diff --git a/src/arch/i386/lib/id.inc b/src/arch/i386/lib/id.inc
index 44c452b03a..46b4424511 100644
--- a/src/arch/i386/lib/id.inc
+++ b/src/arch/i386/lib/id.inc
@@ -1,4 +1,3 @@
-
 	.section ".id", "a", @progbits
 
 	.globl __id_start
diff --git a/src/arch/ppc/include/div64.h b/src/arch/ppc/include/div64.h
index a841abf954..7d9a7b6117 100644
--- a/src/arch/ppc/include/div64.h
+++ b/src/arch/ppc/include/div64.h
@@ -1 +1,2 @@
+#define ULONG_MAX 4294967295
 #include <arch-generic/div64.h>
diff --git a/src/arch/ppc/lib/cpu.c b/src/arch/ppc/lib/cpu.c
index efb914b059..adf5358c28 100644
--- a/src/arch/ppc/lib/cpu.c
+++ b/src/arch/ppc/lib/cpu.c
@@ -3,7 +3,6 @@
 #include <string.h>
 #include <cpu/cpu.h>
 #include <cpu/ppc/cpuid.h>
-#include <smp/start_stop.h>
 #include "ppc.h"
 #include "ppcreg.h"