Author: stepan Date: Wed Apr 20 22:54:07 2011 New Revision: 6531 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6531
Log: run uart_init() from console_init, just like the other console initialization functions.
Signed-off-by: Stefan Reinauer stefan.reinauer@coreboot.org Acked-by: Stefan Reinauer stefan.reinauer@coreboot.org
Modified: trunk/src/console/console.c 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/bimini_fam10/romstage.c trunk/src/mainboard/amd/db800/romstage.c trunk/src/mainboard/amd/dbm690t/romstage.c trunk/src/mainboard/amd/inagua/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/persimmon/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/asrock/e350m1/romstage.c trunk/src/mainboard/asus/a8n_e/romstage.c trunk/src/mainboard/asus/a8v-e_deluxe/romstage.c trunk/src/mainboard/asus/a8v-e_se/romstage.c trunk/src/mainboard/asus/m2n-e/romstage.c trunk/src/mainboard/asus/m2v-mx_se/romstage.c trunk/src/mainboard/asus/m2v/romstage.c trunk/src/mainboard/asus/m4a78-em/romstage.c trunk/src/mainboard/asus/m4a785-m/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/ecs/p6iwp-fe/romstage.c trunk/src/mainboard/emulation/qemu-x86/romstage.c trunk/src/mainboard/getac/p470/romstage.c trunk/src/mainboard/gigabyte/ga-6bxc/romstage.c trunk/src/mainboard/gigabyte/ga-6bxe/romstage.c trunk/src/mainboard/gigabyte/ga_2761gxdk/romstage.c trunk/src/mainboard/gigabyte/m57sli/romstage.c trunk/src/mainboard/gigabyte/ma785gmt/romstage.c trunk/src/mainboard/gigabyte/ma78gm/romstage.c trunk/src/mainboard/hp/dl145_g1/romstage.c trunk/src/mainboard/hp/dl145_g3/romstage.c trunk/src/mainboard/hp/dl165_g6_fam10/romstage.c trunk/src/mainboard/hp/e_vectra_p2706t/romstage.c trunk/src/mainboard/ibase/mb899/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/kino-780am2-fam10/romstage.c trunk/src/mainboard/iei/nova4899r/romstage.c trunk/src/mainboard/iei/pcisa-lx-800-r10/romstage.c trunk/src/mainboard/intel/d810e2cb/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/iwave/iWRainbowG6/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/jetway/pa78vm5/romstage.c trunk/src/mainboard/kontron/986lcd-m/romstage.c trunk/src/mainboard/kontron/kt690/romstage.c trunk/src/mainboard/lanner/em8510/romstage.c trunk/src/mainboard/lenovo/t60/romstage.c trunk/src/mainboard/lenovo/x60/romstage.c trunk/src/mainboard/lippert/frontrunner/romstage.c trunk/src/mainboard/lippert/hurricane-lx/romstage.c trunk/src/mainboard/lippert/literunner-lx/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/pcengines/alix1c/romstage.c trunk/src/mainboard/pcengines/alix2d/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/h8scm_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/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/traverse/geos/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/mainboard/wyse/s50/romstage.c
Modified: trunk/src/console/console.c ============================================================================== --- trunk/src/console/console.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/console/console.c Wed Apr 20 22:54:07 2011 (r6531) @@ -22,6 +22,10 @@ #include <arch/hlt.h> #include <arch/io.h>
+#if CONFIG_CONSOLE_SERIAL8250 +#include <uart8250.h> +#endif + #if CONFIG_CONSOLE_NE2K #include <console/ne2k.h> #endif @@ -99,6 +103,9 @@ enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT); early_usbdebug_init(); #endif +#if CONFIG_CONSOLE_SERIAL8250 + uart_init(); +#endif #if CONFIG_CONSOLE_NE2K ne2k_init(CONFIG_CONSOLE_NE2K_IO_PORT); #endif
Modified: trunk/src/mainboard/a-trend/atc-6220/romstage.c ============================================================================== --- trunk/src/mainboard/a-trend/atc-6220/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/a-trend/atc-6220/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -44,7 +44,6 @@ void main(unsigned long bist) { w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init(); report_bist_failure(bist);
Modified: trunk/src/mainboard/a-trend/atc-6240/romstage.c ============================================================================== --- trunk/src/mainboard/a-trend/atc-6240/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/a-trend/atc-6240/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -44,7 +44,6 @@ void main(unsigned long bist) { w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init(); report_bist_failure(bist);
Modified: trunk/src/mainboard/abit/be6-ii_v2_0/romstage.c ============================================================================== --- trunk/src/mainboard/abit/be6-ii_v2_0/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/abit/be6-ii_v2_0/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -47,7 +47,6 @@ { /* FIXME: It's a Winbond W83977EF, actually. */ w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init(); report_bist_failure(bist);
Modified: trunk/src/mainboard/advantech/pcm-5820/romstage.c ============================================================================== --- trunk/src/mainboard/advantech/pcm-5820/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/advantech/pcm-5820/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -34,7 +34,6 @@ static void main(unsigned long bist) { w83977f_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init(); report_bist_failure(bist); cs5530_enable_rom();
Modified: trunk/src/mainboard/amd/bimini_fam10/romstage.c ============================================================================== --- trunk/src/mainboard/amd/bimini_fam10/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/amd/bimini_fam10/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -109,7 +109,6 @@ enable_rs780_dev8(); sb800_lpc_init();
- uart_init(); console_init();
// dump_mem(CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE-0x200, CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE);
Modified: trunk/src/mainboard/amd/db800/romstage.c ============================================================================== --- trunk/src/mainboard/amd/db800/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/amd/db800/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -69,7 +69,6 @@ * early MSR setup for CS5536. */ w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/amd/dbm690t/romstage.c ============================================================================== --- trunk/src/mainboard/amd/dbm690t/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/amd/dbm690t/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -92,7 +92,6 @@
/* it8712f_enable_serial does not use its 1st parameter. */ it8712f_enable_serial(0, CONFIG_TTYS0_BASE); - uart_init();
console_init();
Modified: trunk/src/mainboard/amd/inagua/romstage.c ============================================================================== --- trunk/src/mainboard/amd/inagua/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/amd/inagua/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -56,7 +56,6 @@
post_code(0x31); kbc1100_early_init(CONFIG_SIO_PORT); - uart_init(); console_init(); }
Modified: trunk/src/mainboard/amd/mahogany/romstage.c ============================================================================== --- trunk/src/mainboard/amd/mahogany/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/amd/mahogany/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -91,7 +91,6 @@ sb7xx_51xx_lpc_init();
it8718f_enable_serial(0, CONFIG_TTYS0_BASE); - uart_init();
console_init();
Modified: trunk/src/mainboard/amd/mahogany_fam10/romstage.c ============================================================================== --- trunk/src/mainboard/amd/mahogany_fam10/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/amd/mahogany_fam10/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -104,7 +104,6 @@ sb7xx_51xx_lpc_init();
it8718f_enable_serial(0, CONFIG_TTYS0_BASE); - uart_init();
console_init();
Modified: trunk/src/mainboard/amd/norwich/romstage.c ============================================================================== --- trunk/src/mainboard/amd/norwich/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/amd/norwich/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -70,7 +70,6 @@ */ /* If debug. real setup done in chipset init via devicetree.cb. */ cs5536_setup_onchipuart(1); - uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/amd/persimmon/romstage.c ============================================================================== --- trunk/src/mainboard/amd/persimmon/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/amd/persimmon/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -53,7 +53,6 @@
post_code(0x31); f81865f_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init(); } //reg8 = pmio_read(0x24);
Modified: trunk/src/mainboard/amd/pistachio/romstage.c ============================================================================== --- trunk/src/mainboard/amd/pistachio/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/amd/pistachio/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -89,7 +89,6 @@
/* Pistachio used a FPGA to enable serial debug instead of a SIO * and it doesn't require any special setup. */ - uart_init();
console_init();
Modified: trunk/src/mainboard/amd/rumba/romstage.c ============================================================================== --- trunk/src/mainboard/amd/rumba/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/amd/rumba/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -39,7 +39,6 @@ SystemPreInit();
w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
cs5536_early_setup();
Modified: trunk/src/mainboard/amd/serengeti_cheetah/romstage.c ============================================================================== --- trunk/src/mainboard/amd/serengeti_cheetah/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/amd/serengeti_cheetah/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -131,7 +131,6 @@ bsp_apicid = init_cpus(cpu_init_detectedx, sysinfo);
w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
// dump_mem(CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE-0x200, CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE);
Modified: trunk/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c ============================================================================== --- trunk/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -212,9 +212,7 @@ post_code(0x32);
w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init(); - printk(BIOS_DEBUG, "\n");
// dump_mem(CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE-0x200, CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE);
Modified: trunk/src/mainboard/amd/tilapia_fam10/romstage.c ============================================================================== --- trunk/src/mainboard/amd/tilapia_fam10/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/amd/tilapia_fam10/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -103,7 +103,6 @@ sb7xx_51xx_lpc_init();
it8718f_enable_serial(0, CONFIG_TTYS0_BASE); - uart_init();
console_init();
Modified: trunk/src/mainboard/arima/hdama/romstage.c ============================================================================== --- trunk/src/mainboard/arima/hdama/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/arima/hdama/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -93,7 +93,6 @@ bsp_apicid = init_cpus(cpu_init_detectedx);
pc87360_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/artecgroup/dbe61/romstage.c ============================================================================== --- trunk/src/mainboard/artecgroup/dbe61/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/artecgroup/dbe61/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -89,7 +89,6 @@ msr.lo |= 0x7 << 20; wrmsr(MDD_LEG_IO, msr);
- uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/asi/mb_5blgp/romstage.c ============================================================================== --- trunk/src/mainboard/asi/mb_5blgp/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/asi/mb_5blgp/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -34,7 +34,6 @@ static void main(unsigned long bist) { pc87351_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init(); report_bist_failure(bist); cs5530_enable_rom();
Modified: trunk/src/mainboard/asi/mb_5blmp/romstage.c ============================================================================== --- trunk/src/mainboard/asi/mb_5blmp/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/asi/mb_5blmp/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -35,7 +35,6 @@ static void main(unsigned long bist) { pc87351_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init(); report_bist_failure(bist); cs5530_enable_rom();
Modified: trunk/src/mainboard/asrock/939a785gmh/romstage.c ============================================================================== --- trunk/src/mainboard/asrock/939a785gmh/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/asrock/939a785gmh/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -158,7 +158,6 @@
sio_init(); w83627dhg_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init();
console_init();
Modified: trunk/src/mainboard/asrock/e350m1/romstage.c ============================================================================== --- trunk/src/mainboard/asrock/e350m1/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/asrock/e350m1/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -53,7 +53,6 @@
post_code(0x31); w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init(); } //reg8 = pmio_read(0x24);
Modified: trunk/src/mainboard/asus/a8n_e/romstage.c ============================================================================== --- trunk/src/mainboard/asus/a8n_e/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/asus/a8n_e/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -109,7 +109,6 @@
it8712f_24mhz_clkin(); it8712f_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/asus/a8v-e_deluxe/romstage.c ============================================================================== --- trunk/src/mainboard/asus/a8v-e_deluxe/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/asus/a8v-e_deluxe/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -159,11 +159,10 @@
sio_init(); w83627ehg_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init(); enable_rom_decode();
- print_info("now booting... fallback\n"); + print_info("now booting... romstage\n");
/* Is this a CPU only reset? Or is this a secondary CPU? */ if (!cpu_init_detectedx && boot_cpu()) { @@ -174,7 +173,6 @@
sio_init(); w83627ehg_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init(); enable_rom_decode();
Modified: trunk/src/mainboard/asus/a8v-e_se/romstage.c ============================================================================== --- trunk/src/mainboard/asus/a8v-e_se/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/asus/a8v-e_se/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -159,7 +159,6 @@
sio_init(); w83627ehg_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init(); enable_rom_decode();
@@ -172,11 +171,12 @@ enumerate_ht_chain(); }
+ // FIXME why is this executed again? ---> sio_init(); w83627ehg_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init(); enable_rom_decode(); + // <--- FIXME why is this executed again?
print_info("now booting... real_main\n");
Modified: trunk/src/mainboard/asus/m2n-e/romstage.c ============================================================================== --- trunk/src/mainboard/asus/m2n-e/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/asus/m2n-e/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -121,7 +121,6 @@ pnp_exit_ext_func_mode(SERIAL_DEV);
setup_mb_resource_map(); - uart_init(); report_bist_failure(bist); console_init();
Modified: trunk/src/mainboard/asus/m2v-mx_se/romstage.c ============================================================================== --- trunk/src/mainboard/asus/m2v-mx_se/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/asus/m2v-mx_se/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -134,7 +134,6 @@ it8712f_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); it8712f_kill_watchdog(); it8712f_enable_3vsbsw(); - uart_init(); console_init(); enable_rom_decode();
Modified: trunk/src/mainboard/asus/m2v/romstage.c ============================================================================== --- trunk/src/mainboard/asus/m2v/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/asus/m2v/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -237,7 +237,6 @@ it8712f_24mhz_clkin(); it8712f_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); it8712f_kill_watchdog(); - uart_init(); console_init(); enable_rom_decode(); m2v_bus_init();
Modified: trunk/src/mainboard/asus/m4a78-em/romstage.c ============================================================================== --- trunk/src/mainboard/asus/m4a78-em/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/asus/m4a78-em/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -104,7 +104,6 @@
it8712f_enable_serial(0, CONFIG_TTYS0_BASE); it8712f_kill_watchdog(); - uart_init();
console_init();
Modified: trunk/src/mainboard/asus/m4a785-m/romstage.c ============================================================================== --- trunk/src/mainboard/asus/m4a785-m/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/asus/m4a785-m/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -104,7 +104,6 @@
it8712f_enable_serial(0, CONFIG_TTYS0_BASE); it8712f_kill_watchdog(); - uart_init();
console_init();
Modified: trunk/src/mainboard/asus/mew-am/romstage.c ============================================================================== --- trunk/src/mainboard/asus/mew-am/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/asus/mew-am/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -37,7 +37,6 @@ void main(unsigned long bist) { smscsuperio_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init(); report_bist_failure(bist); enable_smbus();
Modified: trunk/src/mainboard/asus/mew-vm/romstage.c ============================================================================== --- trunk/src/mainboard/asus/mew-vm/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/asus/mew-vm/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -37,7 +37,6 @@ void main(unsigned long bist) { lpc47b272_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init(); enable_smbus(); report_bist_failure(bist);
Modified: trunk/src/mainboard/asus/p2b-d/romstage.c ============================================================================== --- trunk/src/mainboard/asus/p2b-d/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/asus/p2b-d/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -44,7 +44,6 @@ void main(unsigned long bist) { w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init(); report_bist_failure(bist);
Modified: trunk/src/mainboard/asus/p2b-ds/romstage.c ============================================================================== --- trunk/src/mainboard/asus/p2b-ds/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/asus/p2b-ds/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -44,7 +44,6 @@ void main(unsigned long bist) { w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init(); report_bist_failure(bist);
Modified: trunk/src/mainboard/asus/p2b-f/romstage.c ============================================================================== --- trunk/src/mainboard/asus/p2b-f/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/asus/p2b-f/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -47,7 +47,6 @@ { /* FIXME: The ASUS P2B-F has a Winbond W83977EF, actually. */ w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init(); report_bist_failure(bist);
Modified: trunk/src/mainboard/asus/p2b-ls/romstage.c ============================================================================== --- trunk/src/mainboard/asus/p2b-ls/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/asus/p2b-ls/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -46,7 +46,6 @@ { /* FIXME: The ASUS P2B-LS has a Winbond W83977EF, actually. */ w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init(); report_bist_failure(bist);
Modified: trunk/src/mainboard/asus/p2b/romstage.c ============================================================================== --- trunk/src/mainboard/asus/p2b/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/asus/p2b/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -44,7 +44,6 @@ void main(unsigned long bist) { w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init(); report_bist_failure(bist);
Modified: trunk/src/mainboard/asus/p3b-f/romstage.c ============================================================================== --- trunk/src/mainboard/asus/p3b-f/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/asus/p3b-f/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -78,7 +78,6 @@ { /* FIXME: The ASUS P3B-F has a Winbond W83977EF, actually. */ w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init(); report_bist_failure(bist);
Modified: trunk/src/mainboard/axus/tc320/romstage.c ============================================================================== --- trunk/src/mainboard/axus/tc320/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/axus/tc320/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -35,7 +35,6 @@ static void main(unsigned long bist) { pc97317_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init(); report_bist_failure(bist); cs5530_enable_rom();
Modified: trunk/src/mainboard/azza/pt-6ibd/romstage.c ============================================================================== --- trunk/src/mainboard/azza/pt-6ibd/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/azza/pt-6ibd/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -47,7 +47,6 @@ { /* FIXME: It's a Winbond W83977EF, actually. */ w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init(); report_bist_failure(bist);
Modified: trunk/src/mainboard/bcom/winnet100/romstage.c ============================================================================== --- trunk/src/mainboard/bcom/winnet100/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/bcom/winnet100/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -35,7 +35,6 @@ static void main(unsigned long bist) { pc97317_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init(); report_bist_failure(bist); cs5530_enable_rom();
Modified: trunk/src/mainboard/bcom/winnetp680/romstage.c ============================================================================== --- trunk/src/mainboard/bcom/winnetp680/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/bcom/winnetp680/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -87,7 +87,6 @@
w83697hf_set_clksel_48(SERIAL_DEV); w83697hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
enable_smbus();
Modified: trunk/src/mainboard/biostar/m6tba/romstage.c ============================================================================== --- trunk/src/mainboard/biostar/m6tba/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/biostar/m6tba/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -44,7 +44,6 @@ void main(unsigned long bist) { smscsuperio_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init(); report_bist_failure(bist); enable_smbus();
Modified: trunk/src/mainboard/broadcom/blast/romstage.c ============================================================================== --- trunk/src/mainboard/broadcom/blast/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/broadcom/blast/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -89,7 +89,6 @@ bsp_apicid = init_cpus(cpu_init_detectedx);
pc87417_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c ============================================================================== --- trunk/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -47,7 +47,6 @@ { /* FIXME: Should be PC97307! */ pc97317_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init(); report_bist_failure(bist);
Modified: trunk/src/mainboard/dell/s1850/romstage.c ============================================================================== --- trunk/src/mainboard/dell/s1850/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/dell/s1850/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -261,7 +261,6 @@ mainboard_set_ich5(); //bmc_foad(); pc8374_enable_dev(CONSOLE_SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
/* stuff we seem to need */
Modified: trunk/src/mainboard/digitallogic/adl855pc/romstage.c ============================================================================== --- trunk/src/mainboard/digitallogic/adl855pc/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/digitallogic/adl855pc/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -37,7 +37,6 @@ }
w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/digitallogic/msm586seg/romstage.c ============================================================================== --- trunk/src/mainboard/digitallogic/msm586seg/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/digitallogic/msm586seg/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -163,7 +163,6 @@
setupsc520(); irqinit(); - uart_init(); console_init(); for(i = 0; i < 100; i++) print_err("fill usart\n");
Modified: trunk/src/mainboard/digitallogic/msm800sev/romstage.c ============================================================================== --- trunk/src/mainboard/digitallogic/msm800sev/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/digitallogic/msm800sev/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -52,7 +52,6 @@ */ cs5536_disable_internal_uart(); w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/eaglelion/5bcm/romstage.c ============================================================================== --- trunk/src/mainboard/eaglelion/5bcm/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/eaglelion/5bcm/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -16,7 +16,6 @@ static void main(unsigned long bist) { pc97317_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init(); report_bist_failure(bist); cs5530_enable_rom();
Modified: trunk/src/mainboard/ecs/p6iwp-fe/romstage.c ============================================================================== --- trunk/src/mainboard/ecs/p6iwp-fe/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/ecs/p6iwp-fe/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -37,7 +37,6 @@ { it8712f_24mhz_clkin(); it8712f_enable_serial(0, CONFIG_TTYS0_BASE); // Does not use its 1st parameter - uart_init(); console_init(); report_bist_failure(bist); enable_smbus();
Modified: trunk/src/mainboard/emulation/qemu-x86/romstage.c ============================================================================== --- trunk/src/mainboard/emulation/qemu-x86/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/emulation/qemu-x86/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -16,7 +16,6 @@ /* init_timer(); */ post_code(0x05);
- uart_init(); console_init();
//print_pci_devices();
Modified: trunk/src/mainboard/getac/p470/romstage.c ============================================================================== --- trunk/src/mainboard/getac/p470/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/getac/p470/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -286,8 +286,6 @@ early_superio_config();
/* Set up the console */ - uart_init(); - console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/gigabyte/ga-6bxc/romstage.c ============================================================================== --- trunk/src/mainboard/gigabyte/ga-6bxc/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/gigabyte/ga-6bxc/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -45,7 +45,6 @@ void main(unsigned long bist) { it8671f_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init(); report_bist_failure(bist);
Modified: trunk/src/mainboard/gigabyte/ga-6bxe/romstage.c ============================================================================== --- trunk/src/mainboard/gigabyte/ga-6bxe/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/gigabyte/ga-6bxe/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -46,7 +46,6 @@ { it8671f_48mhz_clkin(); it8671f_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init(); report_bist_failure(bist);
Modified: trunk/src/mainboard/gigabyte/ga_2761gxdk/romstage.c ============================================================================== --- trunk/src/mainboard/gigabyte/ga_2761gxdk/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/gigabyte/ga_2761gxdk/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -142,12 +142,11 @@
setup_mb_resource_map();
- uart_init(); + console_init();
/* Halt if there was a built in self test failure */ report_bist_failure(bist);
- console_init(); printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
print_debug("bsp_apicid="); print_debug_hex8(bsp_apicid); print_debug("\n");
Modified: trunk/src/mainboard/gigabyte/m57sli/romstage.c ============================================================================== --- trunk/src/mainboard/gigabyte/m57sli/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/gigabyte/m57sli/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -145,12 +145,11 @@
setup_mb_resource_map();
- uart_init(); + console_init();
/* Halt if there was a built in self test failure */ report_bist_failure(bist);
- console_init(); printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
print_debug("bsp_apicid="); print_debug_hex8(bsp_apicid); print_debug("\n");
Modified: trunk/src/mainboard/gigabyte/ma785gmt/romstage.c ============================================================================== --- trunk/src/mainboard/gigabyte/ma785gmt/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/gigabyte/ma785gmt/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -100,10 +100,7 @@
it8718f_enable_serial(0, CONFIG_TTYS0_BASE); it8718f_disable_reboot(); - uart_init(); - console_init(); - printk(BIOS_DEBUG, "\n");
// dump_mem(CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE-0x200, CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE);
Modified: trunk/src/mainboard/gigabyte/ma78gm/romstage.c ============================================================================== --- trunk/src/mainboard/gigabyte/ma78gm/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/gigabyte/ma78gm/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -104,7 +104,6 @@
it8718f_enable_serial(0, CONFIG_TTYS0_BASE); it8718f_disable_reboot(); - uart_init();
console_init();
Modified: trunk/src/mainboard/hp/dl145_g1/romstage.c ============================================================================== --- trunk/src/mainboard/hp/dl145_g1/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/hp/dl145_g1/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -120,7 +120,6 @@ bsp_apicid = init_cpus(cpu_init_detectedx);
w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/hp/dl145_g3/romstage.c ============================================================================== --- trunk/src/mainboard/hp/dl145_g3/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/hp/dl145_g3/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -153,12 +153,11 @@
pilot_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
- uart_init(); + console_init();
/* Halt if there was a built in self test failure */ report_bist_failure(bist);
- console_init(); // setup_early_ipmi_serial(); pilot_early_init(SERIAL_DEV); //config port is being taken from SERIAL_DEV printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
Modified: trunk/src/mainboard/hp/dl165_g6_fam10/romstage.c ============================================================================== --- trunk/src/mainboard/hp/dl165_g6_fam10/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/hp/dl165_g6_fam10/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -123,12 +123,11 @@
pilot_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
- uart_init(); + console_init();
/* Halt if there was a built in self test failure */ report_bist_failure(bist);
- console_init(); pilot_early_init(SERIAL_DEV); //config port is being taken from SERIAL_DEV
val = cpuid_eax(1);
Modified: trunk/src/mainboard/hp/e_vectra_p2706t/romstage.c ============================================================================== --- trunk/src/mainboard/hp/e_vectra_p2706t/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/hp/e_vectra_p2706t/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -42,7 +42,6 @@ { /* TODO: It's a PC87364 actually! */ pc87360_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init(); enable_smbus(); report_bist_failure(bist);
Modified: trunk/src/mainboard/ibase/mb899/romstage.c ============================================================================== --- trunk/src/mainboard/ibase/mb899/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/ibase/mb899/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -237,8 +237,6 @@ early_superio_config_w83627ehg();
/* Set up the console */ - uart_init(); - console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/ibm/e325/romstage.c ============================================================================== --- trunk/src/mainboard/ibm/e325/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/ibm/e325/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -102,7 +102,6 @@ init_cpus(cpu_init_detectedx);
pc87366_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/ibm/e326/romstage.c ============================================================================== --- trunk/src/mainboard/ibm/e326/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/ibm/e326/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -102,7 +102,6 @@ init_cpus(cpu_init_detectedx);
pc87366_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/iei/juki-511p/romstage.c ============================================================================== --- trunk/src/mainboard/iei/juki-511p/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/iei/juki-511p/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -36,7 +36,6 @@ static void main(unsigned long bist) { w83977f_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init(); report_bist_failure(bist);
Modified: trunk/src/mainboard/iei/kino-780am2-fam10/romstage.c ============================================================================== --- trunk/src/mainboard/iei/kino-780am2-fam10/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/iei/kino-780am2-fam10/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -105,7 +105,6 @@ sb7xx_51xx_lpc_init();
f71859_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init();
console_init();
Modified: trunk/src/mainboard/iei/nova4899r/romstage.c ============================================================================== --- trunk/src/mainboard/iei/nova4899r/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/iei/nova4899r/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -36,7 +36,6 @@ static void main(unsigned long bist) { w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init(); report_bist_failure(bist); cs5530_enable_rom();
Modified: trunk/src/mainboard/iei/pcisa-lx-800-r10/romstage.c ============================================================================== --- trunk/src/mainboard/iei/pcisa-lx-800-r10/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/iei/pcisa-lx-800-r10/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -73,7 +73,6 @@ * early MSR setup for CS5536. */ w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
/* Halt if there was a built in self test failure */ @@ -86,5 +85,4 @@ sdram_initialize(1, memctrl);
/* Memory is setup. Return to cache_as_ram.inc and continue to boot. */ - return; }
Modified: trunk/src/mainboard/intel/d810e2cb/romstage.c ============================================================================== --- trunk/src/mainboard/intel/d810e2cb/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/intel/d810e2cb/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -41,7 +41,6 @@ mb_gpio_init();
smscsuperio_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
report_bist_failure(bist);
Modified: trunk/src/mainboard/intel/d945gclf/romstage.c ============================================================================== --- trunk/src/mainboard/intel/d945gclf/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/intel/d945gclf/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -198,8 +198,6 @@ early_superio_config_lpc47m15x();
/* Set up the console */ - uart_init(); - console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/intel/eagleheights/romstage.c ============================================================================== --- trunk/src/mainboard/intel/eagleheights/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/intel/eagleheights/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -145,7 +145,6 @@ i3100_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); i3100_configure_uart_clk(SERIAL_DEV, I3100_UART_CLK_PREDIVIDE_26);
- uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/intel/jarrell/romstage.c ============================================================================== --- trunk/src/mainboard/intel/jarrell/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/intel/jarrell/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -63,7 +63,6 @@ /* Enable Serial 2 lines instead of GPIO */ outb(0x2c, 0x2e); outb((inb(0x2f) & (~1<<1)), 0x2f); - uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/intel/mtarvon/romstage.c ============================================================================== --- trunk/src/mainboard/intel/mtarvon/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/intel/mtarvon/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -82,7 +82,6 @@ i3100_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); i3100_configure_uart_clk(SERIAL_DEV, I3100_UART_CLK_PREDIVIDE_26);
- uart_init(); console_init();
/* Prevent the TCO timer from rebooting us */
Modified: trunk/src/mainboard/intel/truxton/romstage.c ============================================================================== --- trunk/src/mainboard/intel/truxton/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/intel/truxton/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -76,7 +76,6 @@ i3100_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); i3100_configure_uart_clk(SERIAL_DEV, I3100_UART_CLK_PREDIVIDE_26);
- uart_init(); console_init();
/* Prevent the TCO timer from rebooting us */
Modified: trunk/src/mainboard/intel/xe7501devkit/romstage.c ============================================================================== --- trunk/src/mainboard/intel/xe7501devkit/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/intel/xe7501devkit/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -53,7 +53,6 @@
// Get the serial port running and print a welcome banner lpc47b272_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
// Halt if there was a built in self test failure
Modified: trunk/src/mainboard/iwave/iWRainbowG6/romstage.c ============================================================================== --- trunk/src/mainboard/iwave/iWRainbowG6/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/iwave/iWRainbowG6/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -341,7 +341,6 @@ enable_lapic();
sch_enable_lpc(); - uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/iwill/dk8_htx/romstage.c ============================================================================== --- trunk/src/mainboard/iwill/dk8_htx/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/iwill/dk8_htx/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -101,7 +101,6 @@ bsp_apicid = init_cpus(cpu_init_detectedx, sysinfo);
w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/iwill/dk8s2/romstage.c ============================================================================== --- trunk/src/mainboard/iwill/dk8s2/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/iwill/dk8s2/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -102,7 +102,6 @@ bsp_apicid = init_cpus(cpu_init_detectedx, sysinfo);
w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/iwill/dk8x/romstage.c ============================================================================== --- trunk/src/mainboard/iwill/dk8x/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/iwill/dk8x/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -102,7 +102,6 @@ bsp_apicid = init_cpus(cpu_init_detectedx, sysinfo);
w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/jetway/j7f24/romstage.c ============================================================================== --- trunk/src/mainboard/jetway/j7f24/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/jetway/j7f24/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -92,7 +92,6 @@ pci_write_config8(ctrl.d0f0, 0x4f, 0x01);
f71805f_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
enable_smbus();
Modified: trunk/src/mainboard/jetway/pa78vm5/romstage.c ============================================================================== --- trunk/src/mainboard/jetway/pa78vm5/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/jetway/pa78vm5/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -110,7 +110,6 @@ sb7xx_51xx_lpc_init();
f71863fg_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init();
console_init();
Modified: trunk/src/mainboard/kontron/986lcd-m/romstage.c ============================================================================== --- trunk/src/mainboard/kontron/986lcd-m/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/kontron/986lcd-m/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -335,8 +335,6 @@ early_superio_config_w83627thg();
/* Set up the console */ - uart_init(); - console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/kontron/kt690/romstage.c ============================================================================== --- trunk/src/mainboard/kontron/kt690/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/kontron/kt690/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -94,7 +94,6 @@ sb600_lpc_init();
w83627dhg_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init();
console_init();
Modified: trunk/src/mainboard/lanner/em8510/romstage.c ============================================================================== --- trunk/src/mainboard/lanner/em8510/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/lanner/em8510/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -59,7 +59,6 @@ }
w83627thg_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/lenovo/t60/romstage.c ============================================================================== --- trunk/src/mainboard/lenovo/t60/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/lenovo/t60/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -232,7 +232,6 @@ dock_connect(); early_superio_config(); /* Set up the console */ - uart_init(); }
#if CONFIG_USBDEBUG
Modified: trunk/src/mainboard/lenovo/x60/romstage.c ============================================================================== --- trunk/src/mainboard/lenovo/x60/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/lenovo/x60/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -239,7 +239,6 @@ dock_connect(); early_superio_config(); /* Set up the console */ - uart_init(); }
console_init();
Modified: trunk/src/mainboard/lippert/frontrunner/romstage.c ============================================================================== --- trunk/src/mainboard/lippert/frontrunner/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/lippert/frontrunner/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -81,7 +81,6 @@ msr_init();
w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
cs5535_early_setup();
Modified: trunk/src/mainboard/lippert/hurricane-lx/romstage.c ============================================================================== --- trunk/src/mainboard/lippert/hurricane-lx/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/lippert/hurricane-lx/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -133,7 +133,6 @@ */ it8712f_enable_serial(0, CONFIG_TTYS0_BASE); // Does not use its 1st parameter mb_gpio_init(); - uart_init(); console_init();
/* Halt if there was a built in self test failure */ @@ -156,5 +155,4 @@ sdram_initialize(1, memctrl);
/* Memory is setup. Return to cache_as_ram.inc and continue to boot. */ - return; }
Modified: trunk/src/mainboard/lippert/literunner-lx/romstage.c ============================================================================== --- trunk/src/mainboard/lippert/literunner-lx/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/lippert/literunner-lx/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -176,7 +176,6 @@ */ it8712f_enable_serial(0, CONFIG_TTYS0_BASE); // Does not use its 1st parameter mb_gpio_init(); - uart_init(); console_init();
/* Halt if there was a built in self test failure */ @@ -196,5 +195,4 @@ sdram_initialize(1, memctrl);
/* Memory is setup. Return to cache_as_ram.inc and continue to boot. */ - return; }
Modified: trunk/src/mainboard/lippert/roadrunner-lx/romstage.c ============================================================================== --- trunk/src/mainboard/lippert/roadrunner-lx/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/lippert/roadrunner-lx/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -108,7 +108,6 @@ */ it8712f_enable_serial(0, CONFIG_TTYS0_BASE); // Does not use its 1st parameter mb_gpio_init(); - uart_init(); console_init();
/* Halt if there was a built in self test failure */ @@ -121,5 +120,4 @@ sdram_initialize(1, memctrl);
/* Memory is setup. Return to cache_as_ram.inc and continue to boot. */ - return; }
Modified: trunk/src/mainboard/lippert/spacerunner-lx/romstage.c ============================================================================== --- trunk/src/mainboard/lippert/spacerunner-lx/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/lippert/spacerunner-lx/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -173,7 +173,6 @@ */ it8712f_enable_serial(0, CONFIG_TTYS0_BASE); // Does not use its 1st parameter mb_gpio_init(); - uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/mitac/6513wu/romstage.c ============================================================================== --- trunk/src/mainboard/mitac/6513wu/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/mitac/6513wu/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -38,7 +38,6 @@ void main(unsigned long bist) { smscsuperio_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
report_bist_failure(bist);
Modified: trunk/src/mainboard/msi/ms6119/romstage.c ============================================================================== --- trunk/src/mainboard/msi/ms6119/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/msi/ms6119/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -44,7 +44,6 @@ void main(unsigned long bist) { w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init(); report_bist_failure(bist);
Modified: trunk/src/mainboard/msi/ms6147/romstage.c ============================================================================== --- trunk/src/mainboard/msi/ms6147/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/msi/ms6147/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -44,7 +44,6 @@ void main(unsigned long bist) { w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init(); report_bist_failure(bist);
Modified: trunk/src/mainboard/msi/ms6156/romstage.c ============================================================================== --- trunk/src/mainboard/msi/ms6156/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/msi/ms6156/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -44,7 +44,6 @@ void main(unsigned long bist) { w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init(); report_bist_failure(bist);
Modified: trunk/src/mainboard/msi/ms6178/romstage.c ============================================================================== --- trunk/src/mainboard/msi/ms6178/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/msi/ms6178/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -40,7 +40,6 @@ w83627hf_set_clksel_48(DUMMY_DEV); w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
- uart_init(); console_init(); enable_smbus(); report_bist_failure(bist);
Modified: trunk/src/mainboard/msi/ms7135/romstage.c ============================================================================== --- trunk/src/mainboard/msi/ms7135/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/msi/ms7135/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -107,7 +107,6 @@ bsp_apicid = init_cpus(cpu_init_detectedx);
w83627thg_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/msi/ms7260/romstage.c ============================================================================== --- trunk/src/mainboard/msi/ms7260/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/msi/ms7260/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -137,9 +137,8 @@ pnp_exit_ext_func_mode(SERIAL_DEV);
setup_mb_resource_map(); - uart_init(); - report_bist_failure(bist); /* Halt upon BIST failure. */ console_init(); + report_bist_failure(bist); /* Halt upon BIST failure. */
printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1); print_debug("bsp_apicid=");
Modified: trunk/src/mainboard/msi/ms9185/romstage.c ============================================================================== --- trunk/src/mainboard/msi/ms9185/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/msi/ms9185/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -123,7 +123,6 @@ bsp_apicid = init_cpus(cpu_init_detectedx, sysinfo);
pc87417_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
// dump_mem(CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE-0x200, CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE);
Modified: trunk/src/mainboard/msi/ms9282/romstage.c ============================================================================== --- trunk/src/mainboard/msi/ms9282/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/msi/ms9282/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -145,7 +145,6 @@ }
w83627ehg_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/msi/ms9652_fam10/romstage.c ============================================================================== --- trunk/src/mainboard/msi/ms9652_fam10/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/msi/ms9652_fam10/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -136,7 +136,6 @@ pnp_exit_ext_func_mode(SERIAL_DEV);
w83627ehg_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/nec/powermate2000/romstage.c ============================================================================== --- trunk/src/mainboard/nec/powermate2000/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/nec/powermate2000/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -37,7 +37,6 @@ void main(unsigned long bist) { smscsuperio_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init(); enable_smbus(); report_bist_failure(bist);
Modified: trunk/src/mainboard/newisys/khepri/romstage.c ============================================================================== --- trunk/src/mainboard/newisys/khepri/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/newisys/khepri/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -96,7 +96,6 @@ bsp_apicid = init_cpus(cpu_init_detectedx);
w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
// dump_mem(CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE-0x200, CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE);
Modified: trunk/src/mainboard/nokia/ip530/romstage.c ============================================================================== --- trunk/src/mainboard/nokia/ip530/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/nokia/ip530/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -44,7 +44,6 @@ void main(unsigned long bist) { smscsuperio_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init(); report_bist_failure(bist);
Modified: trunk/src/mainboard/nvidia/l1_2pvv/romstage.c ============================================================================== --- trunk/src/mainboard/nvidia/l1_2pvv/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/nvidia/l1_2pvv/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -135,12 +135,10 @@
setup_mb_resource_map();
- uart_init(); + console_init();
/* Halt if there was a built in self test failure */ report_bist_failure(bist); - - console_init(); printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
print_debug("bsp_apicid="); print_debug_hex8(bsp_apicid); print_debug("\n");
Modified: trunk/src/mainboard/pcengines/alix1c/romstage.c ============================================================================== --- trunk/src/mainboard/pcengines/alix1c/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/pcengines/alix1c/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -127,7 +127,6 @@ */ cs5536_disable_internal_uart(); w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/pcengines/alix2d/romstage.c ============================================================================== --- trunk/src/mainboard/pcengines/alix2d/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/pcengines/alix2d/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -151,7 +151,6 @@ */ cs5536_setup_onchipuart(1); mb_gpio_init(); - uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/rca/rm4100/romstage.c ============================================================================== --- trunk/src/mainboard/rca/rm4100/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/rca/rm4100/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -107,7 +107,6 @@ mb_gpio_init();
smscsuperio_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
/* Halt if there was a built in self test failure. */
Modified: trunk/src/mainboard/roda/rk886ex/romstage.c ============================================================================== --- trunk/src/mainboard/roda/rk886ex/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/roda/rk886ex/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -270,8 +270,6 @@ early_superio_config();
/* Set up the console */ - uart_init(); - console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/soyo/sy-6ba-plus-iii/romstage.c ============================================================================== --- trunk/src/mainboard/soyo/sy-6ba-plus-iii/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/soyo/sy-6ba-plus-iii/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -45,7 +45,6 @@ void main(unsigned long bist) { it8671f_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init(); report_bist_failure(bist);
Modified: trunk/src/mainboard/sunw/ultra40/romstage.c ============================================================================== --- trunk/src/mainboard/sunw/ultra40/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/sunw/ultra40/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -119,7 +119,6 @@ bsp_apicid = init_cpus(cpu_init_detectedx);
lpc47b397_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/supermicro/h8dme/romstage.c ============================================================================== --- trunk/src/mainboard/supermicro/h8dme/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/supermicro/h8dme/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -197,7 +197,6 @@ w83627hf_set_clksel_48(DUMMY_DEV); w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
- uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/supermicro/h8dmr/romstage.c ============================================================================== --- trunk/src/mainboard/supermicro/h8dmr/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/supermicro/h8dmr/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -126,7 +126,6 @@ w83627hf_set_clksel_48(DUMMY_DEV); w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
- uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/supermicro/h8dmr_fam10/romstage.c ============================================================================== --- trunk/src/mainboard/supermicro/h8dmr_fam10/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/supermicro/h8dmr_fam10/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -133,9 +133,7 @@ w83627hf_set_clksel_48(DUMMY_DEV); w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
- uart_init(); console_init(); - printk(BIOS_DEBUG, "\n");
/* Halt if there was a built in self test failure */ report_bist_failure(bist);
Modified: trunk/src/mainboard/supermicro/h8qme_fam10/romstage.c ============================================================================== --- trunk/src/mainboard/supermicro/h8qme_fam10/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/supermicro/h8qme_fam10/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -184,7 +184,6 @@ w83627hf_set_clksel_48(DUMMY_DEV); w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
- uart_init(); console_init(); write_GPIO(); printk(BIOS_DEBUG, "\n");
Modified: trunk/src/mainboard/supermicro/h8scm_fam10/romstage.c ============================================================================== --- trunk/src/mainboard/supermicro/h8scm_fam10/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/supermicro/h8scm_fam10/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -123,7 +123,6 @@ wpcm450_enable_dev(WPCM450_SP1, 0x164E, CONFIG_TTYS0_BASE);
sb7xx_51xx_disable_wideio(0); - uart_init();
console_init();
Modified: trunk/src/mainboard/supermicro/x6dai_g/romstage.c ============================================================================== --- trunk/src/mainboard/supermicro/x6dai_g/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/supermicro/x6dai_g/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -66,7 +66,6 @@
w83627hf_set_clksel_48(DUMMY_DEV); w83627hf_enable_serial(CONSOLE_SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
/* MOVE ME TO A BETTER LOCATION !!! */
Modified: trunk/src/mainboard/supermicro/x6dhe_g/romstage.c ============================================================================== --- trunk/src/mainboard/supermicro/x6dhe_g/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/supermicro/x6dhe_g/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -66,7 +66,6 @@
w83627hf_set_clksel_48(DUMMY_DEV); w83627hf_enable_serial(CONSOLE_SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/supermicro/x6dhe_g2/romstage.c ============================================================================== --- trunk/src/mainboard/supermicro/x6dhe_g2/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/supermicro/x6dhe_g2/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -66,7 +66,6 @@ outb(0x87,0x2e); pnp_write_config(CONSOLE_SERIAL_DEV, 0x24, 0x84 | (1 << 6)); pc87427_enable_dev(CONSOLE_SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/supermicro/x6dhr_ig/romstage.c ============================================================================== --- trunk/src/mainboard/supermicro/x6dhr_ig/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/supermicro/x6dhr_ig/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -65,7 +65,6 @@
w83627hf_set_clksel_48(DUMMY_DEV); w83627hf_enable_serial(CONSOLE_SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/technexion/tim5690/romstage.c ============================================================================== --- trunk/src/mainboard/technexion/tim5690/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/technexion/tim5690/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -98,7 +98,6 @@ /* it8712f_enable_serial does not use its 1st parameter. */ it8712f_enable_serial(0, CONFIG_TTYS0_BASE); it8712f_kill_watchdog(); - uart_init();
console_init();
Modified: trunk/src/mainboard/technexion/tim8690/romstage.c ============================================================================== --- trunk/src/mainboard/technexion/tim8690/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/technexion/tim8690/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -93,7 +93,6 @@ /* it8712f_enable_serial does not use its 1st parameter. */ it8712f_enable_serial(0, CONFIG_TTYS0_BASE); it8712f_kill_watchdog(); - uart_init();
console_init();
Modified: trunk/src/mainboard/technologic/ts5300/romstage.c ============================================================================== --- trunk/src/mainboard/technologic/ts5300/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/technologic/ts5300/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -149,7 +149,6 @@ ;
setupsc520(); - uart_init(); console_init();
Modified: trunk/src/mainboard/televideo/tc7020/romstage.c ============================================================================== --- trunk/src/mainboard/televideo/tc7020/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/televideo/tc7020/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -35,7 +35,6 @@ static void main(unsigned long bist) { pc97317_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init(); report_bist_failure(bist); cs5530_enable_rom();
Modified: trunk/src/mainboard/thomson/ip1000/romstage.c ============================================================================== --- trunk/src/mainboard/thomson/ip1000/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/thomson/ip1000/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -106,7 +106,6 @@ mb_gpio_init();
smscsuperio_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
/* Halt if there was a built in self test failure. */
Modified: trunk/src/mainboard/traverse/geos/romstage.c ============================================================================== --- trunk/src/mainboard/traverse/geos/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/traverse/geos/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -70,7 +70,6 @@ */ /* If debug. real setup done in chipset init via devicetree.cb. */ cs5536_setup_onchipuart(1); - uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/tyan/s1846/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s1846/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/tyan/s1846/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -44,7 +44,6 @@ void main(unsigned long bist) { pc87309_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init(); report_bist_failure(bist);
Modified: trunk/src/mainboard/tyan/s2735/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2735/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/tyan/s2735/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -49,7 +49,6 @@ enable_lapic();
w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/tyan/s2850/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2850/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/tyan/s2850/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -89,7 +89,6 @@ // post_code(0x32);
w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/tyan/s2875/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2875/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/tyan/s2875/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -98,7 +98,6 @@ init_cpus(cpu_init_detectedx);
w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/tyan/s2880/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2880/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/tyan/s2880/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -98,7 +98,6 @@ init_cpus(cpu_init_detectedx);
w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/tyan/s2881/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2881/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/tyan/s2881/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -87,7 +87,6 @@ // post_code(0x32);
w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/tyan/s2882/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2882/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/tyan/s2882/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -98,7 +98,6 @@ init_cpus(cpu_init_detectedx);
w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/tyan/s2885/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2885/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/tyan/s2885/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -85,7 +85,6 @@ bsp_apicid = init_cpus(cpu_init_detectedx);
w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
// dump_mem(CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE-0x200, CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE);
Modified: trunk/src/mainboard/tyan/s2891/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2891/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/tyan/s2891/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -99,7 +99,6 @@ // post_code(0x32);
w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/tyan/s2892/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2892/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/tyan/s2892/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -94,7 +94,6 @@ // post_code(0x32);
w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/tyan/s2895/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2895/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/tyan/s2895/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -120,7 +120,6 @@ bsp_apicid = init_cpus(cpu_init_detectedx);
lpc47b397_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/tyan/s2912/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2912/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/tyan/s2912/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -131,12 +131,12 @@
w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); setup_mb_resource_map(); - uart_init(); + + console_init();
/* Halt if there was a built in self test failure */ report_bist_failure(bist);
- console_init(); printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
print_debug("bsp_apicid="); print_debug_hex8(bsp_apicid); print_debug("\n");
Modified: trunk/src/mainboard/tyan/s2912_fam10/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2912_fam10/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/tyan/s2912_fam10/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -136,7 +136,6 @@ post_code(0x32);
w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/tyan/s4880/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s4880/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/tyan/s4880/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -145,7 +145,6 @@ init_cpus(cpu_init_detectedx);
w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/tyan/s4882/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s4882/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/tyan/s4882/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -124,7 +124,6 @@ bsp_apicid = init_cpus(cpu_init_detectedx);
w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/via/epia-cn/romstage.c ============================================================================== --- trunk/src/mainboard/via/epia-cn/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/via/epia-cn/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -86,7 +86,6 @@ pci_write_config8(ctrl.d0f0, 0x4f, 0x01);
enable_vt8235_serial(); - uart_init(); console_init(); enable_smbus(); smbus_fixup(&ctrl);
Modified: trunk/src/mainboard/via/epia-m/romstage.c ============================================================================== --- trunk/src/mainboard/via/epia-m/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/via/epia-m/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -84,7 +84,6 @@ pci_write_config8(dev, 0x15, 0x1c);
enable_vt8235_serial(); - uart_init(); console_init();
enable_smbus();
Modified: trunk/src/mainboard/via/epia-m700/romstage.c ============================================================================== --- trunk/src/mainboard/via/epia-m700/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/via/epia-m700/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -387,9 +387,7 @@ /* EmbedComInit(); */ w83697hf_set_clksel_48(DUMMY_DEV); w83697hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); /* enable_vx800_serial(); */ - /* uart_init(); */
/* * 1. D15F0
Modified: trunk/src/mainboard/via/epia-n/romstage.c ============================================================================== --- trunk/src/mainboard/via/epia-n/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/via/epia-n/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -112,7 +112,6 @@
w83697hf_set_clksel_48(DUMMY_DEV); w83697hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
enable_smbus();
Modified: trunk/src/mainboard/via/epia/romstage.c ============================================================================== --- trunk/src/mainboard/via/epia/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/via/epia/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -76,7 +76,6 @@ early_mtrr_init();
enable_vt8231_serial(); - uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/via/pc2500e/romstage.c ============================================================================== --- trunk/src/mainboard/via/pc2500e/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/via/pc2500e/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -61,7 +61,6 @@ pci_write_config8(ctrl.d0f0, 0x4f, 0x01);
it8716f_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init(); enable_smbus(); smbus_fixup(&ctrl);
Modified: trunk/src/mainboard/via/vt8454c/romstage.c ============================================================================== --- trunk/src/mainboard/via/vt8454c/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/via/vt8454c/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -96,7 +96,6 @@ enable_smbus();
enable_cx700_serial(); - uart_init(); console_init();
/* Halt if there was a built in self test failure */
Modified: trunk/src/mainboard/winent/pl6064/romstage.c ============================================================================== --- trunk/src/mainboard/winent/pl6064/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/winent/pl6064/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -72,7 +72,6 @@ */ w83627hf_set_clksel_48(SERIAL_DEV); w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - uart_init(); console_init();
/* Halt if there was a built in self test failure */ @@ -85,5 +84,4 @@ sdram_initialize(1, memctrl);
/* Memory is setup. Return to cache_as_ram.inc and continue to boot. */ - return; }
Modified: trunk/src/mainboard/wyse/s50/romstage.c ============================================================================== --- trunk/src/mainboard/wyse/s50/romstage.c Wed Apr 20 11:12:17 2011 (r6530) +++ trunk/src/mainboard/wyse/s50/romstage.c Wed Apr 20 22:54:07 2011 (r6531) @@ -62,7 +62,6 @@ /* cs5536_disable_internal_uart disable them. Set them up now... */ cs5536_setup_onchipuart(1);
- uart_init(); console_init();
/* Halt if there was a built in self test failure */