From be7f79867e4d989fc9cb7fb9e8b0b8ec55956875 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Fri, 13 Mar 2009 15:42:27 +0000 Subject: This, ladies and gentlement, is commit #4000. Use the (almost) same strict CFLAGS in v2 that we use on v3. And fix a few include files and missing prototypes. Also, fix up the Config-abuild.lb files to properly work for cross compiling. Signed-off-by: Stefan Reinauer Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4000 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/amd/serengeti_cheetah_fam10/cache_as_ram_auto.c | 6 +++++- src/mainboard/dell/s1850/chip.h | 2 +- src/mainboard/intel/jarrell/chip.h | 2 +- src/mainboard/intel/mtarvon/chip.h | 2 +- src/mainboard/intel/truxton/chip.h | 2 +- src/mainboard/intel/xe7501devkit/reset.c | 1 + src/mainboard/kontron/986lcd-m/chip.h | 2 +- src/mainboard/supermicro/x6dai_g/chip.h | 2 +- src/mainboard/supermicro/x6dai_g/mainboard.c | 2 +- src/mainboard/supermicro/x6dhe_g/chip.h | 2 +- src/mainboard/supermicro/x6dhe_g/mainboard.c | 2 +- src/mainboard/supermicro/x6dhe_g2/chip.h | 2 +- src/mainboard/supermicro/x6dhe_g2/mainboard.c | 2 +- src/mainboard/supermicro/x6dhr_ig/chip.h | 2 +- src/mainboard/supermicro/x6dhr_ig2/chip.h | 2 +- src/mainboard/tyan/s2735/reset.c | 1 + src/mainboard/via/epia-m/Options.lb | 4 ++++ src/mainboard/via/epia-m/mainboard.c | 1 + src/mainboard/via/epia-m/vgachip.h | 5 +++++ 19 files changed, 30 insertions(+), 14 deletions(-) (limited to 'src/mainboard') diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/cache_as_ram_auto.c b/src/mainboard/amd/serengeti_cheetah_fam10/cache_as_ram_auto.c index 26c624589c..d7b2379c24 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/cache_as_ram_auto.c +++ b/src/mainboard/amd/serengeti_cheetah_fam10/cache_as_ram_auto.c @@ -69,9 +69,13 @@ static void post_code(u8 value) { #include "northbridge/amd/amdfam10/amdfam10.h" #endif - #include "cpu/x86/lapic/boot_cpu.c" #include "northbridge/amd/amdfam10/reset_test.c" + +#include +void die(const char *msg); +int do_printk(int msg_level, const char *fmt, ...) __attribute__((format(printf, 2, 3))); +#define printk_emerg(fmt, arg...) do_printk(BIOS_EMERG ,fmt, ##arg) #include "cpu/x86/bist.h" diff --git a/src/mainboard/dell/s1850/chip.h b/src/mainboard/dell/s1850/chip.h index b6e23b2688..e168812d0e 100644 --- a/src/mainboard/dell/s1850/chip.h +++ b/src/mainboard/dell/s1850/chip.h @@ -1,4 +1,4 @@ -struct chip_operations mainboard_ops; +extern struct chip_operations mainboard_ops; struct mainboard_config { int nothing; diff --git a/src/mainboard/intel/jarrell/chip.h b/src/mainboard/intel/jarrell/chip.h index b6e23b2688..e168812d0e 100644 --- a/src/mainboard/intel/jarrell/chip.h +++ b/src/mainboard/intel/jarrell/chip.h @@ -1,4 +1,4 @@ -struct chip_operations mainboard_ops; +extern struct chip_operations mainboard_ops; struct mainboard_config { int nothing; diff --git a/src/mainboard/intel/mtarvon/chip.h b/src/mainboard/intel/mtarvon/chip.h index 4921b7bfcc..71c6c125d0 100644 --- a/src/mainboard/intel/mtarvon/chip.h +++ b/src/mainboard/intel/mtarvon/chip.h @@ -18,7 +18,7 @@ * */ -struct chip_operations mainboard_ops; +extern struct chip_operations mainboard_ops; struct mainboard_config { int nothing; diff --git a/src/mainboard/intel/truxton/chip.h b/src/mainboard/intel/truxton/chip.h index 4921b7bfcc..71c6c125d0 100644 --- a/src/mainboard/intel/truxton/chip.h +++ b/src/mainboard/intel/truxton/chip.h @@ -18,7 +18,7 @@ * */ -struct chip_operations mainboard_ops; +extern struct chip_operations mainboard_ops; struct mainboard_config { int nothing; diff --git a/src/mainboard/intel/xe7501devkit/reset.c b/src/mainboard/intel/xe7501devkit/reset.c index 349a2bfd29..8feaac64e5 100644 --- a/src/mainboard/intel/xe7501devkit/reset.c +++ b/src/mainboard/intel/xe7501devkit/reset.c @@ -1,3 +1,4 @@ +void i82801ca_hard_reset(void); void hard_reset(void) { diff --git a/src/mainboard/kontron/986lcd-m/chip.h b/src/mainboard/kontron/986lcd-m/chip.h index 08a66b677e..e1bf83b293 100644 --- a/src/mainboard/kontron/986lcd-m/chip.h +++ b/src/mainboard/kontron/986lcd-m/chip.h @@ -19,7 +19,7 @@ * MA 02110-1301 USA */ -struct chip_operations mainboard_ops; +extern struct chip_operations mainboard_ops; struct mainboard_config { int nothing; }; diff --git a/src/mainboard/supermicro/x6dai_g/chip.h b/src/mainboard/supermicro/x6dai_g/chip.h index b6e23b2688..e168812d0e 100644 --- a/src/mainboard/supermicro/x6dai_g/chip.h +++ b/src/mainboard/supermicro/x6dai_g/chip.h @@ -1,4 +1,4 @@ -struct chip_operations mainboard_ops; +extern struct chip_operations mainboard_ops; struct mainboard_config { int nothing; diff --git a/src/mainboard/supermicro/x6dai_g/mainboard.c b/src/mainboard/supermicro/x6dai_g/mainboard.c index b32dbd560e..1db8cd4b4b 100644 --- a/src/mainboard/supermicro/x6dai_g/mainboard.c +++ b/src/mainboard/supermicro/x6dai_g/mainboard.c @@ -1,7 +1,7 @@ #include #include "chip.h" -struct chip_operations supermicro_x6dai_g_ops = { +struct chip_operations mainboard_ops = { CHIP_NAME("Supermicro X6DAi-G Mainboard") }; diff --git a/src/mainboard/supermicro/x6dhe_g/chip.h b/src/mainboard/supermicro/x6dhe_g/chip.h index b6e23b2688..e168812d0e 100644 --- a/src/mainboard/supermicro/x6dhe_g/chip.h +++ b/src/mainboard/supermicro/x6dhe_g/chip.h @@ -1,4 +1,4 @@ -struct chip_operations mainboard_ops; +extern struct chip_operations mainboard_ops; struct mainboard_config { int nothing; diff --git a/src/mainboard/supermicro/x6dhe_g/mainboard.c b/src/mainboard/supermicro/x6dhe_g/mainboard.c index 343c9bb7da..a242dddcb3 100644 --- a/src/mainboard/supermicro/x6dhe_g/mainboard.c +++ b/src/mainboard/supermicro/x6dhe_g/mainboard.c @@ -1,7 +1,7 @@ #include #include "chip.h" -struct chip_operations supermicro_x6dhe_g_ops = { +struct chip_operations mainboard_ops = { CHIP_NAME("Supermicro X6DHE-G Mainboard") }; diff --git a/src/mainboard/supermicro/x6dhe_g2/chip.h b/src/mainboard/supermicro/x6dhe_g2/chip.h index b6e23b2688..e168812d0e 100644 --- a/src/mainboard/supermicro/x6dhe_g2/chip.h +++ b/src/mainboard/supermicro/x6dhe_g2/chip.h @@ -1,4 +1,4 @@ -struct chip_operations mainboard_ops; +extern struct chip_operations mainboard_ops; struct mainboard_config { int nothing; diff --git a/src/mainboard/supermicro/x6dhe_g2/mainboard.c b/src/mainboard/supermicro/x6dhe_g2/mainboard.c index 856dc8f53d..fdb67cc983 100644 --- a/src/mainboard/supermicro/x6dhe_g2/mainboard.c +++ b/src/mainboard/supermicro/x6dhe_g2/mainboard.c @@ -1,7 +1,7 @@ #include #include "chip.h" -struct chip_operations supermicro_x6dhe_g2_ops = { +struct chip_operations mainboard_ops = { CHIP_NAME("Supermicro X6DHE-G2 Mainboard") }; diff --git a/src/mainboard/supermicro/x6dhr_ig/chip.h b/src/mainboard/supermicro/x6dhr_ig/chip.h index b6e23b2688..e168812d0e 100644 --- a/src/mainboard/supermicro/x6dhr_ig/chip.h +++ b/src/mainboard/supermicro/x6dhr_ig/chip.h @@ -1,4 +1,4 @@ -struct chip_operations mainboard_ops; +extern struct chip_operations mainboard_ops; struct mainboard_config { int nothing; diff --git a/src/mainboard/supermicro/x6dhr_ig2/chip.h b/src/mainboard/supermicro/x6dhr_ig2/chip.h index b6e23b2688..e168812d0e 100644 --- a/src/mainboard/supermicro/x6dhr_ig2/chip.h +++ b/src/mainboard/supermicro/x6dhr_ig2/chip.h @@ -1,4 +1,4 @@ -struct chip_operations mainboard_ops; +extern struct chip_operations mainboard_ops; struct mainboard_config { int nothing; diff --git a/src/mainboard/tyan/s2735/reset.c b/src/mainboard/tyan/s2735/reset.c index 3cc3d54988..4b2ab0daae 100644 --- a/src/mainboard/tyan/s2735/reset.c +++ b/src/mainboard/tyan/s2735/reset.c @@ -1,3 +1,4 @@ +void i82801er_hard_reset(void); void hard_reset(void) { diff --git a/src/mainboard/via/epia-m/Options.lb b/src/mainboard/via/epia-m/Options.lb index 575cc5eeb3..54daa917af 100644 --- a/src/mainboard/via/epia-m/Options.lb +++ b/src/mainboard/via/epia-m/Options.lb @@ -137,5 +137,9 @@ default HOSTCC="gcc" ## default CONFIG_MAX_PCI_BUSES = 5 +default MAXIMUM_CONSOLE_LOGLEVEL=8 +default DEFAULT_CONSOLE_LOGLEVEL=8 +default CONFIG_CONSOLE_SERIAL8250=1 + end diff --git a/src/mainboard/via/epia-m/mainboard.c b/src/mainboard/via/epia-m/mainboard.c index 64b7c6d232..bec7d6a2f4 100644 --- a/src/mainboard/via/epia-m/mainboard.c +++ b/src/mainboard/via/epia-m/mainboard.c @@ -5,6 +5,7 @@ #include #include #include "chip.h" +#include "vgachip.h" void vga_enable_console(); diff --git a/src/mainboard/via/epia-m/vgachip.h b/src/mainboard/via/epia-m/vgachip.h index d43788cd66..c623c8969a 100644 --- a/src/mainboard/via/epia-m/vgachip.h +++ b/src/mainboard/via/epia-m/vgachip.h @@ -7,4 +7,9 @@ struct pc80_vgabios_config { int nothing; }; +void vga_enable_console(void); +void do_vgabios(void); +void setup_realmode_idt(void); +void write_protect_vgabios(void); + #endif /* _PC80_VGABIOS */ -- cgit v1.2.3