From: Patrick Georgi Date: Sat, 8 May 2010 09:14:51 +0000 (+0000) Subject: Drop console/console.c and pc80/serial.c from mainboards' X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=coreboot.git;a=commitdiff_plain;h=12584e2bd2ec7ab1ed60dc524574c8ae04dc17d6 Drop console/console.c and pc80/serial.c from mainboards' romstage.c. Signed-off-by: Patrick Georgi Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5528 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- diff --git a/src/console/Makefile.inc b/src/console/Makefile.inc index 8de1a7b46..1b04c6591 100644 --- a/src/console/Makefile.inc +++ b/src/console/Makefile.inc @@ -7,6 +7,7 @@ smmobj-y += printk.o smmobj-y += vtxprintf.o initobj-y += vtxprintf.o +initobj-$(CONFIG_USE_DCACHE_RAM) += console.o driver-$(CONFIG_CONSOLE_SERIAL8250) += uart8250_console.o driver-$(CONFIG_USBDEBUG_DIRECT) += usbdebug_direct_console.o diff --git a/src/console/console.c b/src/console/console.c index 016c3b966..ee7fffe6d 100644 --- a/src/console/console.c +++ b/src/console/console.c @@ -5,9 +5,9 @@ #include #include #include +#include #ifndef __PRE_RAM__ -#include #include #include diff --git a/src/include/console/console.h b/src/include/console/console.h index 36661c25c..9b3b88678 100644 --- a/src/include/console/console.h +++ b/src/include/console/console.h @@ -307,4 +307,9 @@ static void print_spew(const char *str) { __console_tx_string(BIOS_SPEW, str); } #endif +#ifdef __ROMCC__ +/* if included by romcc, include the sources, too. romcc can't use prototypes */ +#include +#endif + #endif /* CONSOLE_CONSOLE_H_ */ diff --git a/src/mainboard/a-trend/atc-6220/romstage.c b/src/mainboard/a-trend/atc-6220/romstage.c index 526297240..343a2e6ce 100644 --- a/src/mainboard/a-trend/atc-6220/romstage.c +++ b/src/mainboard/a-trend/atc-6220/romstage.c @@ -26,7 +26,7 @@ #include #include #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_enable_rom.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c" diff --git a/src/mainboard/a-trend/atc-6240/romstage.c b/src/mainboard/a-trend/atc-6240/romstage.c index 389eea3ac..6965f19b1 100644 --- a/src/mainboard/a-trend/atc-6240/romstage.c +++ b/src/mainboard/a-trend/atc-6240/romstage.c @@ -26,7 +26,7 @@ #include #include #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_enable_rom.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c" diff --git a/src/mainboard/abit/be6-ii_v2_0/romstage.c b/src/mainboard/abit/be6-ii_v2_0/romstage.c index 03ee0f414..fc065ebd7 100644 --- a/src/mainboard/abit/be6-ii_v2_0/romstage.c +++ b/src/mainboard/abit/be6-ii_v2_0/romstage.c @@ -26,7 +26,7 @@ #include #include #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_enable_rom.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c" diff --git a/src/mainboard/advantech/pcm-5820/romstage.c b/src/mainboard/advantech/pcm-5820/romstage.c index e34d3955c..854cdcc8b 100644 --- a/src/mainboard/advantech/pcm-5820/romstage.c +++ b/src/mainboard/advantech/pcm-5820/romstage.c @@ -24,7 +24,7 @@ #include #include #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "northbridge/amd/gx1/raminit.c" #include "cpu/x86/bist.h" diff --git a/src/mainboard/amd/db800/romstage.c b/src/mainboard/amd/db800/romstage.c index eeee9ec94..893e73dd4 100644 --- a/src/mainboard/amd/db800/romstage.c +++ b/src/mainboard/amd/db800/romstage.c @@ -19,13 +19,12 @@ */ #include +#include #include #include #include #include -#include "pc80/serial.c" #include -#include "console/console.c" #include "lib/ramtest.c" #include "cpu/x86/bist.h" #include "cpu/x86/msr.h" @@ -33,7 +32,6 @@ #include #include "southbridge/amd/cs5536/cs5536.h" -#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) #define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1) #include "southbridge/amd/cs5536/cs5536_early_smbus.c" diff --git a/src/mainboard/amd/dbm690t/romstage.c b/src/mainboard/amd/dbm690t/romstage.c index 380811d79..005de2c40 100644 --- a/src/mainboard/amd/dbm690t/romstage.c +++ b/src/mainboard/amd/dbm690t/romstage.c @@ -42,8 +42,7 @@ #include #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #include #include "northbridge/amd/amdk8/raminit.h" diff --git a/src/mainboard/amd/mahogany/romstage.c b/src/mainboard/amd/mahogany/romstage.c index adf15ee7e..af0b5cd16 100644 --- a/src/mainboard/amd/mahogany/romstage.c +++ b/src/mainboard/amd/mahogany/romstage.c @@ -42,8 +42,7 @@ #include #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #include #include "northbridge/amd/amdk8/raminit.h" diff --git a/src/mainboard/amd/mahogany_fam10/romstage.c b/src/mainboard/amd/mahogany_fam10/romstage.c index 17a0fd606..de8058e30 100644 --- a/src/mainboard/amd/mahogany_fam10/romstage.c +++ b/src/mainboard/amd/mahogany_fam10/romstage.c @@ -47,8 +47,7 @@ #include #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "console/console.c" -#include "pc80/serial.c" +#include #include "lib/ramtest.c" #include #include "northbridge/amd/amdfam10/raminit.h" diff --git a/src/mainboard/amd/norwich/romstage.c b/src/mainboard/amd/norwich/romstage.c index e19b8ac25..1cc020fd4 100644 --- a/src/mainboard/amd/norwich/romstage.c +++ b/src/mainboard/amd/norwich/romstage.c @@ -23,8 +23,7 @@ #include #include #include -#include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "cpu/x86/bist.h" #include "cpu/x86/msr.h" diff --git a/src/mainboard/amd/pistachio/romstage.c b/src/mainboard/amd/pistachio/romstage.c index 775403e4f..58806e8ba 100644 --- a/src/mainboard/amd/pistachio/romstage.c +++ b/src/mainboard/amd/pistachio/romstage.c @@ -36,8 +36,7 @@ #include #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #include #include "northbridge/amd/amdk8/raminit.h" diff --git a/src/mainboard/amd/rumba/romstage.c b/src/mainboard/amd/rumba/romstage.c index 958cf3196..6c988ef8b 100644 --- a/src/mainboard/amd/rumba/romstage.c +++ b/src/mainboard/amd/rumba/romstage.c @@ -5,7 +5,7 @@ #include #include #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "superio/winbond/w83627hf/w83627hf_early_serial.c" #include "cpu/x86/bist.h" diff --git a/src/mainboard/amd/serengeti_cheetah/romstage.c b/src/mainboard/amd/serengeti_cheetah/romstage.c index 6fcaa9087..f89ea846a 100644 --- a/src/mainboard/amd/serengeti_cheetah/romstage.c +++ b/src/mainboard/amd/serengeti_cheetah/romstage.c @@ -29,8 +29,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #include #include "southbridge/amd/amd8111/amd8111_early_smbus.c" #include diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c b/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c index b571d37c4..17cee7584 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c +++ b/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c @@ -47,8 +47,7 @@ #include #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "console/console.c" -#include "pc80/serial.c" +#include #include "lib/ramtest.c" #include #include "southbridge/amd/amd8111/amd8111_early_smbus.c" diff --git a/src/mainboard/amd/tilapia_fam10/romstage.c b/src/mainboard/amd/tilapia_fam10/romstage.c index 7d70dff6d..d0bbaa402 100644 --- a/src/mainboard/amd/tilapia_fam10/romstage.c +++ b/src/mainboard/amd/tilapia_fam10/romstage.c @@ -47,8 +47,7 @@ #include #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "console/console.c" -#include "pc80/serial.c" +#include #include "lib/ramtest.c" #include #include "northbridge/amd/amdfam10/raminit.h" diff --git a/src/mainboard/arima/hdama/romstage.c b/src/mainboard/arima/hdama/romstage.c index dfae77941..cdbea42bd 100644 --- a/src/mainboard/arima/hdama/romstage.c +++ b/src/mainboard/arima/hdama/romstage.c @@ -7,8 +7,7 @@ #include #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include diff --git a/src/mainboard/artecgroup/dbe61/romstage.c b/src/mainboard/artecgroup/dbe61/romstage.c index 07fd54872..48be6820c 100644 --- a/src/mainboard/artecgroup/dbe61/romstage.c +++ b/src/mainboard/artecgroup/dbe61/romstage.c @@ -25,8 +25,7 @@ #include #include #include -#include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "cpu/x86/bist.h" #include "cpu/x86/msr.h" diff --git a/src/mainboard/asi/mb_5blgp/romstage.c b/src/mainboard/asi/mb_5blgp/romstage.c index 3ee9241d5..dae710c10 100644 --- a/src/mainboard/asi/mb_5blgp/romstage.c +++ b/src/mainboard/asi/mb_5blgp/romstage.c @@ -24,7 +24,7 @@ #include #include #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "northbridge/amd/gx1/raminit.c" #include "cpu/x86/bist.h" diff --git a/src/mainboard/asi/mb_5blmp/romstage.c b/src/mainboard/asi/mb_5blmp/romstage.c index 693e44093..0d7684188 100644 --- a/src/mainboard/asi/mb_5blmp/romstage.c +++ b/src/mainboard/asi/mb_5blmp/romstage.c @@ -25,7 +25,7 @@ #include #include #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "northbridge/amd/gx1/raminit.c" #include "superio/nsc/pc87351/pc87351_early_serial.c" diff --git a/src/mainboard/asrock/939a785gmh/romstage.c b/src/mainboard/asrock/939a785gmh/romstage.c index 05b63362b..8060b4a3d 100644 --- a/src/mainboard/asrock/939a785gmh/romstage.c +++ b/src/mainboard/asrock/939a785gmh/romstage.c @@ -43,8 +43,7 @@ #include #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #include #include "northbridge/amd/amdk8/raminit.h" diff --git a/src/mainboard/asus/a8n_e/romstage.c b/src/mainboard/asus/a8n_e/romstage.c index 247aa740a..8f2d6ba3d 100644 --- a/src/mainboard/asus/a8n_e/romstage.c +++ b/src/mainboard/asus/a8n_e/romstage.c @@ -48,8 +48,7 @@ #define CK804_NUM 1 #include -#include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "northbridge/amd/amdk8/incoherent_ht.c" #include "southbridge/nvidia/ck804/ck804_early_smbus.c" diff --git a/src/mainboard/asus/a8v-e_se/romstage.c b/src/mainboard/asus/a8v-e_se/romstage.c index f571bae47..4bed32b02 100644 --- a/src/mainboard/asus/a8v-e_se/romstage.c +++ b/src/mainboard/asus/a8v-e_se/romstage.c @@ -46,8 +46,7 @@ unsigned int get_sbdn(unsigned bus); #include #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #include #include "northbridge/amd/amdk8/raminit.h" #include "cpu/amd/model_fxx/apic_timer.c" diff --git a/src/mainboard/asus/m2v-mx_se/romstage.c b/src/mainboard/asus/m2v-mx_se/romstage.c index ea9870798..2ee0fb0ef 100644 --- a/src/mainboard/asus/m2v-mx_se/romstage.c +++ b/src/mainboard/asus/m2v-mx_se/romstage.c @@ -51,8 +51,7 @@ unsigned int get_sbdn(unsigned bus); #include #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #include #include "northbridge/amd/amdk8/raminit.h" #include "cpu/amd/model_fxx/apic_timer.c" diff --git a/src/mainboard/asus/mew-am/romstage.c b/src/mainboard/asus/mew-am/romstage.c index 223201971..bb4d6e763 100644 --- a/src/mainboard/asus/mew-am/romstage.c +++ b/src/mainboard/asus/mew-am/romstage.c @@ -26,7 +26,7 @@ #include #include #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "southbridge/intel/i82801ax/i82801ax_early_smbus.c" #include "northbridge/intel/i82810/raminit.h" diff --git a/src/mainboard/asus/mew-vm/romstage.c b/src/mainboard/asus/mew-vm/romstage.c index 22fa410e3..bd72ff14f 100644 --- a/src/mainboard/asus/mew-vm/romstage.c +++ b/src/mainboard/asus/mew-vm/romstage.c @@ -26,7 +26,7 @@ #include #include #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "superio/smsc/lpc47b272/lpc47b272_early_serial.c" #include "northbridge/intel/i82810/raminit.h" diff --git a/src/mainboard/asus/p2b-d/romstage.c b/src/mainboard/asus/p2b-d/romstage.c index 1056360a9..7a390db94 100644 --- a/src/mainboard/asus/p2b-d/romstage.c +++ b/src/mainboard/asus/p2b-d/romstage.c @@ -27,7 +27,7 @@ #include #include #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_enable_rom.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c" diff --git a/src/mainboard/asus/p2b-ds/romstage.c b/src/mainboard/asus/p2b-ds/romstage.c index 6e4404865..ccb10a76b 100644 --- a/src/mainboard/asus/p2b-ds/romstage.c +++ b/src/mainboard/asus/p2b-ds/romstage.c @@ -27,7 +27,7 @@ #include #include #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_enable_rom.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c" diff --git a/src/mainboard/asus/p2b-f/romstage.c b/src/mainboard/asus/p2b-f/romstage.c index 8974174de..d09f932b8 100644 --- a/src/mainboard/asus/p2b-f/romstage.c +++ b/src/mainboard/asus/p2b-f/romstage.c @@ -26,7 +26,7 @@ #include #include #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_enable_rom.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c" diff --git a/src/mainboard/asus/p2b-ls/romstage.c b/src/mainboard/asus/p2b-ls/romstage.c index 462df7015..9bf2dd7b7 100644 --- a/src/mainboard/asus/p2b-ls/romstage.c +++ b/src/mainboard/asus/p2b-ls/romstage.c @@ -26,7 +26,7 @@ #include #include #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_enable_rom.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c" diff --git a/src/mainboard/asus/p2b/romstage.c b/src/mainboard/asus/p2b/romstage.c index 2445b503c..21f33ff9d 100644 --- a/src/mainboard/asus/p2b/romstage.c +++ b/src/mainboard/asus/p2b/romstage.c @@ -26,7 +26,7 @@ #include #include #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_enable_rom.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c" diff --git a/src/mainboard/asus/p3b-f/romstage.c b/src/mainboard/asus/p3b-f/romstage.c index 5da8dbf5c..ffaf1da6a 100644 --- a/src/mainboard/asus/p3b-f/romstage.c +++ b/src/mainboard/asus/p3b-f/romstage.c @@ -26,7 +26,7 @@ #include #include #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_enable_rom.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c" diff --git a/src/mainboard/axus/tc320/romstage.c b/src/mainboard/axus/tc320/romstage.c index 4a6cc25a1..0dfbd3407 100644 --- a/src/mainboard/axus/tc320/romstage.c +++ b/src/mainboard/axus/tc320/romstage.c @@ -25,7 +25,7 @@ #include #include #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "northbridge/amd/gx1/raminit.c" #include "superio/nsc/pc97317/pc97317_early_serial.c" diff --git a/src/mainboard/azza/pt-6ibd/romstage.c b/src/mainboard/azza/pt-6ibd/romstage.c index e7ed47887..925bbabc3 100644 --- a/src/mainboard/azza/pt-6ibd/romstage.c +++ b/src/mainboard/azza/pt-6ibd/romstage.c @@ -26,7 +26,7 @@ #include #include #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_enable_rom.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c" diff --git a/src/mainboard/bcom/winnet100/romstage.c b/src/mainboard/bcom/winnet100/romstage.c index 744623f84..05174495c 100644 --- a/src/mainboard/bcom/winnet100/romstage.c +++ b/src/mainboard/bcom/winnet100/romstage.c @@ -25,7 +25,7 @@ #include #include #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "northbridge/amd/gx1/raminit.c" #include "superio/nsc/pc97317/pc97317_early_serial.c" diff --git a/src/mainboard/bcom/winnetp680/romstage.c b/src/mainboard/bcom/winnetp680/romstage.c index b5632a534..cdf4ad359 100644 --- a/src/mainboard/bcom/winnetp680/romstage.c +++ b/src/mainboard/bcom/winnetp680/romstage.c @@ -26,8 +26,7 @@ #include #include #include -#include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "northbridge/via/cn700/raminit.h" #include "cpu/x86/mtrr/earlymtrr.c" diff --git a/src/mainboard/biostar/m6tba/romstage.c b/src/mainboard/biostar/m6tba/romstage.c index 69f07f351..d66d5e802 100644 --- a/src/mainboard/biostar/m6tba/romstage.c +++ b/src/mainboard/biostar/m6tba/romstage.c @@ -26,7 +26,7 @@ #include #include #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_enable_rom.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c" diff --git a/src/mainboard/broadcom/blast/romstage.c b/src/mainboard/broadcom/blast/romstage.c index 13f5f9741..ada56b001 100644 --- a/src/mainboard/broadcom/blast/romstage.c +++ b/src/mainboard/broadcom/blast/romstage.c @@ -13,8 +13,7 @@ #include #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include diff --git a/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c b/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c index fbc195ab6..84864efe0 100644 --- a/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c +++ b/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c @@ -26,7 +26,7 @@ #include #include #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_enable_rom.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c" diff --git a/src/mainboard/dell/s1850/romstage.c b/src/mainboard/dell/s1850/romstage.c index 07fbef282..981b5c4fa 100644 --- a/src/mainboard/dell/s1850/romstage.c +++ b/src/mainboard/dell/s1850/romstage.c @@ -8,7 +8,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "southbridge/intel/i82801ex/i82801ex_early_smbus.c" #include "northbridge/intel/e7520/raminit.h" diff --git a/src/mainboard/digitallogic/adl855pc/romstage.c b/src/mainboard/digitallogic/adl855pc/romstage.c index a137a3fd6..424b2e1ed 100644 --- a/src/mainboard/digitallogic/adl855pc/romstage.c +++ b/src/mainboard/digitallogic/adl855pc/romstage.c @@ -8,8 +8,7 @@ #include #include "pc80/udelay_io.c" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "southbridge/intel/i82801dx/i82801dx.h" #include "southbridge/intel/i82801dx/i82801dx_early_smbus.c" diff --git a/src/mainboard/digitallogic/msm586seg/romstage.c b/src/mainboard/digitallogic/msm586seg/romstage.c index ae964fea9..b94558bd5 100644 --- a/src/mainboard/digitallogic/msm586seg/romstage.c +++ b/src/mainboard/digitallogic/msm586seg/romstage.c @@ -6,7 +6,7 @@ #include #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "cpu/x86/bist.h" //#include "lib/delay.c" diff --git a/src/mainboard/digitallogic/msm800sev/romstage.c b/src/mainboard/digitallogic/msm800sev/romstage.c index 379f5517b..0a9b6dfe9 100644 --- a/src/mainboard/digitallogic/msm800sev/romstage.c +++ b/src/mainboard/digitallogic/msm800sev/romstage.c @@ -4,8 +4,7 @@ #include #include #include -#include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "cpu/x86/bist.h" #include "cpu/x86/msr.h" diff --git a/src/mainboard/eaglelion/5bcm/romstage.c b/src/mainboard/eaglelion/5bcm/romstage.c index 11fe81250..e19a016f1 100644 --- a/src/mainboard/eaglelion/5bcm/romstage.c +++ b/src/mainboard/eaglelion/5bcm/romstage.c @@ -6,7 +6,7 @@ #include #include #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" //#include "southbridge/intel/i440bx/i440bx_early_smbus.c" #include "superio/nsc/pc97317/pc97317_early_serial.c" diff --git a/src/mainboard/emulation/qemu-x86/romstage.c b/src/mainboard/emulation/qemu-x86/romstage.c index 0543815a6..8dce43e8e 100644 --- a/src/mainboard/emulation/qemu-x86/romstage.c +++ b/src/mainboard/emulation/qemu-x86/romstage.c @@ -8,7 +8,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" -#include "console/console.c" +#include #include "pc80/udelay_io.c" #include "lib/delay.c" #include "cpu/x86/lapic/boot_cpu.c" diff --git a/src/mainboard/gigabyte/ga-6bxc/romstage.c b/src/mainboard/gigabyte/ga-6bxc/romstage.c index 721b20806..cd262af99 100644 --- a/src/mainboard/gigabyte/ga-6bxc/romstage.c +++ b/src/mainboard/gigabyte/ga-6bxc/romstage.c @@ -26,7 +26,7 @@ #include #include #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_enable_rom.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c" diff --git a/src/mainboard/gigabyte/ga_2761gxdk/romstage.c b/src/mainboard/gigabyte/ga_2761gxdk/romstage.c index 18bebc6d7..5aee58d86 100644 --- a/src/mainboard/gigabyte/ga_2761gxdk/romstage.c +++ b/src/mainboard/gigabyte/ga_2761gxdk/romstage.c @@ -53,8 +53,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #if CONFIG_USBDEBUG_DIRECT #include "southbridge/sis/sis966/sis966_enable_usbdebug_direct.c" #include "pc80/usbdebug_direct_serial.c" diff --git a/src/mainboard/gigabyte/m57sli/romstage.c b/src/mainboard/gigabyte/m57sli/romstage.c index 3f2f5e6f5..ad6ee79ab 100644 --- a/src/mainboard/gigabyte/m57sli/romstage.c +++ b/src/mainboard/gigabyte/m57sli/romstage.c @@ -51,8 +51,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #if CONFIG_USBDEBUG_DIRECT #include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug_direct.c" #include "pc80/usbdebug_direct_serial.c" diff --git a/src/mainboard/hp/dl145_g3/romstage.c b/src/mainboard/hp/dl145_g3/romstage.c index 799e3fa7e..dec92c3ec 100644 --- a/src/mainboard/hp/dl145_g3/romstage.c +++ b/src/mainboard/hp/dl145_g3/romstage.c @@ -57,8 +57,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include diff --git a/src/mainboard/hp/e_vectra_p2706t/romstage.c b/src/mainboard/hp/e_vectra_p2706t/romstage.c index 6757d76ae..a039e1f76 100644 --- a/src/mainboard/hp/e_vectra_p2706t/romstage.c +++ b/src/mainboard/hp/e_vectra_p2706t/romstage.c @@ -26,7 +26,7 @@ #include #include #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" /* TODO: It's a PC87364 actually! */ #include "superio/nsc/pc87360/pc87360_early_serial.c" diff --git a/src/mainboard/ibm/e325/romstage.c b/src/mainboard/ibm/e325/romstage.c index 7697450b0..a63f9587f 100644 --- a/src/mainboard/ibm/e325/romstage.c +++ b/src/mainboard/ibm/e325/romstage.c @@ -9,8 +9,7 @@ #include #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include diff --git a/src/mainboard/ibm/e326/romstage.c b/src/mainboard/ibm/e326/romstage.c index 0b38ec78f..db2439a55 100644 --- a/src/mainboard/ibm/e326/romstage.c +++ b/src/mainboard/ibm/e326/romstage.c @@ -9,8 +9,7 @@ #include #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include diff --git a/src/mainboard/iei/juki-511p/romstage.c b/src/mainboard/iei/juki-511p/romstage.c index 7b2dfb8bf..57041a13d 100644 --- a/src/mainboard/iei/juki-511p/romstage.c +++ b/src/mainboard/iei/juki-511p/romstage.c @@ -25,7 +25,7 @@ #include #include #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "superio/winbond/w83977f/w83977f_early_serial.c" #include "southbridge/amd/cs5530/cs5530_enable_rom.c" diff --git a/src/mainboard/iei/nova4899r/romstage.c b/src/mainboard/iei/nova4899r/romstage.c index 0873450b9..a7074d681 100644 --- a/src/mainboard/iei/nova4899r/romstage.c +++ b/src/mainboard/iei/nova4899r/romstage.c @@ -25,7 +25,7 @@ #include #include #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "superio/winbond/w83977tf/w83977tf_early_serial.c" #include "southbridge/amd/cs5530/cs5530_enable_rom.c" diff --git a/src/mainboard/iei/pcisa-lx-800-r10/romstage.c b/src/mainboard/iei/pcisa-lx-800-r10/romstage.c index 32ffda24d..b41b82ba7 100644 --- a/src/mainboard/iei/pcisa-lx-800-r10/romstage.c +++ b/src/mainboard/iei/pcisa-lx-800-r10/romstage.c @@ -23,8 +23,7 @@ #include #include #include -#include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "cpu/x86/bist.h" #include "cpu/x86/msr.h" diff --git a/src/mainboard/intel/d945gclf/romstage.c b/src/mainboard/intel/d945gclf/romstage.c index 45e9fb134..c50a66f77 100644 --- a/src/mainboard/intel/d945gclf/romstage.c +++ b/src/mainboard/intel/d945gclf/romstage.c @@ -37,8 +37,6 @@ #include "pc80/mc146818rtc_early.c" #include -#include "pc80/serial.c" -#include "console/console.c" #include #if CONFIG_USBDEBUG_DIRECT diff --git a/src/mainboard/intel/eagleheights/romstage.c b/src/mainboard/intel/eagleheights/romstage.c index 39490fa68..cc6966b07 100644 --- a/src/mainboard/intel/eagleheights/romstage.c +++ b/src/mainboard/intel/eagleheights/romstage.c @@ -32,8 +32,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #include #include "lib/ramtest.c" diff --git a/src/mainboard/intel/jarrell/romstage.c b/src/mainboard/intel/jarrell/romstage.c index 823519984..3a9112748 100644 --- a/src/mainboard/intel/jarrell/romstage.c +++ b/src/mainboard/intel/jarrell/romstage.c @@ -8,7 +8,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "southbridge/intel/i82801ex/i82801ex_early_smbus.c" #include "northbridge/intel/e7520/raminit.h" diff --git a/src/mainboard/intel/mtarvon/romstage.c b/src/mainboard/intel/mtarvon/romstage.c index 86ac6b7ba..8ac4399d3 100644 --- a/src/mainboard/intel/mtarvon/romstage.c +++ b/src/mainboard/intel/mtarvon/romstage.c @@ -28,7 +28,7 @@ #include #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "southbridge/intel/i3100/i3100_early_smbus.c" #include "southbridge/intel/i3100/i3100_early_lpc.c" diff --git a/src/mainboard/intel/truxton/romstage.c b/src/mainboard/intel/truxton/romstage.c index 9d44f259e..781f9b89b 100644 --- a/src/mainboard/intel/truxton/romstage.c +++ b/src/mainboard/intel/truxton/romstage.c @@ -29,7 +29,7 @@ #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" #include "pc80/udelay_io.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "southbridge/intel/i3100/i3100_early_smbus.c" #include "southbridge/intel/i3100/i3100_early_lpc.c" diff --git a/src/mainboard/intel/xe7501devkit/romstage.c b/src/mainboard/intel/xe7501devkit/romstage.c index 99f00212c..87c0a04d2 100644 --- a/src/mainboard/intel/xe7501devkit/romstage.c +++ b/src/mainboard/intel/xe7501devkit/romstage.c @@ -9,7 +9,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "southbridge/intel/i82801cx/i82801cx_early_smbus.c" #include "northbridge/intel/e7501/raminit.h" diff --git a/src/mainboard/iwill/dk8_htx/romstage.c b/src/mainboard/iwill/dk8_htx/romstage.c index af4c7b021..117113a9f 100644 --- a/src/mainboard/iwill/dk8_htx/romstage.c +++ b/src/mainboard/iwill/dk8_htx/romstage.c @@ -29,8 +29,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #include #include "southbridge/amd/amd8111/amd8111_early_smbus.c" #include "northbridge/amd/amdk8/raminit.h" diff --git a/src/mainboard/iwill/dk8s2/romstage.c b/src/mainboard/iwill/dk8s2/romstage.c index 9a2fede06..844312960 100644 --- a/src/mainboard/iwill/dk8s2/romstage.c +++ b/src/mainboard/iwill/dk8s2/romstage.c @@ -29,8 +29,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #include #include "southbridge/amd/amd8111/amd8111_early_smbus.c" #include "northbridge/amd/amdk8/raminit.h" diff --git a/src/mainboard/iwill/dk8x/romstage.c b/src/mainboard/iwill/dk8x/romstage.c index 9a2fede06..844312960 100644 --- a/src/mainboard/iwill/dk8x/romstage.c +++ b/src/mainboard/iwill/dk8x/romstage.c @@ -29,8 +29,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #include #include "southbridge/amd/amd8111/amd8111_early_smbus.c" #include "northbridge/amd/amdk8/raminit.h" diff --git a/src/mainboard/jetway/j7f24/romstage.c b/src/mainboard/jetway/j7f24/romstage.c index 0d8e9dad3..42ed91547 100644 --- a/src/mainboard/jetway/j7f24/romstage.c +++ b/src/mainboard/jetway/j7f24/romstage.c @@ -26,8 +26,7 @@ #include #include #include -#include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "northbridge/via/cn700/raminit.h" #include "cpu/x86/mtrr/earlymtrr.c" diff --git a/src/mainboard/kontron/986lcd-m/romstage.c b/src/mainboard/kontron/986lcd-m/romstage.c index 5c7724828..bcec4465f 100644 --- a/src/mainboard/kontron/986lcd-m/romstage.c +++ b/src/mainboard/kontron/986lcd-m/romstage.c @@ -46,8 +46,6 @@ #include "pc80/mc146818rtc_early.c" #include -#include "pc80/serial.c" -#include "console/console.c" #include #if CONFIG_USBDEBUG_DIRECT diff --git a/src/mainboard/kontron/kt690/romstage.c b/src/mainboard/kontron/kt690/romstage.c index 8b50cfc90..f30b23d3b 100644 --- a/src/mainboard/kontron/kt690/romstage.c +++ b/src/mainboard/kontron/kt690/romstage.c @@ -43,8 +43,7 @@ #include #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #include #include "northbridge/amd/amdk8/raminit.h" diff --git a/src/mainboard/lippert/frontrunner/romstage.c b/src/mainboard/lippert/frontrunner/romstage.c index 87337a2be..e9754519b 100644 --- a/src/mainboard/lippert/frontrunner/romstage.c +++ b/src/mainboard/lippert/frontrunner/romstage.c @@ -5,7 +5,7 @@ #include #include #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "superio/winbond/w83627hf/w83627hf_early_serial.c" #include "cpu/x86/bist.h" diff --git a/src/mainboard/lippert/roadrunner-lx/romstage.c b/src/mainboard/lippert/roadrunner-lx/romstage.c index 8aedd6380..912305245 100644 --- a/src/mainboard/lippert/roadrunner-lx/romstage.c +++ b/src/mainboard/lippert/roadrunner-lx/romstage.c @@ -27,8 +27,7 @@ #include #include #include -#include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "cpu/x86/bist.h" #include "cpu/x86/msr.h" diff --git a/src/mainboard/lippert/spacerunner-lx/romstage.c b/src/mainboard/lippert/spacerunner-lx/romstage.c index 5354c2b5d..acf6fdcd6 100644 --- a/src/mainboard/lippert/spacerunner-lx/romstage.c +++ b/src/mainboard/lippert/spacerunner-lx/romstage.c @@ -28,8 +28,7 @@ #include #include #include -#include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "cpu/x86/bist.h" #include "cpu/x86/msr.h" diff --git a/src/mainboard/mitac/6513wu/romstage.c b/src/mainboard/mitac/6513wu/romstage.c index 7a532e0fd..7a027e694 100644 --- a/src/mainboard/mitac/6513wu/romstage.c +++ b/src/mainboard/mitac/6513wu/romstage.c @@ -26,7 +26,7 @@ #include #include #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "southbridge/intel/i82801ax/i82801ax_early_smbus.c" #include "northbridge/intel/i82810/raminit.h" diff --git a/src/mainboard/msi/ms6119/romstage.c b/src/mainboard/msi/ms6119/romstage.c index 2bf27e3e8..ddebaec35 100644 --- a/src/mainboard/msi/ms6119/romstage.c +++ b/src/mainboard/msi/ms6119/romstage.c @@ -26,7 +26,7 @@ #include #include #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_enable_rom.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c" diff --git a/src/mainboard/msi/ms6147/romstage.c b/src/mainboard/msi/ms6147/romstage.c index 2a6dce7be..a65b37179 100644 --- a/src/mainboard/msi/ms6147/romstage.c +++ b/src/mainboard/msi/ms6147/romstage.c @@ -26,7 +26,7 @@ #include #include #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_enable_rom.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c" diff --git a/src/mainboard/msi/ms6156/romstage.c b/src/mainboard/msi/ms6156/romstage.c index 71f5de132..10ec2cc76 100644 --- a/src/mainboard/msi/ms6156/romstage.c +++ b/src/mainboard/msi/ms6156/romstage.c @@ -26,7 +26,7 @@ #include #include #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_enable_rom.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c" diff --git a/src/mainboard/msi/ms6178/romstage.c b/src/mainboard/msi/ms6178/romstage.c index a1096a401..1d21abb88 100644 --- a/src/mainboard/msi/ms6178/romstage.c +++ b/src/mainboard/msi/ms6178/romstage.c @@ -26,7 +26,7 @@ #include #include #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "superio/winbond/w83627hf/w83627hf_early_serial.c" #include "northbridge/intel/i82810/raminit.h" diff --git a/src/mainboard/msi/ms7135/romstage.c b/src/mainboard/msi/ms7135/romstage.c index 084f43194..4a6b9ef1a 100644 --- a/src/mainboard/msi/ms7135/romstage.c +++ b/src/mainboard/msi/ms7135/romstage.c @@ -50,8 +50,7 @@ #define CK804_USE_ACI 1 #include -#include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "northbridge/amd/amdk8/incoherent_ht.c" #include "southbridge/nvidia/ck804/ck804_early_smbus.c" diff --git a/src/mainboard/msi/ms7260/romstage.c b/src/mainboard/msi/ms7260/romstage.c index a5fbffbe4..167fa34e2 100644 --- a/src/mainboard/msi/ms7260/romstage.c +++ b/src/mainboard/msi/ms7260/romstage.c @@ -55,8 +55,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #if CONFIG_USBDEBUG_DIRECT #include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug_direct.c" #include "pc80/usbdebug_direct_serial.c" diff --git a/src/mainboard/msi/ms9185/romstage.c b/src/mainboard/msi/ms9185/romstage.c index bd1c4a118..134cbe7c5 100644 --- a/src/mainboard/msi/ms9185/romstage.c +++ b/src/mainboard/msi/ms9185/romstage.c @@ -49,8 +49,7 @@ #include #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #include #include "southbridge/broadcom/bcm5785/bcm5785_early_smbus.c" diff --git a/src/mainboard/msi/ms9282/romstage.c b/src/mainboard/msi/ms9282/romstage.c index ee44ea2ad..f2581db7b 100644 --- a/src/mainboard/msi/ms9282/romstage.c +++ b/src/mainboard/msi/ms9282/romstage.c @@ -44,8 +44,7 @@ #include #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #include #include "southbridge/nvidia/mcp55/mcp55_early_smbus.c" diff --git a/src/mainboard/msi/ms9652_fam10/romstage.c b/src/mainboard/msi/ms9652_fam10/romstage.c index c1cb92c8f..eb65924c8 100644 --- a/src/mainboard/msi/ms9652_fam10/romstage.c +++ b/src/mainboard/msi/ms9652_fam10/romstage.c @@ -45,8 +45,7 @@ #include #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #if CONFIG_USBDEBUG_DIRECT #include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug_direct.c" #include "pc80/usbdebug_direct_serial.c" diff --git a/src/mainboard/nec/powermate2000/romstage.c b/src/mainboard/nec/powermate2000/romstage.c index 33b04d983..00e552be7 100644 --- a/src/mainboard/nec/powermate2000/romstage.c +++ b/src/mainboard/nec/powermate2000/romstage.c @@ -26,7 +26,7 @@ #include #include #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "superio/smsc/smscsuperio/smscsuperio_early_serial.c" #include "northbridge/intel/i82810/raminit.h" diff --git a/src/mainboard/newisys/khepri/romstage.c b/src/mainboard/newisys/khepri/romstage.c index bf1186df4..0ff7943cb 100644 --- a/src/mainboard/newisys/khepri/romstage.c +++ b/src/mainboard/newisys/khepri/romstage.c @@ -14,8 +14,7 @@ #include #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include diff --git a/src/mainboard/nokia/ip530/romstage.c b/src/mainboard/nokia/ip530/romstage.c index efcec8a95..f5d38c803 100644 --- a/src/mainboard/nokia/ip530/romstage.c +++ b/src/mainboard/nokia/ip530/romstage.c @@ -26,7 +26,7 @@ #include #include #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_enable_rom.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c" diff --git a/src/mainboard/nvidia/l1_2pvv/romstage.c b/src/mainboard/nvidia/l1_2pvv/romstage.c index 62be8c2fd..db9373505 100644 --- a/src/mainboard/nvidia/l1_2pvv/romstage.c +++ b/src/mainboard/nvidia/l1_2pvv/romstage.c @@ -51,8 +51,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #if CONFIG_USBDEBUG_DIRECT #include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug_direct.c" #include "pc80/usbdebug_direct_serial.c" diff --git a/src/mainboard/olpc/btest/romstage.c b/src/mainboard/olpc/btest/romstage.c index fc605d1a8..821a0d5ef 100644 --- a/src/mainboard/olpc/btest/romstage.c +++ b/src/mainboard/olpc/btest/romstage.c @@ -5,7 +5,7 @@ #include #include #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "superio/winbond/w83627hf/w83627hf_early_serial.c" #include "cpu/x86/bist.h" diff --git a/src/mainboard/olpc/rev_a/romstage.c b/src/mainboard/olpc/rev_a/romstage.c index fc605d1a8..821a0d5ef 100644 --- a/src/mainboard/olpc/rev_a/romstage.c +++ b/src/mainboard/olpc/rev_a/romstage.c @@ -5,7 +5,7 @@ #include #include #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "superio/winbond/w83627hf/w83627hf_early_serial.c" #include "cpu/x86/bist.h" diff --git a/src/mainboard/pcengines/alix1c/romstage.c b/src/mainboard/pcengines/alix1c/romstage.c index ded187d63..ee101b944 100644 --- a/src/mainboard/pcengines/alix1c/romstage.c +++ b/src/mainboard/pcengines/alix1c/romstage.c @@ -24,8 +24,7 @@ #include #include #include -#include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "cpu/x86/bist.h" #include "cpu/x86/msr.h" diff --git a/src/mainboard/rca/rm4100/romstage.c b/src/mainboard/rca/rm4100/romstage.c index 554d7f125..908722a55 100644 --- a/src/mainboard/rca/rm4100/romstage.c +++ b/src/mainboard/rca/rm4100/romstage.c @@ -25,9 +25,8 @@ #include #include #include -#include "pc80/serial.c" #include "pc80/udelay_io.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "superio/smsc/smscsuperio/smscsuperio_early_serial.c" #include "northbridge/intel/i82830/raminit.h" diff --git a/src/mainboard/roda/rk886ex/romstage.c b/src/mainboard/roda/rk886ex/romstage.c index 044107cd5..df985d421 100644 --- a/src/mainboard/roda/rk886ex/romstage.c +++ b/src/mainboard/roda/rk886ex/romstage.c @@ -39,8 +39,6 @@ #include "pc80/mc146818rtc_early.c" #include -#include "pc80/serial.c" -#include "console/console.c" #include #if CONFIG_USBDEBUG_DIRECT diff --git a/src/mainboard/soyo/sy-6ba-plus-iii/romstage.c b/src/mainboard/soyo/sy-6ba-plus-iii/romstage.c index 1636c42f8..fb5afd248 100644 --- a/src/mainboard/soyo/sy-6ba-plus-iii/romstage.c +++ b/src/mainboard/soyo/sy-6ba-plus-iii/romstage.c @@ -26,7 +26,7 @@ #include #include #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_enable_rom.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c" diff --git a/src/mainboard/sunw/ultra40/romstage.c b/src/mainboard/sunw/ultra40/romstage.c index 76822ce45..1c31997bf 100644 --- a/src/mainboard/sunw/ultra40/romstage.c +++ b/src/mainboard/sunw/ultra40/romstage.c @@ -16,8 +16,7 @@ #include #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include diff --git a/src/mainboard/supermicro/h8dme/romstage.c b/src/mainboard/supermicro/h8dme/romstage.c index 4055e7065..adfe7e353 100644 --- a/src/mainboard/supermicro/h8dme/romstage.c +++ b/src/mainboard/supermicro/h8dme/romstage.c @@ -46,8 +46,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include diff --git a/src/mainboard/supermicro/h8dmr/romstage.c b/src/mainboard/supermicro/h8dmr/romstage.c index 3ef91c82b..b62b9877a 100644 --- a/src/mainboard/supermicro/h8dmr/romstage.c +++ b/src/mainboard/supermicro/h8dmr/romstage.c @@ -49,8 +49,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include diff --git a/src/mainboard/supermicro/h8dmr_fam10/romstage.c b/src/mainboard/supermicro/h8dmr_fam10/romstage.c index 3e68e86a7..35fae8d0e 100644 --- a/src/mainboard/supermicro/h8dmr_fam10/romstage.c +++ b/src/mainboard/supermicro/h8dmr_fam10/romstage.c @@ -44,8 +44,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include diff --git a/src/mainboard/supermicro/h8qme_fam10/romstage.c b/src/mainboard/supermicro/h8qme_fam10/romstage.c index 0d1657a17..ff33819f3 100644 --- a/src/mainboard/supermicro/h8qme_fam10/romstage.c +++ b/src/mainboard/supermicro/h8qme_fam10/romstage.c @@ -44,8 +44,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include diff --git a/src/mainboard/supermicro/x6dai_g/romstage.c b/src/mainboard/supermicro/x6dai_g/romstage.c index da5cadac0..136ecdeda 100644 --- a/src/mainboard/supermicro/x6dai_g/romstage.c +++ b/src/mainboard/supermicro/x6dai_g/romstage.c @@ -8,7 +8,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "pc80/udelay_io.c" #include "lib/delay.c" diff --git a/src/mainboard/supermicro/x6dhe_g/romstage.c b/src/mainboard/supermicro/x6dhe_g/romstage.c index 2549cb132..7f6129232 100644 --- a/src/mainboard/supermicro/x6dhe_g/romstage.c +++ b/src/mainboard/supermicro/x6dhe_g/romstage.c @@ -8,7 +8,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "pc80/udelay_io.c" #include "lib/delay.c" diff --git a/src/mainboard/supermicro/x6dhe_g2/romstage.c b/src/mainboard/supermicro/x6dhe_g2/romstage.c index 2b0cbc84d..012c1b0d1 100644 --- a/src/mainboard/supermicro/x6dhe_g2/romstage.c +++ b/src/mainboard/supermicro/x6dhe_g2/romstage.c @@ -8,7 +8,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "southbridge/intel/i82801ex/i82801ex_early_smbus.c" #include "northbridge/intel/e7520/raminit.h" diff --git a/src/mainboard/supermicro/x6dhr_ig/romstage.c b/src/mainboard/supermicro/x6dhr_ig/romstage.c index 16f0ac733..4ecc17e7b 100644 --- a/src/mainboard/supermicro/x6dhr_ig/romstage.c +++ b/src/mainboard/supermicro/x6dhr_ig/romstage.c @@ -8,7 +8,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "southbridge/intel/i82801ex/i82801ex_early_smbus.c" #include "northbridge/intel/e7520/raminit.h" diff --git a/src/mainboard/supermicro/x6dhr_ig2/romstage.c b/src/mainboard/supermicro/x6dhr_ig2/romstage.c index 8f5ca7930..3c92c64d2 100644 --- a/src/mainboard/supermicro/x6dhr_ig2/romstage.c +++ b/src/mainboard/supermicro/x6dhr_ig2/romstage.c @@ -8,7 +8,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "southbridge/intel/i82801ex/i82801ex_early_smbus.c" #include "northbridge/intel/e7520/raminit.h" diff --git a/src/mainboard/technexion/tim5690/romstage.c b/src/mainboard/technexion/tim5690/romstage.c index dd305a0a4..5e17c072b 100644 --- a/src/mainboard/technexion/tim5690/romstage.c +++ b/src/mainboard/technexion/tim5690/romstage.c @@ -42,8 +42,7 @@ #include #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #include #include "northbridge/amd/amdk8/raminit.h" diff --git a/src/mainboard/technexion/tim8690/romstage.c b/src/mainboard/technexion/tim8690/romstage.c index 3963e14e6..b6e214b2c 100644 --- a/src/mainboard/technexion/tim8690/romstage.c +++ b/src/mainboard/technexion/tim8690/romstage.c @@ -42,8 +42,7 @@ #include #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #include #include "northbridge/amd/amdk8/raminit.h" diff --git a/src/mainboard/technologic/ts5300/romstage.c b/src/mainboard/technologic/ts5300/romstage.c index d0f0d4c61..39d394024 100644 --- a/src/mainboard/technologic/ts5300/romstage.c +++ b/src/mainboard/technologic/ts5300/romstage.c @@ -12,7 +12,7 @@ #include #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "cpu/x86/bist.h" diff --git a/src/mainboard/televideo/tc7020/romstage.c b/src/mainboard/televideo/tc7020/romstage.c index 744623f84..05174495c 100644 --- a/src/mainboard/televideo/tc7020/romstage.c +++ b/src/mainboard/televideo/tc7020/romstage.c @@ -25,7 +25,7 @@ #include #include #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "northbridge/amd/gx1/raminit.c" #include "superio/nsc/pc97317/pc97317_early_serial.c" diff --git a/src/mainboard/thomson/ip1000/romstage.c b/src/mainboard/thomson/ip1000/romstage.c index 66b92d14b..9d37e00ad 100644 --- a/src/mainboard/thomson/ip1000/romstage.c +++ b/src/mainboard/thomson/ip1000/romstage.c @@ -26,9 +26,8 @@ #include #include #include -#include "pc80/serial.c" #include "pc80/udelay_io.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "superio/smsc/smscsuperio/smscsuperio_early_serial.c" #include "northbridge/intel/i82830/raminit.h" diff --git a/src/mainboard/tyan/s1846/romstage.c b/src/mainboard/tyan/s1846/romstage.c index 893eca59a..f183d4819 100644 --- a/src/mainboard/tyan/s1846/romstage.c +++ b/src/mainboard/tyan/s1846/romstage.c @@ -26,7 +26,7 @@ #include #include #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_enable_rom.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c" diff --git a/src/mainboard/tyan/s2735/romstage.c b/src/mainboard/tyan/s2735/romstage.c index de3124cb9..a292d99e1 100644 --- a/src/mainboard/tyan/s2735/romstage.c +++ b/src/mainboard/tyan/s2735/romstage.c @@ -8,8 +8,7 @@ #include #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "southbridge/intel/i82801ex/i82801ex_early_smbus.c" diff --git a/src/mainboard/tyan/s2850/romstage.c b/src/mainboard/tyan/s2850/romstage.c index 4e75e3683..d51c4a86d 100644 --- a/src/mainboard/tyan/s2850/romstage.c +++ b/src/mainboard/tyan/s2850/romstage.c @@ -9,8 +9,7 @@ #include #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include diff --git a/src/mainboard/tyan/s2875/romstage.c b/src/mainboard/tyan/s2875/romstage.c index ead3655fa..e074adb05 100644 --- a/src/mainboard/tyan/s2875/romstage.c +++ b/src/mainboard/tyan/s2875/romstage.c @@ -9,8 +9,7 @@ #include #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include diff --git a/src/mainboard/tyan/s2880/romstage.c b/src/mainboard/tyan/s2880/romstage.c index f75c541b9..5a3139c3e 100644 --- a/src/mainboard/tyan/s2880/romstage.c +++ b/src/mainboard/tyan/s2880/romstage.c @@ -9,8 +9,7 @@ #include #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include diff --git a/src/mainboard/tyan/s2881/romstage.c b/src/mainboard/tyan/s2881/romstage.c index 0a63486ff..a9a16ab73 100644 --- a/src/mainboard/tyan/s2881/romstage.c +++ b/src/mainboard/tyan/s2881/romstage.c @@ -13,8 +13,7 @@ #include #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include diff --git a/src/mainboard/tyan/s2882/romstage.c b/src/mainboard/tyan/s2882/romstage.c index d8816d4cf..5d0b70e99 100644 --- a/src/mainboard/tyan/s2882/romstage.c +++ b/src/mainboard/tyan/s2882/romstage.c @@ -9,8 +9,7 @@ #include #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include diff --git a/src/mainboard/tyan/s2885/romstage.c b/src/mainboard/tyan/s2885/romstage.c index f7ea579f6..0a0526060 100644 --- a/src/mainboard/tyan/s2885/romstage.c +++ b/src/mainboard/tyan/s2885/romstage.c @@ -8,8 +8,7 @@ #include #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include diff --git a/src/mainboard/tyan/s2891/romstage.c b/src/mainboard/tyan/s2891/romstage.c index 9d10355cc..289d44a5a 100644 --- a/src/mainboard/tyan/s2891/romstage.c +++ b/src/mainboard/tyan/s2891/romstage.c @@ -14,8 +14,7 @@ #include #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include diff --git a/src/mainboard/tyan/s2892/romstage.c b/src/mainboard/tyan/s2892/romstage.c index 2dec2e969..b84d6b605 100644 --- a/src/mainboard/tyan/s2892/romstage.c +++ b/src/mainboard/tyan/s2892/romstage.c @@ -14,8 +14,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include diff --git a/src/mainboard/tyan/s2895/romstage.c b/src/mainboard/tyan/s2895/romstage.c index e62c2a5c0..60f348ce2 100644 --- a/src/mainboard/tyan/s2895/romstage.c +++ b/src/mainboard/tyan/s2895/romstage.c @@ -15,8 +15,7 @@ #include #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include #include "northbridge/amd/amdk8/incoherent_ht.c" diff --git a/src/mainboard/tyan/s2912/romstage.c b/src/mainboard/tyan/s2912/romstage.c index 144c629e2..180b1eb26 100644 --- a/src/mainboard/tyan/s2912/romstage.c +++ b/src/mainboard/tyan/s2912/romstage.c @@ -51,8 +51,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #if CONFIG_USBDEBUG_DIRECT #include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug_direct.c" #include "pc80/usbdebug_direct_serial.c" diff --git a/src/mainboard/tyan/s2912_fam10/romstage.c b/src/mainboard/tyan/s2912_fam10/romstage.c index 6ca5eec3c..b65ac2dd1 100644 --- a/src/mainboard/tyan/s2912_fam10/romstage.c +++ b/src/mainboard/tyan/s2912_fam10/romstage.c @@ -45,8 +45,7 @@ #include #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #if CONFIG_USBDEBUG_DIRECT #include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug_direct.c" #include "pc80/usbdebug_direct_serial.c" diff --git a/src/mainboard/tyan/s4880/romstage.c b/src/mainboard/tyan/s4880/romstage.c index 753328c06..bbc8560ee 100644 --- a/src/mainboard/tyan/s4880/romstage.c +++ b/src/mainboard/tyan/s4880/romstage.c @@ -9,8 +9,7 @@ #include #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include diff --git a/src/mainboard/tyan/s4882/romstage.c b/src/mainboard/tyan/s4882/romstage.c index 9bec9de58..08f9f361c 100644 --- a/src/mainboard/tyan/s4882/romstage.c +++ b/src/mainboard/tyan/s4882/romstage.c @@ -8,8 +8,7 @@ #include #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include diff --git a/src/mainboard/via/epia-cn/romstage.c b/src/mainboard/via/epia-cn/romstage.c index 6d37e6bdf..eb7f29451 100644 --- a/src/mainboard/via/epia-cn/romstage.c +++ b/src/mainboard/via/epia-cn/romstage.c @@ -26,8 +26,7 @@ #include #include #include -#include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "northbridge/via/cn700/raminit.h" #include "cpu/x86/mtrr/earlymtrr.c" diff --git a/src/mainboard/via/epia-m/romstage.c b/src/mainboard/via/epia-m/romstage.c index 54feb2655..509575733 100644 --- a/src/mainboard/via/epia-m/romstage.c +++ b/src/mainboard/via/epia-m/romstage.c @@ -7,7 +7,7 @@ #include #include #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "northbridge/via/vt8623/raminit.h" #include "cpu/x86/mtrr/earlymtrr.c" diff --git a/src/mainboard/via/epia-m700/romstage.c b/src/mainboard/via/epia-m700/romstage.c index ac2e202d6..568a64a11 100644 --- a/src/mainboard/via/epia-m700/romstage.c +++ b/src/mainboard/via/epia-m700/romstage.c @@ -33,8 +33,7 @@ #include #include #include -#include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "northbridge/via/vx800/vx800.h" #include "cpu/x86/mtrr/earlymtrr.c" diff --git a/src/mainboard/via/epia-n/romstage.c b/src/mainboard/via/epia-n/romstage.c index df9f82ea9..0c2342479 100644 --- a/src/mainboard/via/epia-n/romstage.c +++ b/src/mainboard/via/epia-n/romstage.c @@ -27,7 +27,7 @@ #include #include #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "northbridge/via/cn400/raminit.h" #include "cpu/x86/mtrr/earlymtrr.c" diff --git a/src/mainboard/via/epia/romstage.c b/src/mainboard/via/epia/romstage.c index 66a8d203e..af2703cd4 100644 --- a/src/mainboard/via/epia/romstage.c +++ b/src/mainboard/via/epia/romstage.c @@ -6,7 +6,7 @@ #include #include #include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "northbridge/via/vt8601/raminit.h" #include "cpu/x86/mtrr/earlymtrr.c" diff --git a/src/mainboard/via/pc2500e/romstage.c b/src/mainboard/via/pc2500e/romstage.c index 0b87f5e03..71d916a82 100644 --- a/src/mainboard/via/pc2500e/romstage.c +++ b/src/mainboard/via/pc2500e/romstage.c @@ -27,8 +27,7 @@ #include #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "northbridge/via/cn700/raminit.h" #include "cpu/x86/mtrr/earlymtrr.c" diff --git a/src/mainboard/via/vt8454c/romstage.c b/src/mainboard/via/vt8454c/romstage.c index 1a1efbf8f..ba96cdb51 100644 --- a/src/mainboard/via/vt8454c/romstage.c +++ b/src/mainboard/via/vt8454c/romstage.c @@ -26,8 +26,7 @@ #include #include #include -#include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "northbridge/via/cx700/raminit.h" #include "cpu/x86/bist.h" diff --git a/src/mainboard/winent/pl6064/romstage.c b/src/mainboard/winent/pl6064/romstage.c index aa63ab406..f6d969681 100644 --- a/src/mainboard/winent/pl6064/romstage.c +++ b/src/mainboard/winent/pl6064/romstage.c @@ -20,12 +20,12 @@ */ #include +#include #include #include #include #include -#include "pc80/serial.c" -#include "console/console.c" +#include #include "lib/ramtest.c" #include "cpu/x86/bist.h" #include "cpu/x86/msr.h" @@ -33,7 +33,6 @@ #include #include "southbridge/amd/cs5536/cs5536.h" -#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) #define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1) #include "southbridge/amd/cs5536/cs5536_early_smbus.c" diff --git a/src/pc80/Makefile.inc b/src/pc80/Makefile.inc index 358c22185..5ed40b380 100644 --- a/src/pc80/Makefile.inc +++ b/src/pc80/Makefile.inc @@ -4,7 +4,7 @@ obj-y += i8259.o obj-$(CONFIG_UDELAY_IO) += udelay_io.o obj-y += keyboard.o -#initobj-y += serial.o +initobj-$(CONFIG_USE_DCACHE_RAM) += serial.o subdirs-y += vga $(obj)/pc80/mc146818rtc.o : $(OPTION_TABLE_H) diff --git a/src/pc80/serial.c b/src/pc80/serial.c index b4d054282..396a41914 100644 --- a/src/pc80/serial.c +++ b/src/pc80/serial.c @@ -1,4 +1,5 @@ #include /* Prototypes */ +#include /* Base Address */ #ifndef CONFIG_TTYS0_BASE