[commit] r5260 - in trunk/src: arch/i386/lib cpu include lib mainboard/tyan/s2892 pc80

[repository service]

Author: myles
Date: Fri Mar 19 03:33:40 2010
New Revision: 5260
URL: https://tracker.coreboot.org/trac/coreboot/changeset/5260

Log:
Get rid of a few warnings:
1. Add some more prototypes to lib.h
2. Include console.h when not using romcc
3. Eliminate an unused function
4. Set a default for SSE2, since it is just for ramtest performance

Signed-off-by: Myles Watson 
Acked-by: Patrick Georgi

Modified:
   trunk/src/arch/i386/lib/console.c
   trunk/src/cpu/Kconfig
   trunk/src/include/lib.h
   trunk/src/lib/generic_sdram.c
   trunk/src/lib/ramtest.c
   trunk/src/mainboard/tyan/s2892/romstage.c
   trunk/src/pc80/serial.c

Modified: trunk/src/arch/i386/lib/console.c
==============================================================================
--- trunk/src/arch/i386/lib/console.c	Thu Mar 18 21:58:41 2010	(r5259)
+++ trunk/src/arch/i386/lib/console.c	Fri Mar 19 03:33:40 2010	(r5260)
@@ -4,6 +4,7 @@
 #if CONFIG_USE_PRINTK_IN_CAR == 0
 #include "console_print.c"
 #else  /* CONFIG_USE_PRINTK_IN_CAR == 1 */
+#include <console/console.h>
 #include "console_printk.c"
 #endif /* CONFIG_USE_PRINTK_IN_CAR */

Modified: trunk/src/cpu/Kconfig
==============================================================================
--- trunk/src/cpu/Kconfig	Thu Mar 18 21:58:41 2010	(r5259)
+++ trunk/src/cpu/Kconfig	Fri Mar 19 03:33:40 2010	(r5260)
@@ -48,6 +48,7 @@

config SSE2
    bool
+	default n
    help
      Select SSE2 in your socket or model Kconfig if your CPU has SSE2
      streaming SIMD instructions. Some parts of coreboot can be built

Modified: trunk/src/include/lib.h
==============================================================================
--- trunk/src/include/lib.h	Thu Mar 18 21:58:41 2010	(r5259)
+++ trunk/src/include/lib.h	Fri Mar 19 03:33:40 2010	(r5260)
@@ -19,8 +19,15 @@

/* This file is for "nuisance prototypes" that have no other home. */

+#ifndef __LIB_H__
+#define __LIB_H__
+
+#ifndef __ROMCC__ /* romcc doesn't support prototypes. */
+
+#ifndef __PRE_RAM__ /* Conflicts with romcc_io.h */
 /* Defined in src/lib/clog2.c */
 unsigned long log2(unsigned long x);
+#endif

/* Defined in src/lib/lzma.c */
 unsigned long ulzma(unsigned char *src, unsigned char *dst);
@@ -28,3 +35,18 @@
 /* Defined in src/arch/i386/boot/gdt.c */
 void move_gdt(void);

+/* Defined in src/lib/ramtest.c */
+void ram_check(unsigned long start, unsigned long stop);
+
+/* Defined in src/pc80/serial.c */
+void uart_init(void);
+
+/* Defined in romstage.c */
+#if defined(CONFIG_CPU_AMD_LX) && CONFIG_CPU_AMD_LX
+void cache_as_ram_main(void);
+#else
+void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx);
+#endif
+
+#endif /* __ROMCC__ */
+#endif /* __LIB_H__ */

Modified: trunk/src/lib/generic_sdram.c
==============================================================================
--- trunk/src/lib/generic_sdram.c	Thu Mar 18 21:58:41 2010	(r5259)
+++ trunk/src/lib/generic_sdram.c	Fri Mar 19 03:33:40 2010	(r5260)
@@ -1,3 +1,4 @@
+#include <lib.h> /* Prototypes */

#ifndef RAMINIT_SYSINFO
         #define RAMINIT_SYSINFO 0
@@ -12,14 +13,6 @@
 #endif
 }

-void sdram_no_memory(void)
-{
-	print_err("No memory!!\r\n");
-	while(1) { 
-		hlt(); 
-	}
-}
-
 /* Setup SDRAM */
 #if RAMINIT_SYSINFO == 1
 void sdram_initialize(int controllers, const struct mem_controller *ctrl, void *sysinfo)

Modified: trunk/src/lib/ramtest.c
==============================================================================
--- trunk/src/lib/ramtest.c	Thu Mar 18 21:58:41 2010	(r5259)
+++ trunk/src/lib/ramtest.c	Fri Mar 19 03:33:40 2010	(r5260)
@@ -1,3 +1,5 @@
+#include <lib.h> /* Prototypes */
+
 static void write_phys(unsigned long addr, unsigned long value)
 {
    // Assembler in lib/ is very ugly. But we properly guarded

Modified: trunk/src/mainboard/tyan/s2892/romstage.c
==============================================================================
--- trunk/src/mainboard/tyan/s2892/romstage.c	Thu Mar 18 21:58:41 2010	(r5259)
+++ trunk/src/mainboard/tyan/s2892/romstage.c	Fri Mar 19 03:33:40 2010	(r5260)
@@ -17,7 +17,6 @@
 #include "option_table.h"
 #include "pc80/mc146818rtc_early.c"

-#define post_code(x) outb(x, 0x80)
 #include "pc80/serial.c"
 #include "arch/i386/lib/console.c"
 #include "lib/ramtest.c"

Modified: trunk/src/pc80/serial.c
==============================================================================
--- trunk/src/pc80/serial.c	Thu Mar 18 21:58:41 2010	(r5259)
+++ trunk/src/pc80/serial.c	Fri Mar 19 03:33:40 2010	(r5260)
@@ -1,3 +1,5 @@
+#include <lib.h> /* Prototypes */
+
 /* Base Address */
 #ifndef CONFIG_TTYS0_BASE
 #define CONFIG_TTYS0_BASE 0x3f8