Author: oxygene Date: Sat May 8 11:14:51 2010 New Revision: 5528 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5528
Log: Drop console/console.c and pc80/serial.c from mainboards' romstage.c.
Signed-off-by: Patrick Georgi patrick.georgi@coresystems.de Acked-by: Stefan Reinauer stepan@coresystems.de
Modified: trunk/src/console/Makefile.inc trunk/src/console/console.c trunk/src/include/console/console.h trunk/src/mainboard/a-trend/atc-6220/romstage.c trunk/src/mainboard/a-trend/atc-6240/romstage.c trunk/src/mainboard/abit/be6-ii_v2_0/romstage.c trunk/src/mainboard/advantech/pcm-5820/romstage.c trunk/src/mainboard/amd/db800/romstage.c trunk/src/mainboard/amd/dbm690t/romstage.c trunk/src/mainboard/amd/mahogany/romstage.c trunk/src/mainboard/amd/mahogany_fam10/romstage.c trunk/src/mainboard/amd/norwich/romstage.c trunk/src/mainboard/amd/pistachio/romstage.c trunk/src/mainboard/amd/rumba/romstage.c trunk/src/mainboard/amd/serengeti_cheetah/romstage.c trunk/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c trunk/src/mainboard/amd/tilapia_fam10/romstage.c trunk/src/mainboard/arima/hdama/romstage.c trunk/src/mainboard/artecgroup/dbe61/romstage.c trunk/src/mainboard/asi/mb_5blgp/romstage.c trunk/src/mainboard/asi/mb_5blmp/romstage.c trunk/src/mainboard/asrock/939a785gmh/romstage.c trunk/src/mainboard/asus/a8n_e/romstage.c trunk/src/mainboard/asus/a8v-e_se/romstage.c trunk/src/mainboard/asus/m2v-mx_se/romstage.c trunk/src/mainboard/asus/mew-am/romstage.c trunk/src/mainboard/asus/mew-vm/romstage.c trunk/src/mainboard/asus/p2b-d/romstage.c trunk/src/mainboard/asus/p2b-ds/romstage.c trunk/src/mainboard/asus/p2b-f/romstage.c trunk/src/mainboard/asus/p2b-ls/romstage.c trunk/src/mainboard/asus/p2b/romstage.c trunk/src/mainboard/asus/p3b-f/romstage.c trunk/src/mainboard/axus/tc320/romstage.c trunk/src/mainboard/azza/pt-6ibd/romstage.c trunk/src/mainboard/bcom/winnet100/romstage.c trunk/src/mainboard/bcom/winnetp680/romstage.c trunk/src/mainboard/biostar/m6tba/romstage.c trunk/src/mainboard/broadcom/blast/romstage.c trunk/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c trunk/src/mainboard/dell/s1850/romstage.c trunk/src/mainboard/digitallogic/adl855pc/romstage.c trunk/src/mainboard/digitallogic/msm586seg/romstage.c trunk/src/mainboard/digitallogic/msm800sev/romstage.c trunk/src/mainboard/eaglelion/5bcm/romstage.c trunk/src/mainboard/emulation/qemu-x86/romstage.c trunk/src/mainboard/gigabyte/ga-6bxc/romstage.c trunk/src/mainboard/gigabyte/ga_2761gxdk/romstage.c trunk/src/mainboard/gigabyte/m57sli/romstage.c trunk/src/mainboard/hp/dl145_g3/romstage.c trunk/src/mainboard/hp/e_vectra_p2706t/romstage.c trunk/src/mainboard/ibm/e325/romstage.c trunk/src/mainboard/ibm/e326/romstage.c trunk/src/mainboard/iei/juki-511p/romstage.c trunk/src/mainboard/iei/nova4899r/romstage.c trunk/src/mainboard/iei/pcisa-lx-800-r10/romstage.c trunk/src/mainboard/intel/d945gclf/romstage.c trunk/src/mainboard/intel/eagleheights/romstage.c trunk/src/mainboard/intel/jarrell/romstage.c trunk/src/mainboard/intel/mtarvon/romstage.c trunk/src/mainboard/intel/truxton/romstage.c trunk/src/mainboard/intel/xe7501devkit/romstage.c trunk/src/mainboard/iwill/dk8_htx/romstage.c trunk/src/mainboard/iwill/dk8s2/romstage.c trunk/src/mainboard/iwill/dk8x/romstage.c trunk/src/mainboard/jetway/j7f24/romstage.c trunk/src/mainboard/kontron/986lcd-m/romstage.c trunk/src/mainboard/kontron/kt690/romstage.c trunk/src/mainboard/lippert/frontrunner/romstage.c trunk/src/mainboard/lippert/roadrunner-lx/romstage.c trunk/src/mainboard/lippert/spacerunner-lx/romstage.c trunk/src/mainboard/mitac/6513wu/romstage.c trunk/src/mainboard/msi/ms6119/romstage.c trunk/src/mainboard/msi/ms6147/romstage.c trunk/src/mainboard/msi/ms6156/romstage.c trunk/src/mainboard/msi/ms6178/romstage.c trunk/src/mainboard/msi/ms7135/romstage.c trunk/src/mainboard/msi/ms7260/romstage.c trunk/src/mainboard/msi/ms9185/romstage.c trunk/src/mainboard/msi/ms9282/romstage.c trunk/src/mainboard/msi/ms9652_fam10/romstage.c trunk/src/mainboard/nec/powermate2000/romstage.c trunk/src/mainboard/newisys/khepri/romstage.c trunk/src/mainboard/nokia/ip530/romstage.c trunk/src/mainboard/nvidia/l1_2pvv/romstage.c trunk/src/mainboard/olpc/btest/romstage.c trunk/src/mainboard/olpc/rev_a/romstage.c trunk/src/mainboard/pcengines/alix1c/romstage.c trunk/src/mainboard/rca/rm4100/romstage.c trunk/src/mainboard/roda/rk886ex/romstage.c trunk/src/mainboard/soyo/sy-6ba-plus-iii/romstage.c trunk/src/mainboard/sunw/ultra40/romstage.c trunk/src/mainboard/supermicro/h8dme/romstage.c trunk/src/mainboard/supermicro/h8dmr/romstage.c trunk/src/mainboard/supermicro/h8dmr_fam10/romstage.c trunk/src/mainboard/supermicro/h8qme_fam10/romstage.c trunk/src/mainboard/supermicro/x6dai_g/romstage.c trunk/src/mainboard/supermicro/x6dhe_g/romstage.c trunk/src/mainboard/supermicro/x6dhe_g2/romstage.c trunk/src/mainboard/supermicro/x6dhr_ig/romstage.c trunk/src/mainboard/supermicro/x6dhr_ig2/romstage.c trunk/src/mainboard/technexion/tim5690/romstage.c trunk/src/mainboard/technexion/tim8690/romstage.c trunk/src/mainboard/technologic/ts5300/romstage.c trunk/src/mainboard/televideo/tc7020/romstage.c trunk/src/mainboard/thomson/ip1000/romstage.c trunk/src/mainboard/tyan/s1846/romstage.c trunk/src/mainboard/tyan/s2735/romstage.c trunk/src/mainboard/tyan/s2850/romstage.c trunk/src/mainboard/tyan/s2875/romstage.c trunk/src/mainboard/tyan/s2880/romstage.c trunk/src/mainboard/tyan/s2881/romstage.c trunk/src/mainboard/tyan/s2882/romstage.c trunk/src/mainboard/tyan/s2885/romstage.c trunk/src/mainboard/tyan/s2891/romstage.c trunk/src/mainboard/tyan/s2892/romstage.c trunk/src/mainboard/tyan/s2895/romstage.c trunk/src/mainboard/tyan/s2912/romstage.c trunk/src/mainboard/tyan/s2912_fam10/romstage.c trunk/src/mainboard/tyan/s4880/romstage.c trunk/src/mainboard/tyan/s4882/romstage.c trunk/src/mainboard/via/epia-cn/romstage.c trunk/src/mainboard/via/epia-m/romstage.c trunk/src/mainboard/via/epia-m700/romstage.c trunk/src/mainboard/via/epia-n/romstage.c trunk/src/mainboard/via/epia/romstage.c trunk/src/mainboard/via/pc2500e/romstage.c trunk/src/mainboard/via/vt8454c/romstage.c trunk/src/mainboard/winent/pl6064/romstage.c trunk/src/pc80/Makefile.inc trunk/src/pc80/serial.c
Modified: trunk/src/console/Makefile.inc ============================================================================== --- trunk/src/console/Makefile.inc Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/console/Makefile.inc Sat May 8 11:14:51 2010 (r5528) @@ -7,6 +7,7 @@ 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
Modified: trunk/src/console/console.c ============================================================================== --- trunk/src/console/console.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/console/console.c Sat May 8 11:14:51 2010 (r5528) @@ -5,9 +5,9 @@ #include <console/console.h> #include <build.h> #include <arch/hlt.h> +#include <arch/io.h>
#ifndef __PRE_RAM__ -#include <arch/io.h> #include <string.h> #include <pc80/mc146818rtc.h>
Modified: trunk/src/include/console/console.h ============================================================================== --- trunk/src/include/console/console.h Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/include/console/console.h Sat May 8 11:14:51 2010 (r5528) @@ -307,4 +307,9 @@
#endif
+#ifdef __ROMCC__ +/* if included by romcc, include the sources, too. romcc can't use prototypes */ +#include <console/console.c> +#endif + #endif /* CONSOLE_CONSOLE_H_ */
Modified: trunk/src/mainboard/a-trend/atc-6220/romstage.c ============================================================================== --- trunk/src/mainboard/a-trend/atc-6220/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/a-trend/atc-6220/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -26,7 +26,7 @@ #include <arch/hlt.h> #include <stdlib.h> #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_enable_rom.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c"
Modified: trunk/src/mainboard/a-trend/atc-6240/romstage.c ============================================================================== --- trunk/src/mainboard/a-trend/atc-6240/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/a-trend/atc-6240/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -26,7 +26,7 @@ #include <arch/romcc_io.h> #include <arch/hlt.h> #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_enable_rom.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c"
Modified: trunk/src/mainboard/abit/be6-ii_v2_0/romstage.c ============================================================================== --- trunk/src/mainboard/abit/be6-ii_v2_0/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/abit/be6-ii_v2_0/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -26,7 +26,7 @@ #include <arch/romcc_io.h> #include <arch/hlt.h> #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_enable_rom.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c"
Modified: trunk/src/mainboard/advantech/pcm-5820/romstage.c ============================================================================== --- trunk/src/mainboard/advantech/pcm-5820/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/advantech/pcm-5820/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -24,7 +24,7 @@ #include <arch/romcc_io.h> #include <arch/hlt.h> #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "northbridge/amd/gx1/raminit.c" #include "cpu/x86/bist.h"
Modified: trunk/src/mainboard/amd/db800/romstage.c ============================================================================== --- trunk/src/mainboard/amd/db800/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/amd/db800/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -19,13 +19,12 @@ */
#include <stdint.h> +#include <stdlib.h> #include <device/pci_def.h> #include <arch/io.h> #include <device/pnp_def.h> #include <arch/hlt.h> -#include "pc80/serial.c" #include <console/console.h> -#include "console/console.c" #include "lib/ramtest.c" #include "cpu/x86/bist.h" #include "cpu/x86/msr.h" @@ -33,7 +32,6 @@ #include <cpu/amd/geode_post_code.h> #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"
Modified: trunk/src/mainboard/amd/dbm690t/romstage.c ============================================================================== --- trunk/src/mainboard/amd/dbm690t/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/amd/dbm690t/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -42,8 +42,7 @@ #include <cpu/x86/lapic.h> #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h>
#include <cpu/amd/model_fxx_rev.h> #include "northbridge/amd/amdk8/raminit.h"
Modified: trunk/src/mainboard/amd/mahogany/romstage.c ============================================================================== --- trunk/src/mainboard/amd/mahogany/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/amd/mahogany/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -42,8 +42,7 @@ #include <cpu/x86/lapic.h> #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h>
#include <cpu/amd/model_fxx_rev.h> #include "northbridge/amd/amdk8/raminit.h"
Modified: trunk/src/mainboard/amd/mahogany_fam10/romstage.c ============================================================================== --- trunk/src/mainboard/amd/mahogany_fam10/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/amd/mahogany_fam10/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -47,8 +47,7 @@ #include <cpu/x86/lapic.h> #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "console/console.c" -#include "pc80/serial.c" +#include <console/console.h> #include "lib/ramtest.c" #include <cpu/amd/model_10xxx_rev.h> #include "northbridge/amd/amdfam10/raminit.h"
Modified: trunk/src/mainboard/amd/norwich/romstage.c ============================================================================== --- trunk/src/mainboard/amd/norwich/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/amd/norwich/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -23,8 +23,7 @@ #include <arch/io.h> #include <device/pnp_def.h> #include <arch/hlt.h> -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "cpu/x86/bist.h" #include "cpu/x86/msr.h"
Modified: trunk/src/mainboard/amd/pistachio/romstage.c ============================================================================== --- trunk/src/mainboard/amd/pistachio/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/amd/pistachio/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -36,8 +36,7 @@ #include <cpu/x86/lapic.h> #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h>
#include <cpu/amd/model_fxx_rev.h> #include "northbridge/amd/amdk8/raminit.h"
Modified: trunk/src/mainboard/amd/rumba/romstage.c ============================================================================== --- trunk/src/mainboard/amd/rumba/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/amd/rumba/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -5,7 +5,7 @@ #include <arch/romcc_io.h> #include <arch/hlt.h> #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "superio/winbond/w83627hf/w83627hf_early_serial.c" #include "cpu/x86/bist.h"
Modified: trunk/src/mainboard/amd/serengeti_cheetah/romstage.c ============================================================================== --- trunk/src/mainboard/amd/serengeti_cheetah/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/amd/serengeti_cheetah/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -29,8 +29,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c"
-#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include <cpu/amd/model_fxx_rev.h> #include "southbridge/amd/amd8111/amd8111_early_smbus.c" #include <reset.h>
Modified: trunk/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c ============================================================================== --- trunk/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -47,8 +47,7 @@ #include <cpu/x86/lapic.h> #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "console/console.c" -#include "pc80/serial.c" +#include <console/console.h> #include "lib/ramtest.c" #include <cpu/amd/model_10xxx_rev.h> #include "southbridge/amd/amd8111/amd8111_early_smbus.c"
Modified: trunk/src/mainboard/amd/tilapia_fam10/romstage.c ============================================================================== --- trunk/src/mainboard/amd/tilapia_fam10/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/amd/tilapia_fam10/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -47,8 +47,7 @@ #include <cpu/x86/lapic.h> #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "console/console.c" -#include "pc80/serial.c" +#include <console/console.h> #include "lib/ramtest.c" #include <cpu/amd/model_10xxx_rev.h> #include "northbridge/amd/amdfam10/raminit.h"
Modified: trunk/src/mainboard/arima/hdama/romstage.c ============================================================================== --- trunk/src/mainboard/arima/hdama/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/arima/hdama/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -7,8 +7,7 @@ #include <cpu/x86/lapic.h> #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c"
#include <cpu/amd/model_fxx_rev.h>
Modified: trunk/src/mainboard/artecgroup/dbe61/romstage.c ============================================================================== --- trunk/src/mainboard/artecgroup/dbe61/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/artecgroup/dbe61/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -25,8 +25,7 @@ #include <arch/romcc_io.h> #include <arch/hlt.h> #include <stdlib.h> -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "cpu/x86/bist.h" #include "cpu/x86/msr.h"
Modified: trunk/src/mainboard/asi/mb_5blgp/romstage.c ============================================================================== --- trunk/src/mainboard/asi/mb_5blgp/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/asi/mb_5blgp/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -24,7 +24,7 @@ #include <arch/romcc_io.h> #include <arch/hlt.h> #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "northbridge/amd/gx1/raminit.c" #include "cpu/x86/bist.h"
Modified: trunk/src/mainboard/asi/mb_5blmp/romstage.c ============================================================================== --- trunk/src/mainboard/asi/mb_5blmp/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/asi/mb_5blmp/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -25,7 +25,7 @@ #include <arch/romcc_io.h> #include <arch/hlt.h> #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "northbridge/amd/gx1/raminit.c" #include "superio/nsc/pc87351/pc87351_early_serial.c"
Modified: trunk/src/mainboard/asrock/939a785gmh/romstage.c ============================================================================== --- trunk/src/mainboard/asrock/939a785gmh/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/asrock/939a785gmh/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -43,8 +43,7 @@ #include <cpu/x86/lapic.h> #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h>
#include <cpu/amd/model_fxx_rev.h> #include "northbridge/amd/amdk8/raminit.h"
Modified: trunk/src/mainboard/asus/a8n_e/romstage.c ============================================================================== --- trunk/src/mainboard/asus/a8n_e/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/asus/a8n_e/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -48,8 +48,7 @@ #define CK804_NUM 1
#include <cpu/amd/model_fxx_rev.h> -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "northbridge/amd/amdk8/incoherent_ht.c" #include "southbridge/nvidia/ck804/ck804_early_smbus.c"
Modified: trunk/src/mainboard/asus/a8v-e_se/romstage.c ============================================================================== --- trunk/src/mainboard/asus/a8v-e_se/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/asus/a8v-e_se/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -46,8 +46,7 @@ #include <cpu/x86/lapic.h> #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include <cpu/amd/model_fxx_rev.h> #include "northbridge/amd/amdk8/raminit.h" #include "cpu/amd/model_fxx/apic_timer.c"
Modified: trunk/src/mainboard/asus/m2v-mx_se/romstage.c ============================================================================== --- trunk/src/mainboard/asus/m2v-mx_se/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/asus/m2v-mx_se/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -51,8 +51,7 @@ #include <cpu/x86/lapic.h> #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include <cpu/amd/model_fxx_rev.h> #include "northbridge/amd/amdk8/raminit.h" #include "cpu/amd/model_fxx/apic_timer.c"
Modified: trunk/src/mainboard/asus/mew-am/romstage.c ============================================================================== --- trunk/src/mainboard/asus/mew-am/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/asus/mew-am/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -26,7 +26,7 @@ #include <arch/romcc_io.h> #include <arch/hlt.h> #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "southbridge/intel/i82801ax/i82801ax_early_smbus.c" #include "northbridge/intel/i82810/raminit.h"
Modified: trunk/src/mainboard/asus/mew-vm/romstage.c ============================================================================== --- trunk/src/mainboard/asus/mew-vm/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/asus/mew-vm/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -26,7 +26,7 @@ #include <arch/hlt.h> #include <stdlib.h> #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "superio/smsc/lpc47b272/lpc47b272_early_serial.c" #include "northbridge/intel/i82810/raminit.h"
Modified: trunk/src/mainboard/asus/p2b-d/romstage.c ============================================================================== --- trunk/src/mainboard/asus/p2b-d/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/asus/p2b-d/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -27,7 +27,7 @@ #include <stdlib.h> #include <cpu/x86/lapic.h> #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_enable_rom.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c"
Modified: trunk/src/mainboard/asus/p2b-ds/romstage.c ============================================================================== --- trunk/src/mainboard/asus/p2b-ds/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/asus/p2b-ds/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -27,7 +27,7 @@ #include <stdlib.h> #include <cpu/x86/lapic.h> #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_enable_rom.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c"
Modified: trunk/src/mainboard/asus/p2b-f/romstage.c ============================================================================== --- trunk/src/mainboard/asus/p2b-f/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/asus/p2b-f/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -26,7 +26,7 @@ #include <arch/hlt.h> #include <stdlib.h> #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_enable_rom.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c"
Modified: trunk/src/mainboard/asus/p2b-ls/romstage.c ============================================================================== --- trunk/src/mainboard/asus/p2b-ls/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/asus/p2b-ls/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -26,7 +26,7 @@ #include <arch/hlt.h> #include <stdlib.h> #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_enable_rom.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c"
Modified: trunk/src/mainboard/asus/p2b/romstage.c ============================================================================== --- trunk/src/mainboard/asus/p2b/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/asus/p2b/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -26,7 +26,7 @@ #include <arch/hlt.h> #include <stdlib.h> #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_enable_rom.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c"
Modified: trunk/src/mainboard/asus/p3b-f/romstage.c ============================================================================== --- trunk/src/mainboard/asus/p3b-f/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/asus/p3b-f/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -26,7 +26,7 @@ #include <arch/hlt.h> #include <stdlib.h> #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_enable_rom.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c"
Modified: trunk/src/mainboard/axus/tc320/romstage.c ============================================================================== --- trunk/src/mainboard/axus/tc320/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/axus/tc320/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -25,7 +25,7 @@ #include <arch/romcc_io.h> #include <arch/hlt.h> #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "northbridge/amd/gx1/raminit.c" #include "superio/nsc/pc97317/pc97317_early_serial.c"
Modified: trunk/src/mainboard/azza/pt-6ibd/romstage.c ============================================================================== --- trunk/src/mainboard/azza/pt-6ibd/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/azza/pt-6ibd/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -26,7 +26,7 @@ #include <arch/hlt.h> #include <stdlib.h> #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_enable_rom.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c"
Modified: trunk/src/mainboard/bcom/winnet100/romstage.c ============================================================================== --- trunk/src/mainboard/bcom/winnet100/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/bcom/winnet100/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -25,7 +25,7 @@ #include <arch/romcc_io.h> #include <arch/hlt.h> #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "northbridge/amd/gx1/raminit.c" #include "superio/nsc/pc97317/pc97317_early_serial.c"
Modified: trunk/src/mainboard/bcom/winnetp680/romstage.c ============================================================================== --- trunk/src/mainboard/bcom/winnetp680/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/bcom/winnetp680/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -26,8 +26,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <arch/hlt.h> -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "northbridge/via/cn700/raminit.h" #include "cpu/x86/mtrr/earlymtrr.c"
Modified: trunk/src/mainboard/biostar/m6tba/romstage.c ============================================================================== --- trunk/src/mainboard/biostar/m6tba/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/biostar/m6tba/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -26,7 +26,7 @@ #include <arch/hlt.h> #include <stdlib.h> #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_enable_rom.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c"
Modified: trunk/src/mainboard/broadcom/blast/romstage.c ============================================================================== --- trunk/src/mainboard/broadcom/blast/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/broadcom/blast/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -13,8 +13,7 @@ #include <cpu/x86/lapic.h> #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c"
#include <cpu/amd/model_fxx_rev.h>
Modified: trunk/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c ============================================================================== --- trunk/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -26,7 +26,7 @@ #include <arch/hlt.h> #include <stdlib.h> #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_enable_rom.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c"
Modified: trunk/src/mainboard/dell/s1850/romstage.c ============================================================================== --- trunk/src/mainboard/dell/s1850/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/dell/s1850/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -8,7 +8,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "southbridge/intel/i82801ex/i82801ex_early_smbus.c" #include "northbridge/intel/e7520/raminit.h"
Modified: trunk/src/mainboard/digitallogic/adl855pc/romstage.c ============================================================================== --- trunk/src/mainboard/digitallogic/adl855pc/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/digitallogic/adl855pc/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -8,8 +8,7 @@ #include <stdlib.h> #include "pc80/udelay_io.c" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "southbridge/intel/i82801dx/i82801dx.h" #include "southbridge/intel/i82801dx/i82801dx_early_smbus.c"
Modified: trunk/src/mainboard/digitallogic/msm586seg/romstage.c ============================================================================== --- trunk/src/mainboard/digitallogic/msm586seg/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/digitallogic/msm586seg/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -6,7 +6,7 @@ #include <arch/hlt.h> #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "cpu/x86/bist.h" //#include "lib/delay.c"
Modified: trunk/src/mainboard/digitallogic/msm800sev/romstage.c ============================================================================== --- trunk/src/mainboard/digitallogic/msm800sev/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/digitallogic/msm800sev/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -4,8 +4,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <arch/hlt.h> -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "cpu/x86/bist.h" #include "cpu/x86/msr.h"
Modified: trunk/src/mainboard/eaglelion/5bcm/romstage.c ============================================================================== --- trunk/src/mainboard/eaglelion/5bcm/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/eaglelion/5bcm/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -6,7 +6,7 @@ #include <arch/hlt.h> #include <stdlib.h> #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" //#include "southbridge/intel/i440bx/i440bx_early_smbus.c" #include "superio/nsc/pc97317/pc97317_early_serial.c"
Modified: trunk/src/mainboard/emulation/qemu-x86/romstage.c ============================================================================== --- trunk/src/mainboard/emulation/qemu-x86/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/emulation/qemu-x86/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -8,7 +8,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "pc80/udelay_io.c" #include "lib/delay.c" #include "cpu/x86/lapic/boot_cpu.c"
Modified: trunk/src/mainboard/gigabyte/ga-6bxc/romstage.c ============================================================================== --- trunk/src/mainboard/gigabyte/ga-6bxc/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/gigabyte/ga-6bxc/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -26,7 +26,7 @@ #include <arch/hlt.h> #include <stdlib.h> #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_enable_rom.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c"
Modified: trunk/src/mainboard/gigabyte/ga_2761gxdk/romstage.c ============================================================================== --- trunk/src/mainboard/gigabyte/ga_2761gxdk/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/gigabyte/ga_2761gxdk/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -53,8 +53,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c"
-#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #if CONFIG_USBDEBUG_DIRECT #include "southbridge/sis/sis966/sis966_enable_usbdebug_direct.c" #include "pc80/usbdebug_direct_serial.c"
Modified: trunk/src/mainboard/gigabyte/m57sli/romstage.c ============================================================================== --- trunk/src/mainboard/gigabyte/m57sli/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/gigabyte/m57sli/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -51,8 +51,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c"
-#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #if CONFIG_USBDEBUG_DIRECT #include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug_direct.c" #include "pc80/usbdebug_direct_serial.c"
Modified: trunk/src/mainboard/hp/dl145_g3/romstage.c ============================================================================== --- trunk/src/mainboard/hp/dl145_g3/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/hp/dl145_g3/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -57,8 +57,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c"
-#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c"
#include <cpu/amd/model_fxx_rev.h>
Modified: trunk/src/mainboard/hp/e_vectra_p2706t/romstage.c ============================================================================== --- trunk/src/mainboard/hp/e_vectra_p2706t/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/hp/e_vectra_p2706t/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -26,7 +26,7 @@ #include <arch/hlt.h> #include <stdlib.h> #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" /* TODO: It's a PC87364 actually! */ #include "superio/nsc/pc87360/pc87360_early_serial.c"
Modified: trunk/src/mainboard/ibm/e325/romstage.c ============================================================================== --- trunk/src/mainboard/ibm/e325/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/ibm/e325/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -9,8 +9,7 @@ #include <stdlib.h> #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c"
#include <cpu/amd/model_fxx_rev.h>
Modified: trunk/src/mainboard/ibm/e326/romstage.c ============================================================================== --- trunk/src/mainboard/ibm/e326/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/ibm/e326/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -9,8 +9,7 @@ #include <stdlib.h> #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c"
#include <cpu/amd/model_fxx_rev.h>
Modified: trunk/src/mainboard/iei/juki-511p/romstage.c ============================================================================== --- trunk/src/mainboard/iei/juki-511p/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/iei/juki-511p/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -25,7 +25,7 @@ #include <arch/romcc_io.h> #include <arch/hlt.h> #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "superio/winbond/w83977f/w83977f_early_serial.c" #include "southbridge/amd/cs5530/cs5530_enable_rom.c"
Modified: trunk/src/mainboard/iei/nova4899r/romstage.c ============================================================================== --- trunk/src/mainboard/iei/nova4899r/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/iei/nova4899r/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -25,7 +25,7 @@ #include <arch/romcc_io.h> #include <arch/hlt.h> #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "superio/winbond/w83977tf/w83977tf_early_serial.c" #include "southbridge/amd/cs5530/cs5530_enable_rom.c"
Modified: trunk/src/mainboard/iei/pcisa-lx-800-r10/romstage.c ============================================================================== --- trunk/src/mainboard/iei/pcisa-lx-800-r10/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/iei/pcisa-lx-800-r10/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -23,8 +23,7 @@ #include <arch/io.h> #include <device/pnp_def.h> #include <arch/hlt.h> -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "cpu/x86/bist.h" #include "cpu/x86/msr.h"
Modified: trunk/src/mainboard/intel/d945gclf/romstage.c ============================================================================== --- trunk/src/mainboard/intel/d945gclf/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/intel/d945gclf/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -37,8 +37,6 @@ #include "pc80/mc146818rtc_early.c"
#include <console/console.h> -#include "pc80/serial.c" -#include "console/console.c" #include <cpu/x86/bist.h>
#if CONFIG_USBDEBUG_DIRECT
Modified: trunk/src/mainboard/intel/eagleheights/romstage.c ============================================================================== --- trunk/src/mainboard/intel/eagleheights/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/intel/eagleheights/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -32,8 +32,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c"
-#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include <cpu/x86/bist.h>
#include "lib/ramtest.c"
Modified: trunk/src/mainboard/intel/jarrell/romstage.c ============================================================================== --- trunk/src/mainboard/intel/jarrell/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/intel/jarrell/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -8,7 +8,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "southbridge/intel/i82801ex/i82801ex_early_smbus.c" #include "northbridge/intel/e7520/raminit.h"
Modified: trunk/src/mainboard/intel/mtarvon/romstage.c ============================================================================== --- trunk/src/mainboard/intel/mtarvon/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/intel/mtarvon/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -28,7 +28,7 @@ #include <cpu/x86/lapic.h> #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "southbridge/intel/i3100/i3100_early_smbus.c" #include "southbridge/intel/i3100/i3100_early_lpc.c"
Modified: trunk/src/mainboard/intel/truxton/romstage.c ============================================================================== --- trunk/src/mainboard/intel/truxton/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/intel/truxton/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -29,7 +29,7 @@ #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" #include "pc80/udelay_io.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "southbridge/intel/i3100/i3100_early_smbus.c" #include "southbridge/intel/i3100/i3100_early_lpc.c"
Modified: trunk/src/mainboard/intel/xe7501devkit/romstage.c ============================================================================== --- trunk/src/mainboard/intel/xe7501devkit/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/intel/xe7501devkit/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -9,7 +9,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "southbridge/intel/i82801cx/i82801cx_early_smbus.c" #include "northbridge/intel/e7501/raminit.h"
Modified: trunk/src/mainboard/iwill/dk8_htx/romstage.c ============================================================================== --- trunk/src/mainboard/iwill/dk8_htx/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/iwill/dk8_htx/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -29,8 +29,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c"
-#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include <cpu/amd/model_fxx_rev.h> #include "southbridge/amd/amd8111/amd8111_early_smbus.c" #include "northbridge/amd/amdk8/raminit.h"
Modified: trunk/src/mainboard/iwill/dk8s2/romstage.c ============================================================================== --- trunk/src/mainboard/iwill/dk8s2/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/iwill/dk8s2/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -29,8 +29,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c"
-#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include <cpu/amd/model_fxx_rev.h> #include "southbridge/amd/amd8111/amd8111_early_smbus.c" #include "northbridge/amd/amdk8/raminit.h"
Modified: trunk/src/mainboard/iwill/dk8x/romstage.c ============================================================================== --- trunk/src/mainboard/iwill/dk8x/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/iwill/dk8x/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -29,8 +29,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c"
-#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include <cpu/amd/model_fxx_rev.h> #include "southbridge/amd/amd8111/amd8111_early_smbus.c" #include "northbridge/amd/amdk8/raminit.h"
Modified: trunk/src/mainboard/jetway/j7f24/romstage.c ============================================================================== --- trunk/src/mainboard/jetway/j7f24/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/jetway/j7f24/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -26,8 +26,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <arch/hlt.h> -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "northbridge/via/cn700/raminit.h" #include "cpu/x86/mtrr/earlymtrr.c"
Modified: trunk/src/mainboard/kontron/986lcd-m/romstage.c ============================================================================== --- trunk/src/mainboard/kontron/986lcd-m/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/kontron/986lcd-m/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -46,8 +46,6 @@ #include "pc80/mc146818rtc_early.c"
#include <console/console.h> -#include "pc80/serial.c" -#include "console/console.c" #include <cpu/x86/bist.h>
#if CONFIG_USBDEBUG_DIRECT
Modified: trunk/src/mainboard/kontron/kt690/romstage.c ============================================================================== --- trunk/src/mainboard/kontron/kt690/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/kontron/kt690/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -43,8 +43,7 @@ #include <cpu/x86/lapic.h> #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h>
#include <cpu/amd/model_fxx_rev.h> #include "northbridge/amd/amdk8/raminit.h"
Modified: trunk/src/mainboard/lippert/frontrunner/romstage.c ============================================================================== --- trunk/src/mainboard/lippert/frontrunner/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/lippert/frontrunner/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -5,7 +5,7 @@ #include <arch/romcc_io.h> #include <arch/hlt.h> #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "superio/winbond/w83627hf/w83627hf_early_serial.c" #include "cpu/x86/bist.h"
Modified: trunk/src/mainboard/lippert/roadrunner-lx/romstage.c ============================================================================== --- trunk/src/mainboard/lippert/roadrunner-lx/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/lippert/roadrunner-lx/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -27,8 +27,7 @@ #include <arch/io.h> #include <device/pnp_def.h> #include <arch/hlt.h> -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "cpu/x86/bist.h" #include "cpu/x86/msr.h"
Modified: trunk/src/mainboard/lippert/spacerunner-lx/romstage.c ============================================================================== --- trunk/src/mainboard/lippert/spacerunner-lx/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/lippert/spacerunner-lx/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -28,8 +28,7 @@ #include <arch/io.h> #include <device/pnp_def.h> #include <arch/hlt.h> -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "cpu/x86/bist.h" #include "cpu/x86/msr.h"
Modified: trunk/src/mainboard/mitac/6513wu/romstage.c ============================================================================== --- trunk/src/mainboard/mitac/6513wu/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/mitac/6513wu/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -26,7 +26,7 @@ #include <arch/romcc_io.h> #include <arch/hlt.h> #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "southbridge/intel/i82801ax/i82801ax_early_smbus.c" #include "northbridge/intel/i82810/raminit.h"
Modified: trunk/src/mainboard/msi/ms6119/romstage.c ============================================================================== --- trunk/src/mainboard/msi/ms6119/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/msi/ms6119/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -26,7 +26,7 @@ #include <arch/romcc_io.h> #include <arch/hlt.h> #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_enable_rom.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c"
Modified: trunk/src/mainboard/msi/ms6147/romstage.c ============================================================================== --- trunk/src/mainboard/msi/ms6147/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/msi/ms6147/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -26,7 +26,7 @@ #include <arch/romcc_io.h> #include <arch/hlt.h> #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_enable_rom.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c"
Modified: trunk/src/mainboard/msi/ms6156/romstage.c ============================================================================== --- trunk/src/mainboard/msi/ms6156/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/msi/ms6156/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -26,7 +26,7 @@ #include <arch/romcc_io.h> #include <arch/hlt.h> #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_enable_rom.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c"
Modified: trunk/src/mainboard/msi/ms6178/romstage.c ============================================================================== --- trunk/src/mainboard/msi/ms6178/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/msi/ms6178/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -26,7 +26,7 @@ #include <arch/hlt.h> #include <stdlib.h> #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "superio/winbond/w83627hf/w83627hf_early_serial.c" #include "northbridge/intel/i82810/raminit.h"
Modified: trunk/src/mainboard/msi/ms7135/romstage.c ============================================================================== --- trunk/src/mainboard/msi/ms7135/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/msi/ms7135/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -50,8 +50,7 @@ #define CK804_USE_ACI 1
#include <cpu/amd/model_fxx_rev.h> -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "northbridge/amd/amdk8/incoherent_ht.c" #include "southbridge/nvidia/ck804/ck804_early_smbus.c"
Modified: trunk/src/mainboard/msi/ms7260/romstage.c ============================================================================== --- trunk/src/mainboard/msi/ms7260/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/msi/ms7260/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -55,8 +55,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c"
-#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #if CONFIG_USBDEBUG_DIRECT #include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug_direct.c" #include "pc80/usbdebug_direct_serial.c"
Modified: trunk/src/mainboard/msi/ms9185/romstage.c ============================================================================== --- trunk/src/mainboard/msi/ms9185/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/msi/ms9185/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -49,8 +49,7 @@ #include <cpu/x86/lapic.h> #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h>
#include <cpu/amd/model_fxx_rev.h> #include "southbridge/broadcom/bcm5785/bcm5785_early_smbus.c"
Modified: trunk/src/mainboard/msi/ms9282/romstage.c ============================================================================== --- trunk/src/mainboard/msi/ms9282/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/msi/ms9282/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -44,8 +44,7 @@ #include <cpu/x86/lapic.h> #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h>
#include <cpu/amd/model_fxx_rev.h> #include "southbridge/nvidia/mcp55/mcp55_early_smbus.c"
Modified: trunk/src/mainboard/msi/ms9652_fam10/romstage.c ============================================================================== --- trunk/src/mainboard/msi/ms9652_fam10/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/msi/ms9652_fam10/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -45,8 +45,7 @@ #include <cpu/x86/lapic.h> #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #if CONFIG_USBDEBUG_DIRECT #include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug_direct.c" #include "pc80/usbdebug_direct_serial.c"
Modified: trunk/src/mainboard/nec/powermate2000/romstage.c ============================================================================== --- trunk/src/mainboard/nec/powermate2000/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/nec/powermate2000/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -26,7 +26,7 @@ #include <arch/hlt.h> #include <stdlib.h> #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "superio/smsc/smscsuperio/smscsuperio_early_serial.c" #include "northbridge/intel/i82810/raminit.h"
Modified: trunk/src/mainboard/newisys/khepri/romstage.c ============================================================================== --- trunk/src/mainboard/newisys/khepri/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/newisys/khepri/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -14,8 +14,7 @@ #include <cpu/x86/lapic.h> #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c"
#include <cpu/amd/model_fxx_rev.h>
Modified: trunk/src/mainboard/nokia/ip530/romstage.c ============================================================================== --- trunk/src/mainboard/nokia/ip530/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/nokia/ip530/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -26,7 +26,7 @@ #include <arch/hlt.h> #include <stdlib.h> #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_enable_rom.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c"
Modified: trunk/src/mainboard/nvidia/l1_2pvv/romstage.c ============================================================================== --- trunk/src/mainboard/nvidia/l1_2pvv/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/nvidia/l1_2pvv/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -51,8 +51,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c"
-#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #if CONFIG_USBDEBUG_DIRECT #include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug_direct.c" #include "pc80/usbdebug_direct_serial.c"
Modified: trunk/src/mainboard/olpc/btest/romstage.c ============================================================================== --- trunk/src/mainboard/olpc/btest/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/olpc/btest/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -5,7 +5,7 @@ #include <arch/romcc_io.h> #include <arch/hlt.h> #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "superio/winbond/w83627hf/w83627hf_early_serial.c" #include "cpu/x86/bist.h"
Modified: trunk/src/mainboard/olpc/rev_a/romstage.c ============================================================================== --- trunk/src/mainboard/olpc/rev_a/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/olpc/rev_a/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -5,7 +5,7 @@ #include <arch/romcc_io.h> #include <arch/hlt.h> #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "superio/winbond/w83627hf/w83627hf_early_serial.c" #include "cpu/x86/bist.h"
Modified: trunk/src/mainboard/pcengines/alix1c/romstage.c ============================================================================== --- trunk/src/mainboard/pcengines/alix1c/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/pcengines/alix1c/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -24,8 +24,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <arch/hlt.h> -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "cpu/x86/bist.h" #include "cpu/x86/msr.h"
Modified: trunk/src/mainboard/rca/rm4100/romstage.c ============================================================================== --- trunk/src/mainboard/rca/rm4100/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/rca/rm4100/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -25,9 +25,8 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <arch/hlt.h> -#include "pc80/serial.c" #include "pc80/udelay_io.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "superio/smsc/smscsuperio/smscsuperio_early_serial.c" #include "northbridge/intel/i82830/raminit.h"
Modified: trunk/src/mainboard/roda/rk886ex/romstage.c ============================================================================== --- trunk/src/mainboard/roda/rk886ex/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/roda/rk886ex/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -39,8 +39,6 @@ #include "pc80/mc146818rtc_early.c"
#include <console/console.h> -#include "pc80/serial.c" -#include "console/console.c" #include <cpu/x86/bist.h>
#if CONFIG_USBDEBUG_DIRECT
Modified: trunk/src/mainboard/soyo/sy-6ba-plus-iii/romstage.c ============================================================================== --- trunk/src/mainboard/soyo/sy-6ba-plus-iii/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/soyo/sy-6ba-plus-iii/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -26,7 +26,7 @@ #include <arch/hlt.h> #include <stdlib.h> #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_enable_rom.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c"
Modified: trunk/src/mainboard/sunw/ultra40/romstage.c ============================================================================== --- trunk/src/mainboard/sunw/ultra40/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/sunw/ultra40/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -16,8 +16,7 @@ #include <cpu/x86/lapic.h> #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c"
#include <cpu/amd/model_fxx_rev.h>
Modified: trunk/src/mainboard/supermicro/h8dme/romstage.c ============================================================================== --- trunk/src/mainboard/supermicro/h8dme/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/supermicro/h8dme/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -46,8 +46,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c"
-#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c"
#include <cpu/amd/model_fxx_rev.h>
Modified: trunk/src/mainboard/supermicro/h8dmr/romstage.c ============================================================================== --- trunk/src/mainboard/supermicro/h8dmr/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/supermicro/h8dmr/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -49,8 +49,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c"
-#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c"
#include <cpu/amd/model_fxx_rev.h>
Modified: trunk/src/mainboard/supermicro/h8dmr_fam10/romstage.c ============================================================================== --- trunk/src/mainboard/supermicro/h8dmr_fam10/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/supermicro/h8dmr_fam10/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -44,8 +44,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c"
-#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c"
#include <cpu/amd/model_10xxx_rev.h>
Modified: trunk/src/mainboard/supermicro/h8qme_fam10/romstage.c ============================================================================== --- trunk/src/mainboard/supermicro/h8qme_fam10/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/supermicro/h8qme_fam10/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -44,8 +44,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c"
-#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c"
#include <cpu/amd/model_10xxx_rev.h>
Modified: trunk/src/mainboard/supermicro/x6dai_g/romstage.c ============================================================================== --- trunk/src/mainboard/supermicro/x6dai_g/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/supermicro/x6dai_g/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -8,7 +8,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "pc80/udelay_io.c" #include "lib/delay.c"
Modified: trunk/src/mainboard/supermicro/x6dhe_g/romstage.c ============================================================================== --- trunk/src/mainboard/supermicro/x6dhe_g/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/supermicro/x6dhe_g/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -8,7 +8,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "pc80/udelay_io.c" #include "lib/delay.c"
Modified: trunk/src/mainboard/supermicro/x6dhe_g2/romstage.c ============================================================================== --- trunk/src/mainboard/supermicro/x6dhe_g2/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/supermicro/x6dhe_g2/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -8,7 +8,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "southbridge/intel/i82801ex/i82801ex_early_smbus.c" #include "northbridge/intel/e7520/raminit.h"
Modified: trunk/src/mainboard/supermicro/x6dhr_ig/romstage.c ============================================================================== --- trunk/src/mainboard/supermicro/x6dhr_ig/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/supermicro/x6dhr_ig/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -8,7 +8,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "southbridge/intel/i82801ex/i82801ex_early_smbus.c" #include "northbridge/intel/e7520/raminit.h"
Modified: trunk/src/mainboard/supermicro/x6dhr_ig2/romstage.c ============================================================================== --- trunk/src/mainboard/supermicro/x6dhr_ig2/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/supermicro/x6dhr_ig2/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -8,7 +8,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "southbridge/intel/i82801ex/i82801ex_early_smbus.c" #include "northbridge/intel/e7520/raminit.h"
Modified: trunk/src/mainboard/technexion/tim5690/romstage.c ============================================================================== --- trunk/src/mainboard/technexion/tim5690/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/technexion/tim5690/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -42,8 +42,7 @@ #include <cpu/x86/lapic.h> #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h>
#include <cpu/amd/model_fxx_rev.h> #include "northbridge/amd/amdk8/raminit.h"
Modified: trunk/src/mainboard/technexion/tim8690/romstage.c ============================================================================== --- trunk/src/mainboard/technexion/tim8690/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/technexion/tim8690/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -42,8 +42,7 @@ #include <cpu/x86/lapic.h> #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h>
#include <cpu/amd/model_fxx_rev.h> #include "northbridge/amd/amdk8/raminit.h"
Modified: trunk/src/mainboard/technologic/ts5300/romstage.c ============================================================================== --- trunk/src/mainboard/technologic/ts5300/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/technologic/ts5300/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -12,7 +12,7 @@ #include <arch/hlt.h> #include "pc80/mc146818rtc_early.c" #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "cpu/x86/bist.h"
Modified: trunk/src/mainboard/televideo/tc7020/romstage.c ============================================================================== --- trunk/src/mainboard/televideo/tc7020/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/televideo/tc7020/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -25,7 +25,7 @@ #include <arch/romcc_io.h> #include <arch/hlt.h> #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "northbridge/amd/gx1/raminit.c" #include "superio/nsc/pc97317/pc97317_early_serial.c"
Modified: trunk/src/mainboard/thomson/ip1000/romstage.c ============================================================================== --- trunk/src/mainboard/thomson/ip1000/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/thomson/ip1000/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -26,9 +26,8 @@ #include <arch/romcc_io.h> #include <arch/hlt.h> #include <arch/llshell.h> -#include "pc80/serial.c" #include "pc80/udelay_io.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "superio/smsc/smscsuperio/smscsuperio_early_serial.c" #include "northbridge/intel/i82830/raminit.h"
Modified: trunk/src/mainboard/tyan/s1846/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s1846/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/tyan/s1846/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -26,7 +26,7 @@ #include <arch/hlt.h> #include <stdlib.h> #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "southbridge/intel/i82371eb/i82371eb_enable_rom.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c"
Modified: trunk/src/mainboard/tyan/s2735/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2735/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/tyan/s2735/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -8,8 +8,7 @@ #include <cpu/x86/lapic.h> #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c"
#include "southbridge/intel/i82801ex/i82801ex_early_smbus.c"
Modified: trunk/src/mainboard/tyan/s2850/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2850/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/tyan/s2850/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -9,8 +9,7 @@ #include <stdlib.h> #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c"
#include <cpu/amd/model_fxx_rev.h>
Modified: trunk/src/mainboard/tyan/s2875/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2875/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/tyan/s2875/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -9,8 +9,7 @@ #include <stdlib.h> #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c"
#include <cpu/amd/model_fxx_rev.h>
Modified: trunk/src/mainboard/tyan/s2880/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2880/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/tyan/s2880/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -9,8 +9,7 @@ #include <stdlib.h> #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c"
#include <cpu/amd/model_fxx_rev.h>
Modified: trunk/src/mainboard/tyan/s2881/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2881/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/tyan/s2881/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -13,8 +13,7 @@ #include <cpu/x86/lapic.h> #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c"
#include <cpu/amd/model_fxx_rev.h>
Modified: trunk/src/mainboard/tyan/s2882/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2882/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/tyan/s2882/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -9,8 +9,7 @@ #include <stdlib.h> #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c"
#include <cpu/amd/model_fxx_rev.h>
Modified: trunk/src/mainboard/tyan/s2885/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2885/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/tyan/s2885/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -8,8 +8,7 @@ #include <cpu/x86/lapic.h> #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c"
#include <cpu/amd/model_fxx_rev.h>
Modified: trunk/src/mainboard/tyan/s2891/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2891/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/tyan/s2891/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -14,8 +14,7 @@ #include <cpu/x86/lapic.h> #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c"
#include <cpu/amd/model_fxx_rev.h>
Modified: trunk/src/mainboard/tyan/s2892/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2892/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/tyan/s2892/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -14,8 +14,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c"
-#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c"
#include <cpu/amd/model_fxx_rev.h>
Modified: trunk/src/mainboard/tyan/s2895/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2895/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/tyan/s2895/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -15,8 +15,7 @@ #include <cpu/x86/lapic.h> #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include <cpu/amd/model_fxx_rev.h> #include "northbridge/amd/amdk8/incoherent_ht.c"
Modified: trunk/src/mainboard/tyan/s2912/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2912/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/tyan/s2912/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -51,8 +51,7 @@ #include "option_table.h" #include "pc80/mc146818rtc_early.c"
-#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #if CONFIG_USBDEBUG_DIRECT #include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug_direct.c" #include "pc80/usbdebug_direct_serial.c"
Modified: trunk/src/mainboard/tyan/s2912_fam10/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2912_fam10/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/tyan/s2912_fam10/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -45,8 +45,7 @@ #include <cpu/x86/lapic.h> #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #if CONFIG_USBDEBUG_DIRECT #include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug_direct.c" #include "pc80/usbdebug_direct_serial.c"
Modified: trunk/src/mainboard/tyan/s4880/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s4880/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/tyan/s4880/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -9,8 +9,7 @@ #include <stdlib.h> #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c"
#include <cpu/amd/model_fxx_rev.h>
Modified: trunk/src/mainboard/tyan/s4882/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s4882/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/tyan/s4882/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -8,8 +8,7 @@ #include <cpu/x86/lapic.h> #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c"
#include <cpu/amd/model_fxx_rev.h>
Modified: trunk/src/mainboard/via/epia-cn/romstage.c ============================================================================== --- trunk/src/mainboard/via/epia-cn/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/via/epia-cn/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -26,8 +26,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <arch/hlt.h> -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "northbridge/via/cn700/raminit.h" #include "cpu/x86/mtrr/earlymtrr.c"
Modified: trunk/src/mainboard/via/epia-m/romstage.c ============================================================================== --- trunk/src/mainboard/via/epia-m/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/via/epia-m/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -7,7 +7,7 @@ #include <arch/hlt.h> #include <stdlib.h> #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "northbridge/via/vt8623/raminit.h" #include "cpu/x86/mtrr/earlymtrr.c"
Modified: trunk/src/mainboard/via/epia-m700/romstage.c ============================================================================== --- trunk/src/mainboard/via/epia-m700/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/via/epia-m700/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -33,8 +33,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <arch/hlt.h> -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "northbridge/via/vx800/vx800.h" #include "cpu/x86/mtrr/earlymtrr.c"
Modified: trunk/src/mainboard/via/epia-n/romstage.c ============================================================================== --- trunk/src/mainboard/via/epia-n/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/via/epia-n/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -27,7 +27,7 @@ #include <arch/romcc_io.h> #include <arch/hlt.h> #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "northbridge/via/cn400/raminit.h" #include "cpu/x86/mtrr/earlymtrr.c"
Modified: trunk/src/mainboard/via/epia/romstage.c ============================================================================== --- trunk/src/mainboard/via/epia/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/via/epia/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -6,7 +6,7 @@ #include <arch/hlt.h> #include <stdlib.h> #include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "northbridge/via/vt8601/raminit.h" #include "cpu/x86/mtrr/earlymtrr.c"
Modified: trunk/src/mainboard/via/pc2500e/romstage.c ============================================================================== --- trunk/src/mainboard/via/pc2500e/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/via/pc2500e/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -27,8 +27,7 @@ #include <arch/hlt.h> #include "option_table.h" #include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "northbridge/via/cn700/raminit.h" #include "cpu/x86/mtrr/earlymtrr.c"
Modified: trunk/src/mainboard/via/vt8454c/romstage.c ============================================================================== --- trunk/src/mainboard/via/vt8454c/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/via/vt8454c/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -26,8 +26,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <arch/hlt.h> -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "northbridge/via/cx700/raminit.h" #include "cpu/x86/bist.h"
Modified: trunk/src/mainboard/winent/pl6064/romstage.c ============================================================================== --- trunk/src/mainboard/winent/pl6064/romstage.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/mainboard/winent/pl6064/romstage.c Sat May 8 11:14:51 2010 (r5528) @@ -20,12 +20,12 @@ */
#include <stdint.h> +#include <stdlib.h> #include <device/pci_def.h> #include <arch/io.h> #include <device/pnp_def.h> #include <arch/hlt.h> -#include "pc80/serial.c" -#include "console/console.c" +#include <console/console.h> #include "lib/ramtest.c" #include "cpu/x86/bist.h" #include "cpu/x86/msr.h" @@ -33,7 +33,6 @@ #include <cpu/amd/geode_post_code.h> #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"
Modified: trunk/src/pc80/Makefile.inc ============================================================================== --- trunk/src/pc80/Makefile.inc Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/pc80/Makefile.inc Sat May 8 11:14:51 2010 (r5528) @@ -4,7 +4,7 @@ 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)
Modified: trunk/src/pc80/serial.c ============================================================================== --- trunk/src/pc80/serial.c Thu May 6 21:32:12 2010 (r5527) +++ trunk/src/pc80/serial.c Sat May 8 11:14:51 2010 (r5528) @@ -1,4 +1,5 @@ #include <lib.h> /* Prototypes */ +#include <arch/io.h>
/* Base Address */ #ifndef CONFIG_TTYS0_BASE