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>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6531 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/console/console.c b/src/console/console.c
index 3178562bb342fb8185fec001c5d22e2ebed28aac..9ec0e259a93362881ba7bfd3e34cd654245f2376 100644 (file)
--- a/src/console/console.c
+++ b/src/console/console.c
@@ -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 @@ void console_init(void)
        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

diff --git a/src/mainboard/a-trend/atc-6220/romstage.c b/src/mainboard/a-trend/atc-6220/romstage.c
index b92256e7b8ffc4329a4e5e0936d9f649c721dd80..b7534a8d3ab75498d36ab8ecfe3b8727cd5c65d1 100644 (file)
--- a/src/mainboard/a-trend/atc-6220/romstage.c
+++ b/src/mainboard/a-trend/atc-6220/romstage.c
@@ -44,7 +44,6 @@ int spd_read_byte(unsigned int device, unsigned int address)
 void main(unsigned long bist)
 {
        w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
-       uart_init();
        console_init();
        report_bist_failure(bist);
 

diff --git a/src/mainboard/a-trend/atc-6240/romstage.c b/src/mainboard/a-trend/atc-6240/romstage.c
index b771dd93961843ebf0cebf1773508a88086bfe84..9c04fb957899c7a64e35b940c395be5ae08ce46b 100644 (file)
--- a/src/mainboard/a-trend/atc-6240/romstage.c
+++ b/src/mainboard/a-trend/atc-6240/romstage.c
@@ -44,7 +44,6 @@ int spd_read_byte(unsigned int device, unsigned int address)
 void main(unsigned long bist)
 {
        w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
-       uart_init();
        console_init();
        report_bist_failure(bist);
 

diff --git a/src/mainboard/abit/be6-ii_v2_0/romstage.c b/src/mainboard/abit/be6-ii_v2_0/romstage.c
index ff3294a6818d8bd06e0bf72fd74dac2e15bc61c8..313559277bf2cd528be3e5123e4081a00b87fe54 100644 (file)
--- a/src/mainboard/abit/be6-ii_v2_0/romstage.c
+++ b/src/mainboard/abit/be6-ii_v2_0/romstage.c
@@ -47,7 +47,6 @@ void main(unsigned long bist)
 {
        /* FIXME: It's a Winbond W83977EF, actually. */
        w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
-       uart_init();
        console_init();
        report_bist_failure(bist);
 

diff --git a/src/mainboard/advantech/pcm-5820/romstage.c b/src/mainboard/advantech/pcm-5820/romstage.c
index d48ca7e5303357bf9f90ce5dea9f72fe24b7bdf1..08cd8c0e7d727200954eae74d4a392d43e5f05d2 100644 (file)
--- a/src/mainboard/advantech/pcm-5820/romstage.c
+++ b/src/mainboard/advantech/pcm-5820/romstage.c
@@ -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();

diff --git a/src/mainboard/amd/bimini_fam10/romstage.c b/src/mainboard/amd/bimini_fam10/romstage.c
index 7905401336e18b79d11c22974c0e6e5dd8b0a9aa..175325eb84b2cc45be303fdcbc20d8848a0bcbcb 100644 (file)
--- a/src/mainboard/amd/bimini_fam10/romstage.c
+++ b/src/mainboard/amd/bimini_fam10/romstage.c
@@ -109,7 +109,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
        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);

diff --git a/src/mainboard/amd/db800/romstage.c b/src/mainboard/amd/db800/romstage.c
index 60ed7c7123b20185b569ba6d183fe783c57bef35..264f1a809ee73c9482b58661ad6b78eecd3472ef 100644 (file)
--- a/src/mainboard/amd/db800/romstage.c
+++ b/src/mainboard/amd/db800/romstage.c
@@ -69,7 +69,6 @@ void main(unsigned long bist)
         * 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 */

diff --git a/src/mainboard/amd/dbm690t/romstage.c b/src/mainboard/amd/dbm690t/romstage.c
index ba9716a318a948a361f74a837746315250fd1b2a..f119ec991a98b287ebe9f53af453ec350d1cb4bd 100644 (file)
--- a/src/mainboard/amd/dbm690t/romstage.c
+++ b/src/mainboard/amd/dbm690t/romstage.c
@@ -92,7 +92,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 
        /* it8712f_enable_serial does not use its 1st parameter. */
        it8712f_enable_serial(0, CONFIG_TTYS0_BASE);
-       uart_init();
 
        console_init();
 

diff --git a/src/mainboard/amd/inagua/romstage.c b/src/mainboard/amd/inagua/romstage.c
index cbebf07e0fe3084686f2fb4894a38f10b9796fd3..57953bce6a023914ca1073459e64b745488a6bdd 100644 (file)
--- a/src/mainboard/amd/inagua/romstage.c
+++ b/src/mainboard/amd/inagua/romstage.c
@@ -56,7 +56,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 
     post_code(0x31);
     kbc1100_early_init(CONFIG_SIO_PORT);
-    uart_init();
     console_init();
   }
 

diff --git a/src/mainboard/amd/mahogany/romstage.c b/src/mainboard/amd/mahogany/romstage.c
index e46d4bcdb6a0f7b93bfc0f3f800e157cad4d43c8..b4c9635fe90b9f1ec67e815bf238e664c0076bc3 100644 (file)
--- a/src/mainboard/amd/mahogany/romstage.c
+++ b/src/mainboard/amd/mahogany/romstage.c
@@ -91,7 +91,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
        sb7xx_51xx_lpc_init();
 
        it8718f_enable_serial(0, CONFIG_TTYS0_BASE);
-       uart_init();
 
        console_init();
 

diff --git a/src/mainboard/amd/mahogany_fam10/romstage.c b/src/mainboard/amd/mahogany_fam10/romstage.c
index a30403145742dfbb57bc086487fa41761a1ccb39..680e60dbb711263fa891168d8a3ecb587b8b4193 100644 (file)
--- a/src/mainboard/amd/mahogany_fam10/romstage.c
+++ b/src/mainboard/amd/mahogany_fam10/romstage.c
@@ -104,7 +104,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
        sb7xx_51xx_lpc_init();
 
        it8718f_enable_serial(0, CONFIG_TTYS0_BASE);
-       uart_init();
 
        console_init();
 

diff --git a/src/mainboard/amd/norwich/romstage.c b/src/mainboard/amd/norwich/romstage.c
index d385074777331ee565f4f16c96b1b9f7b0c59e45..097965f3b1bd3cd965ee0a03f5df5d6a8bfea406 100644 (file)
--- a/src/mainboard/amd/norwich/romstage.c
+++ b/src/mainboard/amd/norwich/romstage.c
@@ -70,7 +70,6 @@ void main(unsigned long bist)
         */
        /* 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 */

diff --git a/src/mainboard/amd/persimmon/romstage.c b/src/mainboard/amd/persimmon/romstage.c
index c1655b04ffaaeb429ac1b7e7c9883c4628f7bc5c..aff41939a28d1ef0c57b9bb20a4d4eba88805327 100644 (file)
--- a/src/mainboard/amd/persimmon/romstage.c
+++ b/src/mainboard/amd/persimmon/romstage.c
@@ -53,7 +53,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 
     post_code(0x31);
     f81865f_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
-    uart_init();
     console_init();
   }
        //reg8 = pmio_read(0x24);

diff --git a/src/mainboard/amd/pistachio/romstage.c b/src/mainboard/amd/pistachio/romstage.c
index 6627d747e2502231a0cf038de0bf76b6c9cda39c..ee00c13df22006b7cdcd739fe88ef6ecb49e3b5a 100644 (file)
--- a/src/mainboard/amd/pistachio/romstage.c
+++ b/src/mainboard/amd/pistachio/romstage.c
@@ -89,7 +89,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 
        /* Pistachio used a FPGA to enable serial debug instead of a SIO
         * and it doesn't require any special setup. */
-       uart_init();
 
        console_init();
 

diff --git a/src/mainboard/amd/rumba/romstage.c b/src/mainboard/amd/rumba/romstage.c
index b81f386f3d67967830d2d838cbf0a48fd760f1be..49dfa68bd5b54b15f716cf32f266e396c94ea13f 100644 (file)
--- a/src/mainboard/amd/rumba/romstage.c
+++ b/src/mainboard/amd/rumba/romstage.c
@@ -39,7 +39,6 @@ void main(unsigned long bist)
        SystemPreInit();
 
        w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
-       uart_init();
        console_init();
 
        cs5536_early_setup();

diff --git a/src/mainboard/amd/serengeti_cheetah/romstage.c b/src/mainboard/amd/serengeti_cheetah/romstage.c
index 6f1eeafab211358f360acebbe097e38297c55278..5f3cd7b7747e8f7aecd6f9f489bdcbfff5422d78 100644 (file)
--- a/src/mainboard/amd/serengeti_cheetah/romstage.c
+++ b/src/mainboard/amd/serengeti_cheetah/romstage.c
@@ -131,7 +131,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
                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);

diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c b/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c
index b64e16e183af25b56329f388f6f7f99bc51c2bb7..b41230dece8f2e9a1aa6ea4c66f320738300b218 100644 (file)
--- a/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c
@@ -212,9 +212,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
        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);
 

diff --git a/src/mainboard/amd/tilapia_fam10/romstage.c b/src/mainboard/amd/tilapia_fam10/romstage.c
index ce24f03f715ac05439254dfc7886e6272458ebd4..3a85a15f8425ed3ef371b00768112007ff171e69 100644 (file)
--- a/src/mainboard/amd/tilapia_fam10/romstage.c
+++ b/src/mainboard/amd/tilapia_fam10/romstage.c
@@ -103,7 +103,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
        sb7xx_51xx_lpc_init();
 
        it8718f_enable_serial(0, CONFIG_TTYS0_BASE);
-       uart_init();
 
        console_init();
 

diff --git a/src/mainboard/arima/hdama/romstage.c b/src/mainboard/arima/hdama/romstage.c
index 5c5befed1bd3e5946ea632c539bd1e7e5e45f1ec..61b685c82cb9e5371c44d95fb2203f9461298b9e 100644 (file)
--- a/src/mainboard/arima/hdama/romstage.c
+++ b/src/mainboard/arima/hdama/romstage.c
@@ -93,7 +93,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
                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 */

diff --git a/src/mainboard/artecgroup/dbe61/romstage.c b/src/mainboard/artecgroup/dbe61/romstage.c
index 465fb7dd65fc7a8f615df9fd9d3961b7dea9d709..83b59bbc5328fd8e8b89ee9bc03e34f39fca9699 100644 (file)
--- a/src/mainboard/artecgroup/dbe61/romstage.c
+++ b/src/mainboard/artecgroup/dbe61/romstage.c
@@ -89,7 +89,6 @@ void main(unsigned long bist)
        msr.lo |= 0x7 << 20;
        wrmsr(MDD_LEG_IO, msr);
 
-       uart_init();
        console_init();
 
        /* Halt if there was a built in self test failure */

diff --git a/src/mainboard/asi/mb_5blgp/romstage.c b/src/mainboard/asi/mb_5blgp/romstage.c
index 7a7e69c4f95075ef4a44f4bd397d17b01e22f3c9..9009fcd5c6b168397320b879bfbca2c151fb876e 100644 (file)
--- a/src/mainboard/asi/mb_5blgp/romstage.c
+++ b/src/mainboard/asi/mb_5blgp/romstage.c
@@ -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();

diff --git a/src/mainboard/asi/mb_5blmp/romstage.c b/src/mainboard/asi/mb_5blmp/romstage.c
index da7de0186bb3d780149cd1ca408a4add2b2acd81..bdc0edfc06f21e0378708a5e4b7825a55ec572ff 100644 (file)
--- a/src/mainboard/asi/mb_5blmp/romstage.c
+++ b/src/mainboard/asi/mb_5blmp/romstage.c
@@ -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();

diff --git a/src/mainboard/asrock/939a785gmh/romstage.c b/src/mainboard/asrock/939a785gmh/romstage.c
index 25822d9e566df75adb51744db707ec6c2e985570..b0ae24794f31ba5e00fa3ca6867cc33d094b8e8b 100644 (file)
--- a/src/mainboard/asrock/939a785gmh/romstage.c
+++ b/src/mainboard/asrock/939a785gmh/romstage.c
@@ -158,7 +158,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 
        sio_init();
        w83627dhg_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
-       uart_init();
 
        console_init();
 

diff --git a/src/mainboard/asrock/e350m1/romstage.c b/src/mainboard/asrock/e350m1/romstage.c
index b48a58af6b90633202c3602951ce4e973b03a024..d63fbe81cb83e81341bfd4e3dec47cd342ab49cc 100644 (file)
--- a/src/mainboard/asrock/e350m1/romstage.c
+++ b/src/mainboard/asrock/e350m1/romstage.c
@@ -53,7 +53,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 
     post_code(0x31);
     w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
-    uart_init();
     console_init();
   }
        //reg8 = pmio_read(0x24);

diff --git a/src/mainboard/asus/a8n_e/romstage.c b/src/mainboard/asus/a8n_e/romstage.c
index 8d015476956a03665b9f35738de7cfaa30ec9204..b3e85b7d8325a190142bd59a45b3152bfec1b05c 100644 (file)
--- a/src/mainboard/asus/a8n_e/romstage.c
+++ b/src/mainboard/asus/a8n_e/romstage.c
@@ -109,7 +109,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 
        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 */

diff --git a/src/mainboard/asus/a8v-e_deluxe/romstage.c b/src/mainboard/asus/a8v-e_deluxe/romstage.c
index 6785a2fca2712ba5699f133663782d2d83dd5288..47a0e656f146871ab0514699d0f0e54e9b29b048 100644 (file)
--- a/src/mainboard/asus/a8v-e_deluxe/romstage.c
+++ b/src/mainboard/asus/a8v-e_deluxe/romstage.c
@@ -159,11 +159,10 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 
        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 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 
        sio_init();
        w83627ehg_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
-       uart_init();
        console_init();
        enable_rom_decode();
 

diff --git a/src/mainboard/asus/a8v-e_se/romstage.c b/src/mainboard/asus/a8v-e_se/romstage.c
index 6785a2fca2712ba5699f133663782d2d83dd5288..4e08859746e70803c768696f539ddb0b3ca3a834 100644 (file)
--- a/src/mainboard/asus/a8v-e_se/romstage.c
+++ b/src/mainboard/asus/a8v-e_se/romstage.c
@@ -159,7 +159,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 
        sio_init();
        w83627ehg_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
-       uart_init();
        console_init();
        enable_rom_decode();
 
@@ -172,11 +171,12 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
                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");
 

diff --git a/src/mainboard/asus/m2n-e/romstage.c b/src/mainboard/asus/m2n-e/romstage.c
index 66a2b9ff1cc002f038f5ed407a21ef4331e5f5c1..db3c6146b604d7ff79e939214086673ab4b89ed3 100644 (file)
--- a/src/mainboard/asus/m2n-e/romstage.c
+++ b/src/mainboard/asus/m2n-e/romstage.c
@@ -121,7 +121,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
        pnp_exit_ext_func_mode(SERIAL_DEV);
 
        setup_mb_resource_map();
-       uart_init();
        report_bist_failure(bist);
        console_init();
 

diff --git a/src/mainboard/asus/m2v-mx_se/romstage.c b/src/mainboard/asus/m2v-mx_se/romstage.c
index 476f8860f49a3191c99f7e8d1c920274feb11c2b..580d8fa50acdfbfc01ecbf2887cbed99428cca23 100644 (file)
--- a/src/mainboard/asus/m2v-mx_se/romstage.c
+++ b/src/mainboard/asus/m2v-mx_se/romstage.c
@@ -134,7 +134,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
        it8712f_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
        it8712f_kill_watchdog();
        it8712f_enable_3vsbsw();
-       uart_init();
        console_init();
        enable_rom_decode();
 

diff --git a/src/mainboard/asus/m2v/romstage.c b/src/mainboard/asus/m2v/romstage.c
index 7c224632e146e6c19ab000eac2b7d8a9b3831a51..53a3fc38d2ed0d8d10677cf2c138f682a01655eb 100644 (file)
--- a/src/mainboard/asus/m2v/romstage.c
+++ b/src/mainboard/asus/m2v/romstage.c
@@ -237,7 +237,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
        it8712f_24mhz_clkin();
        it8712f_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
        it8712f_kill_watchdog();
-       uart_init();
        console_init();
        enable_rom_decode();
        m2v_bus_init();

diff --git a/src/mainboard/asus/m4a78-em/romstage.c b/src/mainboard/asus/m4a78-em/romstage.c
index 68caa0120b8541669ad494fcb53c938044ce0e72..0675ee670f117371ab3c1254b9c33e2815cbac12 100644 (file)
--- a/src/mainboard/asus/m4a78-em/romstage.c
+++ b/src/mainboard/asus/m4a78-em/romstage.c
@@ -104,7 +104,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 
        it8712f_enable_serial(0, CONFIG_TTYS0_BASE);
        it8712f_kill_watchdog();
-       uart_init();
 
        console_init();
 

diff --git a/src/mainboard/asus/m4a785-m/romstage.c b/src/mainboard/asus/m4a785-m/romstage.c
index 68caa0120b8541669ad494fcb53c938044ce0e72..0675ee670f117371ab3c1254b9c33e2815cbac12 100644 (file)
--- a/src/mainboard/asus/m4a785-m/romstage.c
+++ b/src/mainboard/asus/m4a785-m/romstage.c
@@ -104,7 +104,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 
        it8712f_enable_serial(0, CONFIG_TTYS0_BASE);
        it8712f_kill_watchdog();
-       uart_init();
 
        console_init();
 

diff --git a/src/mainboard/asus/mew-am/romstage.c b/src/mainboard/asus/mew-am/romstage.c
index c04776c216e995604d77dc3540c051c67df6c431..f0f26c903959e6d191ef8b12cbbc3f2c93100313 100644 (file)
--- a/src/mainboard/asus/mew-am/romstage.c
+++ b/src/mainboard/asus/mew-am/romstage.c
@@ -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();

diff --git a/src/mainboard/asus/mew-vm/romstage.c b/src/mainboard/asus/mew-vm/romstage.c
index ced590f726d88d72f0e138f550bb74618c54a385..f82f87eee4b5e655161c6514f2f763f5c600a8b2 100644 (file)
--- a/src/mainboard/asus/mew-vm/romstage.c
+++ b/src/mainboard/asus/mew-vm/romstage.c
@@ -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);

diff --git a/src/mainboard/asus/p2b-d/romstage.c b/src/mainboard/asus/p2b-d/romstage.c
index 8a067f201cacb9a9b4fb7f3cf65b4726d5b58701..4d10862a39ea637dc747919315eddf05b1cd5ffb 100644 (file)
--- a/src/mainboard/asus/p2b-d/romstage.c
+++ b/src/mainboard/asus/p2b-d/romstage.c
@@ -44,7 +44,6 @@ int spd_read_byte(unsigned int device, unsigned int address)
 void main(unsigned long bist)
 {
        w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
-       uart_init();
        console_init();
        report_bist_failure(bist);
 

diff --git a/src/mainboard/asus/p2b-ds/romstage.c b/src/mainboard/asus/p2b-ds/romstage.c
index ad0194dca52eecd735c5cc184245fed32e0d902a..593bfc4df4151cef24eac5f1aee0763c9dedf334 100644 (file)
--- a/src/mainboard/asus/p2b-ds/romstage.c
+++ b/src/mainboard/asus/p2b-ds/romstage.c
@@ -44,7 +44,6 @@ int spd_read_byte(unsigned int device, unsigned int address)
 void main(unsigned long bist)
 {
        w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
-       uart_init();
        console_init();
        report_bist_failure(bist);
 

diff --git a/src/mainboard/asus/p2b-f/romstage.c b/src/mainboard/asus/p2b-f/romstage.c
index 6b0fc7280a7e04f5ddea152e4de7afcbcd366234..361a32fe6dde91a204461c56b4cb7ffe5275960b 100644 (file)
--- a/src/mainboard/asus/p2b-f/romstage.c
+++ b/src/mainboard/asus/p2b-f/romstage.c
@@ -47,7 +47,6 @@ void main(unsigned long bist)
 {
        /* 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);
 

diff --git a/src/mainboard/asus/p2b-ls/romstage.c b/src/mainboard/asus/p2b-ls/romstage.c
index a47a2988cb9eb1a52a9dc9e1400905cacbd5bc14..6209233c10eef712842dc5476004baf39eb66fc5 100644 (file)
--- a/src/mainboard/asus/p2b-ls/romstage.c
+++ b/src/mainboard/asus/p2b-ls/romstage.c
@@ -46,7 +46,6 @@ void main(unsigned long bist)
 {
        /* 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);
 

diff --git a/src/mainboard/asus/p2b/romstage.c b/src/mainboard/asus/p2b/romstage.c
index b92256e7b8ffc4329a4e5e0936d9f649c721dd80..b7534a8d3ab75498d36ab8ecfe3b8727cd5c65d1 100644 (file)
--- a/src/mainboard/asus/p2b/romstage.c
+++ b/src/mainboard/asus/p2b/romstage.c
@@ -44,7 +44,6 @@ int spd_read_byte(unsigned int device, unsigned int address)
 void main(unsigned long bist)
 {
        w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
-       uart_init();
        console_init();
        report_bist_failure(bist);
 

diff --git a/src/mainboard/asus/p3b-f/romstage.c b/src/mainboard/asus/p3b-f/romstage.c
index 38dffd5e54a2b08911382a472e5ace5f86c90778..1772a5217832db124654d2a04727e8a4f70b2fe0 100644 (file)
--- a/src/mainboard/asus/p3b-f/romstage.c
+++ b/src/mainboard/asus/p3b-f/romstage.c
@@ -78,7 +78,6 @@ void main(unsigned long bist)
 {
        /* 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);
 

diff --git a/src/mainboard/axus/tc320/romstage.c b/src/mainboard/axus/tc320/romstage.c
index e375d5119cb845e2823cde1900095ecd0e907a8b..5d237e28bf1d9c5f4dbd778ceb30475ffb3eb40d 100644 (file)
--- a/src/mainboard/axus/tc320/romstage.c
+++ b/src/mainboard/axus/tc320/romstage.c
@@ -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();

diff --git a/src/mainboard/azza/pt-6ibd/romstage.c b/src/mainboard/azza/pt-6ibd/romstage.c
index eed674ab0bae0bab09abbb61c40403f15181e3bf..d5cf02bba9ebf1c89e6053b6c2f64e92710a7495 100644 (file)
--- a/src/mainboard/azza/pt-6ibd/romstage.c
+++ b/src/mainboard/azza/pt-6ibd/romstage.c
@@ -47,7 +47,6 @@ void main(unsigned long bist)
 {
        /* FIXME: It's a Winbond W83977EF, actually. */
        w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
-       uart_init();
        console_init();
        report_bist_failure(bist);
 

diff --git a/src/mainboard/bcom/winnet100/romstage.c b/src/mainboard/bcom/winnet100/romstage.c
index e375d5119cb845e2823cde1900095ecd0e907a8b..5d237e28bf1d9c5f4dbd778ceb30475ffb3eb40d 100644 (file)
--- a/src/mainboard/bcom/winnet100/romstage.c
+++ b/src/mainboard/bcom/winnet100/romstage.c
@@ -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();

diff --git a/src/mainboard/bcom/winnetp680/romstage.c b/src/mainboard/bcom/winnetp680/romstage.c
index 18bf62f87dba239cc17812e8bc68c2c1aaa440fd..f930e4527fcb058bcd4d889ff5599dff35963e16 100644 (file)
--- a/src/mainboard/bcom/winnetp680/romstage.c
+++ b/src/mainboard/bcom/winnetp680/romstage.c
@@ -87,7 +87,6 @@ void main(unsigned long bist)
 
        w83697hf_set_clksel_48(SERIAL_DEV);
        w83697hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
-       uart_init();
        console_init();
 
        enable_smbus();

diff --git a/src/mainboard/biostar/m6tba/romstage.c b/src/mainboard/biostar/m6tba/romstage.c
index 5761db745d2d4a570a4bdec76840c005663b591a..de1947f8b740f2359d33c2615210d055d65b7ee0 100644 (file)
--- a/src/mainboard/biostar/m6tba/romstage.c
+++ b/src/mainboard/biostar/m6tba/romstage.c
@@ -44,7 +44,6 @@ int spd_read_byte(unsigned int device, unsigned int address)
 void main(unsigned long bist)
 {
        smscsuperio_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
-       uart_init();
        console_init();
        report_bist_failure(bist);
        enable_smbus();

diff --git a/src/mainboard/broadcom/blast/romstage.c b/src/mainboard/broadcom/blast/romstage.c
index 14e7c8f47ee5ee081992ce948b8773a88e33bd58..4dee7637c9535d9bad017bffb5282594435398bd 100644 (file)
--- a/src/mainboard/broadcom/blast/romstage.c
+++ b/src/mainboard/broadcom/blast/romstage.c
@@ -89,7 +89,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
                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 */

diff --git a/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c b/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c
index 6b6e36eb9fb081a22b961f217fe8882b38dd14d3..062f450f343a1c154ab8f180794728042c04caaa 100644 (file)
--- a/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c
+++ b/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c
@@ -47,7 +47,6 @@ void main(unsigned long bist)
 {
        /* FIXME: Should be PC97307! */
        pc97317_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
-       uart_init();
        console_init();
        report_bist_failure(bist);
 

diff --git a/src/mainboard/dell/s1850/romstage.c b/src/mainboard/dell/s1850/romstage.c
index 0a051d2140526a47a520877780dbc3cc12aa79e8..e636986ad4cd15712abf75fe1b5b80dee9f18fa7 100644 (file)
--- a/src/mainboard/dell/s1850/romstage.c
+++ b/src/mainboard/dell/s1850/romstage.c
@@ -261,7 +261,6 @@ static void main(unsigned long bist)
        mainboard_set_ich5();
        //bmc_foad();
        pc8374_enable_dev(CONSOLE_SERIAL_DEV, CONFIG_TTYS0_BASE);
-       uart_init();
        console_init();
 
        /* stuff we seem to need */

diff --git a/src/mainboard/digitallogic/adl855pc/romstage.c b/src/mainboard/digitallogic/adl855pc/romstage.c
index 5c1e12f0a547071ff1e014de0a28de1b5d1ee65b..16b15fe1905b25b9bb2376966eec7300a3088f34 100644 (file)
--- a/src/mainboard/digitallogic/adl855pc/romstage.c
+++ b/src/mainboard/digitallogic/adl855pc/romstage.c
@@ -37,7 +37,6 @@ void main(unsigned long bist)
        }
 
         w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
-        uart_init();
         console_init();
 
        /* Halt if there was a built in self test failure */

diff --git a/src/mainboard/digitallogic/msm586seg/romstage.c b/src/mainboard/digitallogic/msm586seg/romstage.c
index a4994f1f4b3f184544a4de4a7017043df3875a2b..a293842dc4483c23bdd41b63b2e96779a6b02d65 100644 (file)
--- a/src/mainboard/digitallogic/msm586seg/romstage.c
+++ b/src/mainboard/digitallogic/msm586seg/romstage.c
@@ -163,7 +163,6 @@ static void main(unsigned long bist)
 
         setupsc520();
        irqinit();
-        uart_init();
         console_init();
                for(i = 0; i < 100; i++)
          print_err("fill usart\n");

diff --git a/src/mainboard/digitallogic/msm800sev/romstage.c b/src/mainboard/digitallogic/msm800sev/romstage.c
index f043ee857c911c55e9ecf80d90ec44b8630ad8d8..2f4cef1250c136491743a4165c1cee03223598ec 100644 (file)
--- a/src/mainboard/digitallogic/msm800sev/romstage.c
+++ b/src/mainboard/digitallogic/msm800sev/romstage.c
@@ -52,7 +52,6 @@ void main(unsigned long bist)
         */
        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 */

diff --git a/src/mainboard/eaglelion/5bcm/romstage.c b/src/mainboard/eaglelion/5bcm/romstage.c
index 3c2deb7a0cbbc2bb087604bce346ffa8959b3295..f1ee25de4f8c7b619dbf43d0424d4c2588cac764 100644 (file)
--- a/src/mainboard/eaglelion/5bcm/romstage.c
+++ b/src/mainboard/eaglelion/5bcm/romstage.c
@@ -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();

diff --git a/src/mainboard/ecs/p6iwp-fe/romstage.c b/src/mainboard/ecs/p6iwp-fe/romstage.c
index 2325e7613ecb8a7dbcd7223aa6317c4a6e55144d..6b200f1c827e5a0ba26e30bee2c4b2632713575d 100644 (file)
--- a/src/mainboard/ecs/p6iwp-fe/romstage.c
+++ b/src/mainboard/ecs/p6iwp-fe/romstage.c
@@ -37,7 +37,6 @@ void main(unsigned long bist)
 {
        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();

diff --git a/src/mainboard/emulation/qemu-x86/romstage.c b/src/mainboard/emulation/qemu-x86/romstage.c
index f559c2afcc3006964508022d125a9929439b57f5..d6b5dd5fa067c8f290f4666df37ff111ff163cb2 100644 (file)
--- a/src/mainboard/emulation/qemu-x86/romstage.c
+++ b/src/mainboard/emulation/qemu-x86/romstage.c
@@ -16,7 +16,6 @@ static void main(void)
        /* init_timer(); */
        post_code(0x05);
 
-       uart_init();
        console_init();
 
        //print_pci_devices();

diff --git a/src/mainboard/getac/p470/romstage.c b/src/mainboard/getac/p470/romstage.c
index db20b832d8f21a1cb4c760fbef48091202174bda..582a7bdaadf1f798eb60beabf18732e2bdc24446 100644 (file)
--- a/src/mainboard/getac/p470/romstage.c
+++ b/src/mainboard/getac/p470/romstage.c
@@ -286,8 +286,6 @@ void main(unsigned long bist)
        early_superio_config();
 
        /* Set up the console */
-       uart_init();
-
        console_init();
 
        /* Halt if there was a built in self test failure */

diff --git a/src/mainboard/gigabyte/ga-6bxc/romstage.c b/src/mainboard/gigabyte/ga-6bxc/romstage.c
index ec876ff699f0563512566c70a75e19cfe95a1c17..c1500964090ae488bd8bf3e696786550a8ccfad1 100644 (file)
--- a/src/mainboard/gigabyte/ga-6bxc/romstage.c
+++ b/src/mainboard/gigabyte/ga-6bxc/romstage.c
@@ -45,7 +45,6 @@ int spd_read_byte(unsigned int device, unsigned int address)
 void main(unsigned long bist)
 {
        it8671f_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
-       uart_init();
        console_init();
        report_bist_failure(bist);
 

diff --git a/src/mainboard/gigabyte/ga-6bxe/romstage.c b/src/mainboard/gigabyte/ga-6bxe/romstage.c
index 54018f38e4629bb85e2cb4584a0baebcbea64b84..9002ab101c56006021ea1dabb0e0314b667ce757 100644 (file)
--- a/src/mainboard/gigabyte/ga-6bxe/romstage.c
+++ b/src/mainboard/gigabyte/ga-6bxe/romstage.c
@@ -46,7 +46,6 @@ void main(unsigned long bist)
 {
        it8671f_48mhz_clkin();
        it8671f_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
-       uart_init();
        console_init();
        report_bist_failure(bist);
 

diff --git a/src/mainboard/gigabyte/ga_2761gxdk/romstage.c b/src/mainboard/gigabyte/ga_2761gxdk/romstage.c
index 18187950ae4e3e1a0f0e30e617141a6cdde2757b..5bc1fbf4e7514fd743c0ab8a319aba9ece662c24 100644 (file)
--- a/src/mainboard/gigabyte/ga_2761gxdk/romstage.c
+++ b/src/mainboard/gigabyte/ga_2761gxdk/romstage.c
@@ -142,12 +142,11 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 
         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");

diff --git a/src/mainboard/gigabyte/m57sli/romstage.c b/src/mainboard/gigabyte/m57sli/romstage.c
index 855d7558722d9a2575841f8f50e8cf4718550458..2a9c6eee8aa27bf114011bf0fffbe9cf28e64873 100644 (file)
--- a/src/mainboard/gigabyte/m57sli/romstage.c
+++ b/src/mainboard/gigabyte/m57sli/romstage.c
@@ -145,12 +145,11 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 
         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");

diff --git a/src/mainboard/gigabyte/ma785gmt/romstage.c b/src/mainboard/gigabyte/ma785gmt/romstage.c
index f0585dbbb0eafbff05c01ec726bc8dcb50e2fba7..8f3f55d486004b4a2e10726df9e7a150c79c822b 100644 (file)
--- a/src/mainboard/gigabyte/ma785gmt/romstage.c
+++ b/src/mainboard/gigabyte/ma785gmt/romstage.c
@@ -100,10 +100,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 
        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);
 

diff --git a/src/mainboard/gigabyte/ma78gm/romstage.c b/src/mainboard/gigabyte/ma78gm/romstage.c
index 694440fbebc1eff5d3709d2577ceff4ec0314767..c34fa5b87860772f882c6dca54a7001a5530ccce 100644 (file)
--- a/src/mainboard/gigabyte/ma78gm/romstage.c
+++ b/src/mainboard/gigabyte/ma78gm/romstage.c
@@ -104,7 +104,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 
        it8718f_enable_serial(0, CONFIG_TTYS0_BASE);
        it8718f_disable_reboot();
-       uart_init();
 
        console_init();
 

diff --git a/src/mainboard/hp/dl145_g1/romstage.c b/src/mainboard/hp/dl145_g1/romstage.c
index ebd81c87fb0e57034e6bad0f14f697a334e1a601..c3d28546ccb9b956f304ad46018f0026891adb4d 100644 (file)
--- a/src/mainboard/hp/dl145_g1/romstage.c
+++ b/src/mainboard/hp/dl145_g1/romstage.c
@@ -120,7 +120,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
                 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 */

diff --git a/src/mainboard/hp/dl145_g3/romstage.c b/src/mainboard/hp/dl145_g3/romstage.c
index 4f44dd837cd9933e893734b4c0fe8a437c73643b..a46218a2b0d56906af5e8753e3837dccb62a8ecf 100644 (file)
--- a/src/mainboard/hp/dl145_g3/romstage.c
+++ b/src/mainboard/hp/dl145_g3/romstage.c
@@ -153,12 +153,11 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 
        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);

diff --git a/src/mainboard/hp/dl165_g6_fam10/romstage.c b/src/mainboard/hp/dl165_g6_fam10/romstage.c
index 99f05950daf81aeee3baf242771979c92533f6d3..d40df6b95d2bcf66f0b592d0ba2501cfd104ca1a 100644 (file)
--- a/src/mainboard/hp/dl165_g6_fam10/romstage.c
+++ b/src/mainboard/hp/dl165_g6_fam10/romstage.c
@@ -123,12 +123,11 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 
        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);

diff --git a/src/mainboard/hp/e_vectra_p2706t/romstage.c b/src/mainboard/hp/e_vectra_p2706t/romstage.c
index e00d13535344ea7b935ca9f827cb9f7ab90f9c73..789d17fe4597fadaba3f890ec6ea78d8080fafcf 100644 (file)
--- a/src/mainboard/hp/e_vectra_p2706t/romstage.c
+++ b/src/mainboard/hp/e_vectra_p2706t/romstage.c
@@ -42,7 +42,6 @@ void main(unsigned long bist)
 {
        /* TODO: It's a PC87364 actually! */
        pc87360_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
-       uart_init();
        console_init();
        enable_smbus();
        report_bist_failure(bist);

diff --git a/src/mainboard/ibase/mb899/romstage.c b/src/mainboard/ibase/mb899/romstage.c
index 5cd1fe571c337eae63090d959d33b3d40634c7cb..6cf6a387e2021aa6a1f42657871fdc8f52a5068c 100644 (file)
--- a/src/mainboard/ibase/mb899/romstage.c
+++ b/src/mainboard/ibase/mb899/romstage.c
@@ -237,8 +237,6 @@ void main(unsigned long bist)
        early_superio_config_w83627ehg();
 
        /* Set up the console */
-       uart_init();
-
        console_init();
 
        /* Halt if there was a built in self test failure */

diff --git a/src/mainboard/ibm/e325/romstage.c b/src/mainboard/ibm/e325/romstage.c
index ecfb32a4f3d3b7a05f204899743dd7424e8518e3..6dd291e7e631dd30e3feb73ad7775f7d0980cf89 100644 (file)
--- a/src/mainboard/ibm/e325/romstage.c
+++ b/src/mainboard/ibm/e325/romstage.c
@@ -102,7 +102,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
                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 */

diff --git a/src/mainboard/ibm/e326/romstage.c b/src/mainboard/ibm/e326/romstage.c
index bc991a450d016463067cdd16c60c188dc217229e..2c2b611a36df2c34e20031e524fde48f48268a5b 100644 (file)
--- a/src/mainboard/ibm/e326/romstage.c
+++ b/src/mainboard/ibm/e326/romstage.c
@@ -102,7 +102,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
                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 */

diff --git a/src/mainboard/iei/juki-511p/romstage.c b/src/mainboard/iei/juki-511p/romstage.c
index d0adbf12644dbd3ceba15a982b86b43c5e6b09dc..e70e65d4a0c2259189976243cfeb6ac9b0942021 100644 (file)
--- a/src/mainboard/iei/juki-511p/romstage.c
+++ b/src/mainboard/iei/juki-511p/romstage.c
@@ -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);
 

diff --git a/src/mainboard/iei/kino-780am2-fam10/romstage.c b/src/mainboard/iei/kino-780am2-fam10/romstage.c
index 772ee8a4379c83201079e5d8254f11ae8be6d3fc..192b47ab42b96731144134a0e6916453950a015b 100644 (file)
--- a/src/mainboard/iei/kino-780am2-fam10/romstage.c
+++ b/src/mainboard/iei/kino-780am2-fam10/romstage.c
@@ -105,7 +105,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
        sb7xx_51xx_lpc_init();
 
        f71859_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
-       uart_init();
 
        console_init();
 

diff --git a/src/mainboard/iei/nova4899r/romstage.c b/src/mainboard/iei/nova4899r/romstage.c
index 63da15d5417d86b7554ead74ada9275597649804..0577578e0d3ae87c4b4fbd641e88d260e2b7434c 100644 (file)
--- a/src/mainboard/iei/nova4899r/romstage.c
+++ b/src/mainboard/iei/nova4899r/romstage.c
@@ -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();

diff --git a/src/mainboard/iei/pcisa-lx-800-r10/romstage.c b/src/mainboard/iei/pcisa-lx-800-r10/romstage.c
index 57d51e37a3129b0f5cfe8c0a5e57dc080eddeae4..4121e3e91db1e46ced88f8b9009581a39b1d352e 100644 (file)
--- a/src/mainboard/iei/pcisa-lx-800-r10/romstage.c
+++ b/src/mainboard/iei/pcisa-lx-800-r10/romstage.c
@@ -73,7 +73,6 @@ void main(unsigned long bist)
         * 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 @@ void main(unsigned long bist)
        sdram_initialize(1, memctrl);
 
        /* Memory is setup. Return to cache_as_ram.inc and continue to boot. */
-       return;
 }

diff --git a/src/mainboard/intel/d810e2cb/romstage.c b/src/mainboard/intel/d810e2cb/romstage.c
index 249a9a1d2131ded72e5acabd22a4644e3b076f97..0594e7e402e6d3a21774e36dcbf8d5b3cb7bcdad 100644 (file)
--- a/src/mainboard/intel/d810e2cb/romstage.c
+++ b/src/mainboard/intel/d810e2cb/romstage.c
@@ -41,7 +41,6 @@ void main(unsigned long bist)
        mb_gpio_init();
 
        smscsuperio_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
-       uart_init();
        console_init();
 
        report_bist_failure(bist);

diff --git a/src/mainboard/intel/d945gclf/romstage.c b/src/mainboard/intel/d945gclf/romstage.c
index 748cce7812566efb323e13ef4af9b97f9771bd02..cba3146f9207f9ae07077a55e9d11c4ebf6cd4bb 100644 (file)
--- a/src/mainboard/intel/d945gclf/romstage.c
+++ b/src/mainboard/intel/d945gclf/romstage.c
@@ -198,8 +198,6 @@ void main(unsigned long bist)
        early_superio_config_lpc47m15x();
 
        /* Set up the console */
-       uart_init();
-
        console_init();
 
        /* Halt if there was a built in self test failure */

diff --git a/src/mainboard/intel/eagleheights/romstage.c b/src/mainboard/intel/eagleheights/romstage.c
index aa884c3e38e3a85904c1de21a6844fb821688389..a250c05c6bf62d16db5fd23c3e34f59e41567ec2 100644 (file)
--- a/src/mainboard/intel/eagleheights/romstage.c
+++ b/src/mainboard/intel/eagleheights/romstage.c
@@ -145,7 +145,6 @@ void main(unsigned long bist)
        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 */

diff --git a/src/mainboard/intel/jarrell/romstage.c b/src/mainboard/intel/jarrell/romstage.c
index b8167758616007cd1739fdeef04f83779114388c..3eff0259687c7bf85ab587220fcd7692d6f74f12 100644 (file)
--- a/src/mainboard/intel/jarrell/romstage.c
+++ b/src/mainboard/intel/jarrell/romstage.c
@@ -63,7 +63,6 @@ static void main(unsigned long bist)
         /* 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 */

diff --git a/src/mainboard/intel/mtarvon/romstage.c b/src/mainboard/intel/mtarvon/romstage.c
index 23baced2881e0c8f02e28388b8f0286727a94dee..b2bba3a842d456fa7bdf2326483bd67d9cc8ef97 100644 (file)
--- a/src/mainboard/intel/mtarvon/romstage.c
+++ b/src/mainboard/intel/mtarvon/romstage.c
@@ -82,7 +82,6 @@ void main(unsigned long bist)
        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 */

diff --git a/src/mainboard/intel/truxton/romstage.c b/src/mainboard/intel/truxton/romstage.c
index af7d1bf2094db11dc348c056b587af08a2fcdad7..6672a409597398691d10d063f37cff3633aeb0f5 100644 (file)
--- a/src/mainboard/intel/truxton/romstage.c
+++ b/src/mainboard/intel/truxton/romstage.c
@@ -76,7 +76,6 @@ static void main(unsigned long bist)
        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 */

diff --git a/src/mainboard/intel/xe7501devkit/romstage.c b/src/mainboard/intel/xe7501devkit/romstage.c
index 953302f3e5106bb4d88d82705f60a3c84510d1bd..4e37811b46d9c49ea429484f52c0b7f6e5e0834a 100644 (file)
--- a/src/mainboard/intel/xe7501devkit/romstage.c
+++ b/src/mainboard/intel/xe7501devkit/romstage.c
@@ -53,7 +53,6 @@ static void main(unsigned long bist)
 
        // 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

diff --git a/src/mainboard/iwave/iWRainbowG6/romstage.c b/src/mainboard/iwave/iWRainbowG6/romstage.c
index 05a0d9f10b423f4fb0a41e2e77a70f10943a1c7c..833d9301c78923673f395f479aafa479e420a9ad 100644 (file)
--- a/src/mainboard/iwave/iWRainbowG6/romstage.c
+++ b/src/mainboard/iwave/iWRainbowG6/romstage.c
@@ -341,7 +341,6 @@ void main(unsigned long bist)
                enable_lapic();
 
        sch_enable_lpc();
-       uart_init();
        console_init();
 
        /* Halt if there was a built in self test failure */

diff --git a/src/mainboard/iwill/dk8_htx/romstage.c b/src/mainboard/iwill/dk8_htx/romstage.c
index f36fff08432d65a11470c362db5e459468e54be7..fc8f94bb4217fc2d043e9673a603e3d5978c2c26 100644 (file)
--- a/src/mainboard/iwill/dk8_htx/romstage.c
+++ b/src/mainboard/iwill/dk8_htx/romstage.c
@@ -101,7 +101,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
                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 */

diff --git a/src/mainboard/iwill/dk8s2/romstage.c b/src/mainboard/iwill/dk8s2/romstage.c
index dbe8313bb1e887f577999aa99ccd1b0b0c548d81..f95c69c3ea1b81f27e657da1086916c89672d6ab 100644 (file)
--- a/src/mainboard/iwill/dk8s2/romstage.c
+++ b/src/mainboard/iwill/dk8s2/romstage.c
@@ -102,7 +102,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
                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 */

diff --git a/src/mainboard/iwill/dk8x/romstage.c b/src/mainboard/iwill/dk8x/romstage.c
index dc043ae1424937d9351aeeddf545e6c6c97b7070..9cf8e9cde538bc2f8f1c28e89ef3649ac7e0bdfb 100644 (file)
--- a/src/mainboard/iwill/dk8x/romstage.c
+++ b/src/mainboard/iwill/dk8x/romstage.c
@@ -102,7 +102,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
                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 */

diff --git a/src/mainboard/jetway/j7f24/romstage.c b/src/mainboard/jetway/j7f24/romstage.c
index b4e4413e0f924d8c8f5de9b961dde212485cf031..899a604187595dbe4d7c6372cce3988eef3979c4 100644 (file)
--- a/src/mainboard/jetway/j7f24/romstage.c
+++ b/src/mainboard/jetway/j7f24/romstage.c
@@ -92,7 +92,6 @@ void main(unsigned long bist)
        pci_write_config8(ctrl.d0f0, 0x4f, 0x01);
 
        f71805f_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
-       uart_init();
        console_init();
 
        enable_smbus();

diff --git a/src/mainboard/jetway/pa78vm5/romstage.c b/src/mainboard/jetway/pa78vm5/romstage.c
index 3fd397255906d128d890d8ccd2f2744f165be5ab..4ffcadebec3c73d075d51c17fca3b74349bd4262 100644 (file)
--- a/src/mainboard/jetway/pa78vm5/romstage.c
+++ b/src/mainboard/jetway/pa78vm5/romstage.c
@@ -110,7 +110,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
        sb7xx_51xx_lpc_init();
 
        f71863fg_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
-       uart_init();
 
        console_init();
 

diff --git a/src/mainboard/kontron/986lcd-m/romstage.c b/src/mainboard/kontron/986lcd-m/romstage.c
index 2fdcb74f21bde65c3d4329f72d2ed8a2c59987c4..357adec08b87165daaabd35761f26d7098bf5075 100644 (file)
--- a/src/mainboard/kontron/986lcd-m/romstage.c
+++ b/src/mainboard/kontron/986lcd-m/romstage.c
@@ -335,8 +335,6 @@ void main(unsigned long bist)
        early_superio_config_w83627thg();
 
        /* Set up the console */
-       uart_init();
-
        console_init();
 
        /* Halt if there was a built in self test failure */

diff --git a/src/mainboard/kontron/kt690/romstage.c b/src/mainboard/kontron/kt690/romstage.c
index 16a077f8f26a485a8f10935aa05b1b3ab8a6e15b..0cd523a12a175588eddd8ac53d19855e37d417b5 100644 (file)
--- a/src/mainboard/kontron/kt690/romstage.c
+++ b/src/mainboard/kontron/kt690/romstage.c
@@ -94,7 +94,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
        sb600_lpc_init();
 
        w83627dhg_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
-       uart_init();
 
        console_init();
 

diff --git a/src/mainboard/lanner/em8510/romstage.c b/src/mainboard/lanner/em8510/romstage.c
index d5b29132f1c1faf3ec459a2119ee71749041521c..874e730ae392482e6f51f48fb7a8995b10dfc89b 100644 (file)
--- a/src/mainboard/lanner/em8510/romstage.c
+++ b/src/mainboard/lanner/em8510/romstage.c
@@ -59,7 +59,6 @@ void main(unsigned long bist)
        }
 
         w83627thg_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
-        uart_init();
         console_init();
 
        /* Halt if there was a built in self test failure */

diff --git a/src/mainboard/lenovo/t60/romstage.c b/src/mainboard/lenovo/t60/romstage.c
index ff266987403ebba4d1173152fdc66ee3bbb963b0..b659aa8025cb44b62f9afb31a745a297093e77c0 100644 (file)
--- a/src/mainboard/lenovo/t60/romstage.c
+++ b/src/mainboard/lenovo/t60/romstage.c
@@ -232,7 +232,6 @@ void main(unsigned long bist)
                dock_connect();
                early_superio_config();
                /* Set up the console */
-               uart_init();
        }
 
 #if CONFIG_USBDEBUG

diff --git a/src/mainboard/lenovo/x60/romstage.c b/src/mainboard/lenovo/x60/romstage.c
index 99540c9214dbc345489f2caca21cc4aead670509..9d01bf29ae9549c1db18b31c46bb3c411c9cb21c 100644 (file)
--- a/src/mainboard/lenovo/x60/romstage.c
+++ b/src/mainboard/lenovo/x60/romstage.c
@@ -239,7 +239,6 @@ void main(unsigned long bist)
                dock_connect();
                early_superio_config();
                /* Set up the console */
-               uart_init();
        }
 
        console_init();

diff --git a/src/mainboard/lippert/frontrunner/romstage.c b/src/mainboard/lippert/frontrunner/romstage.c
index 413b86aec4be7b308283c63c3913665671c97709..97172505ed7ec4a4861c283dd4179df67dcc4d2f 100644 (file)
--- a/src/mainboard/lippert/frontrunner/romstage.c
+++ b/src/mainboard/lippert/frontrunner/romstage.c
@@ -81,7 +81,6 @@ void main(unsigned long bist)
        msr_init();
 
        w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
-       uart_init();
        console_init();
 
        cs5535_early_setup();

diff --git a/src/mainboard/lippert/hurricane-lx/romstage.c b/src/mainboard/lippert/hurricane-lx/romstage.c
index 50b49cb376a35b848d64e4e97b81d2d3044166d9..fe007310ae966c503582f871e4d7c9cac0390d27 100644 (file)
--- a/src/mainboard/lippert/hurricane-lx/romstage.c
+++ b/src/mainboard/lippert/hurricane-lx/romstage.c
@@ -133,7 +133,6 @@ void main(unsigned long bist)
         */
        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 @@ void main(unsigned long bist)
        sdram_initialize(1, memctrl);
 
        /* Memory is setup. Return to cache_as_ram.inc and continue to boot. */
-       return;
 }

diff --git a/src/mainboard/lippert/literunner-lx/romstage.c b/src/mainboard/lippert/literunner-lx/romstage.c
index 31720f4eb7fc10998f89ec641f08fe09a0c7fba2..1245a4319c9ff209520efa695934d6b1373fbd3f 100644 (file)
--- a/src/mainboard/lippert/literunner-lx/romstage.c
+++ b/src/mainboard/lippert/literunner-lx/romstage.c
@@ -176,7 +176,6 @@ void main(unsigned long bist)
         */
        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 @@ void main(unsigned long bist)
        sdram_initialize(1, memctrl);
 
        /* Memory is setup. Return to cache_as_ram.inc and continue to boot. */
-       return;
 }

diff --git a/src/mainboard/lippert/roadrunner-lx/romstage.c b/src/mainboard/lippert/roadrunner-lx/romstage.c
index 94eb2856517961f251dada1825129a30855a14d7..87718b5a1f12e705261dc3eef312b1b8c170a6a4 100644 (file)
--- a/src/mainboard/lippert/roadrunner-lx/romstage.c
+++ b/src/mainboard/lippert/roadrunner-lx/romstage.c
@@ -108,7 +108,6 @@ void main(unsigned long bist)
         */
        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 @@ void main(unsigned long bist)
        sdram_initialize(1, memctrl);
 
        /* Memory is setup. Return to cache_as_ram.inc and continue to boot. */
-       return;
 }

diff --git a/src/mainboard/lippert/spacerunner-lx/romstage.c b/src/mainboard/lippert/spacerunner-lx/romstage.c
index bb104e203d7a145a4a0d294f54e3409c140d3389..299079c85246c048e48caa5c27935a79ccc32053 100644 (file)
--- a/src/mainboard/lippert/spacerunner-lx/romstage.c
+++ b/src/mainboard/lippert/spacerunner-lx/romstage.c
@@ -173,7 +173,6 @@ void main(unsigned long bist)
         */
        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 */

diff --git a/src/mainboard/mitac/6513wu/romstage.c b/src/mainboard/mitac/6513wu/romstage.c
index ab8a9c7af55036f2d9b174579e64d6c311cd6944..d93813f594648cf48fa31bc260663b3ab167fc30 100644 (file)
--- a/src/mainboard/mitac/6513wu/romstage.c
+++ b/src/mainboard/mitac/6513wu/romstage.c
@@ -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);

diff --git a/src/mainboard/msi/ms6119/romstage.c b/src/mainboard/msi/ms6119/romstage.c
index 5ee54e298a39160e524a4ce06e44e25847f1ef8e..fba259342ccc2e74804d445fd02c336cc0c3f1c2 100644 (file)
--- a/src/mainboard/msi/ms6119/romstage.c
+++ b/src/mainboard/msi/ms6119/romstage.c
@@ -44,7 +44,6 @@ int spd_read_byte(unsigned int device, unsigned int address)
 void main(unsigned long bist)
 {
        w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
-       uart_init();
        console_init();
        report_bist_failure(bist);
 

diff --git a/src/mainboard/msi/ms6147/romstage.c b/src/mainboard/msi/ms6147/romstage.c
index f79c49af27b18ed16f2245cfedb136f395f7c3b9..c06574db6923b703b1573a6c834da4a952be45b7 100644 (file)
--- a/src/mainboard/msi/ms6147/romstage.c
+++ b/src/mainboard/msi/ms6147/romstage.c
@@ -44,7 +44,6 @@ int spd_read_byte(unsigned int device, unsigned int address)
 void main(unsigned long bist)
 {
        w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
-       uart_init();
        console_init();
        report_bist_failure(bist);
 

diff --git a/src/mainboard/msi/ms6156/romstage.c b/src/mainboard/msi/ms6156/romstage.c
index cc546128d18a4aecb44c4cb5be92d2f1f613877c..8d7f4e8f8ec2287ccc7b42b2dd7d489aa6ce8cf1 100644 (file)
--- a/src/mainboard/msi/ms6156/romstage.c
+++ b/src/mainboard/msi/ms6156/romstage.c
@@ -44,7 +44,6 @@ int spd_read_byte(unsigned int device, unsigned int address)
 void main(unsigned long bist)
 {
        w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
-       uart_init();
        console_init();
        report_bist_failure(bist);
 

diff --git a/src/mainboard/msi/ms6178/romstage.c b/src/mainboard/msi/ms6178/romstage.c
index e887a37fa0eec1c0a407e79169f157add346b0df..d3284b70ba723ca53d76bac4f0607b390ba49b13 100644 (file)
--- a/src/mainboard/msi/ms6178/romstage.c
+++ b/src/mainboard/msi/ms6178/romstage.c
@@ -40,7 +40,6 @@ void main(unsigned long bist)
        w83627hf_set_clksel_48(DUMMY_DEV);
        w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
 
-       uart_init();
        console_init();
        enable_smbus();
        report_bist_failure(bist);

diff --git a/src/mainboard/msi/ms7135/romstage.c b/src/mainboard/msi/ms7135/romstage.c
index 617dd8079a254a424c6cee6122cc4aa6e1370927..8609142f1876095dd29eb63ad85ebbe6488462f9 100644 (file)
--- a/src/mainboard/msi/ms7135/romstage.c
+++ b/src/mainboard/msi/ms7135/romstage.c
@@ -107,7 +107,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
                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 */

diff --git a/src/mainboard/msi/ms7260/romstage.c b/src/mainboard/msi/ms7260/romstage.c
index a9eb2736aafb0be8c854f70ae4244106aacc5d36..b587303f56c8a0b58213b84b9fc5b853af033c5a 100644 (file)
--- a/src/mainboard/msi/ms7260/romstage.c
+++ b/src/mainboard/msi/ms7260/romstage.c
@@ -137,9 +137,8 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
        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=");

diff --git a/src/mainboard/msi/ms9185/romstage.c b/src/mainboard/msi/ms9185/romstage.c
index 748b2ad983603a1c321bb1c8f48a3401fde8d071..a2505d6eaeb72eb787e487f12734df50bd2d61aa 100644 (file)
--- a/src/mainboard/msi/ms9185/romstage.c
+++ b/src/mainboard/msi/ms9185/romstage.c
@@ -123,7 +123,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
                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);

diff --git a/src/mainboard/msi/ms9282/romstage.c b/src/mainboard/msi/ms9282/romstage.c
index 0b7b634cc246b2ab71402414dc6df96c2ffee85a..e73e5d71f7335781efee7558c4005f9f689a7618 100644 (file)
--- a/src/mainboard/msi/ms9282/romstage.c
+++ b/src/mainboard/msi/ms9282/romstage.c
@@ -145,7 +145,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
         }
 
        w83627ehg_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
-       uart_init();
        console_init();
 
        /* Halt if there was a built in self test failure */

diff --git a/src/mainboard/msi/ms9652_fam10/romstage.c b/src/mainboard/msi/ms9652_fam10/romstage.c
index d6101a734f89d9ed6c804154c4b36bea75416eb8..2add54b1a399df2d9fc045951e246f17585cb3a4 100644 (file)
--- a/src/mainboard/msi/ms9652_fam10/romstage.c
+++ b/src/mainboard/msi/ms9652_fam10/romstage.c
@@ -136,7 +136,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
        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 */

diff --git a/src/mainboard/nec/powermate2000/romstage.c b/src/mainboard/nec/powermate2000/romstage.c
index d069741184f9b9a5f3f0c8633bb38b6241c0712d..a6ffa6fe2080d5ee016a5515b3a7d31cbb26c762 100644 (file)
--- a/src/mainboard/nec/powermate2000/romstage.c
+++ b/src/mainboard/nec/powermate2000/romstage.c
@@ -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);

diff --git a/src/mainboard/newisys/khepri/romstage.c b/src/mainboard/newisys/khepri/romstage.c
index 20dd36340925cb7298ed4afcf9ac9f8c2f519a36..c20d9fd9ef4ced005bdca26f12a571fd7300678e 100644 (file)
--- a/src/mainboard/newisys/khepri/romstage.c
+++ b/src/mainboard/newisys/khepri/romstage.c
@@ -96,7 +96,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
                 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);

diff --git a/src/mainboard/nokia/ip530/romstage.c b/src/mainboard/nokia/ip530/romstage.c
index 671c5bb4e5a31a750307ef87eaa513942f1d0e53..5f5b116429a69ea0c82ec6db86eb8ec57217d57d 100644 (file)
--- a/src/mainboard/nokia/ip530/romstage.c
+++ b/src/mainboard/nokia/ip530/romstage.c
@@ -44,7 +44,6 @@ int spd_read_byte(unsigned int device, unsigned int address)
 void main(unsigned long bist)
 {
        smscsuperio_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
-       uart_init();
        console_init();
        report_bist_failure(bist);
 

diff --git a/src/mainboard/nvidia/l1_2pvv/romstage.c b/src/mainboard/nvidia/l1_2pvv/romstage.c
index 62ebfb8087dfa774e93336990ef10f01a9d89b08..ef329d32718d704b759c3b58edc618d3f974146b 100644 (file)
--- a/src/mainboard/nvidia/l1_2pvv/romstage.c
+++ b/src/mainboard/nvidia/l1_2pvv/romstage.c
@@ -135,12 +135,10 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 
        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");

diff --git a/src/mainboard/pcengines/alix1c/romstage.c b/src/mainboard/pcengines/alix1c/romstage.c
index 9806ff42737e02fa36c912064bdd53ac90cd0164..7e025a88b3eecfd96dd71be2db0f7f9df5510ab3 100644 (file)
--- a/src/mainboard/pcengines/alix1c/romstage.c
+++ b/src/mainboard/pcengines/alix1c/romstage.c
@@ -127,7 +127,6 @@ void main(unsigned long bist)
         */
        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 */

diff --git a/src/mainboard/pcengines/alix2d/romstage.c b/src/mainboard/pcengines/alix2d/romstage.c
index 308066dca825ff85345af20f3dca6cc6f19ba962..6ced8f279eb4a026c5be2b9a32b450c95d85f48b 100644 (file)
--- a/src/mainboard/pcengines/alix2d/romstage.c
+++ b/src/mainboard/pcengines/alix2d/romstage.c
@@ -151,7 +151,6 @@ void main(unsigned long bist)
         */
        cs5536_setup_onchipuart(1);
        mb_gpio_init();
-       uart_init();
        console_init();
 
        /* Halt if there was a built in self test failure */

diff --git a/src/mainboard/rca/rm4100/romstage.c b/src/mainboard/rca/rm4100/romstage.c
index ba9a606c57d3a69f18ec8498ca55bad98c5f7d41..415e2ac8b869050ccf7ee7ca5bfc01fb9dad2965 100644 (file)
--- a/src/mainboard/rca/rm4100/romstage.c
+++ b/src/mainboard/rca/rm4100/romstage.c
@@ -107,7 +107,6 @@ void main(unsigned long bist)
        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. */

diff --git a/src/mainboard/roda/rk886ex/romstage.c b/src/mainboard/roda/rk886ex/romstage.c
index ec8c4996d488ff64b727a3f5ca0de1148f8f4731..158e47c295ba20c2b8d0a3ff10297ee3dbcf5106 100644 (file)
--- a/src/mainboard/roda/rk886ex/romstage.c
+++ b/src/mainboard/roda/rk886ex/romstage.c
@@ -270,8 +270,6 @@ void main(unsigned long bist)
        early_superio_config();
 
        /* Set up the console */
-       uart_init();
-
        console_init();
 
        /* Halt if there was a built in self test failure */

diff --git a/src/mainboard/soyo/sy-6ba-plus-iii/romstage.c b/src/mainboard/soyo/sy-6ba-plus-iii/romstage.c
index 0763a9a901d54ba7d1538845ce7f2d1d890c2b14..49499ea1115bbda38b34fbd978490119c97ef302 100644 (file)
--- a/src/mainboard/soyo/sy-6ba-plus-iii/romstage.c
+++ b/src/mainboard/soyo/sy-6ba-plus-iii/romstage.c
@@ -45,7 +45,6 @@ int spd_read_byte(unsigned int device, unsigned int address)
 void main(unsigned long bist)
 {
        it8671f_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
-       uart_init();
        console_init();
        report_bist_failure(bist);
 

diff --git a/src/mainboard/sunw/ultra40/romstage.c b/src/mainboard/sunw/ultra40/romstage.c
index 8e26beb54cebd9bf65dfba3f7ec70371cd8b3d4a..0bc8de2f1848fd890ed0cef9fbdeede6d926f344 100644 (file)
--- a/src/mainboard/sunw/ultra40/romstage.c
+++ b/src/mainboard/sunw/ultra40/romstage.c
@@ -119,7 +119,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
                 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 */

diff --git a/src/mainboard/supermicro/h8dme/romstage.c b/src/mainboard/supermicro/h8dme/romstage.c
index fe5aa812c06945c0cf034f855dd98a274b83ab97..2cdc4c943eefeb666a8b3ab35cad4fdaf52a6dcb 100644 (file)
--- a/src/mainboard/supermicro/h8dme/romstage.c
+++ b/src/mainboard/supermicro/h8dme/romstage.c
@@ -197,7 +197,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
        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 */

diff --git a/src/mainboard/supermicro/h8dmr/romstage.c b/src/mainboard/supermicro/h8dmr/romstage.c
index 7eeb7f8639dba0e42b3928b95a52172cc260c7d4..38aef5ea4fbbe4e322fcdc21dc0c31954fad05db 100644 (file)
--- a/src/mainboard/supermicro/h8dmr/romstage.c
+++ b/src/mainboard/supermicro/h8dmr/romstage.c
@@ -126,7 +126,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
        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 */

diff --git a/src/mainboard/supermicro/h8dmr_fam10/romstage.c b/src/mainboard/supermicro/h8dmr_fam10/romstage.c
index 50ad6a0584ffbce57c563152d2aeecf2fea2e116..c9fb928a6df32364d70e583b2f3b91fa52ad94ae 100644 (file)
--- a/src/mainboard/supermicro/h8dmr_fam10/romstage.c
+++ b/src/mainboard/supermicro/h8dmr_fam10/romstage.c
@@ -133,9 +133,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
        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);

diff --git a/src/mainboard/supermicro/h8qme_fam10/romstage.c b/src/mainboard/supermicro/h8qme_fam10/romstage.c
index dbef8e9e106ce037130fc03dc5b5fe74d9a64f44..870125dd1fe2c3f70d0d000220e7d520434543fc 100644 (file)
--- a/src/mainboard/supermicro/h8qme_fam10/romstage.c
+++ b/src/mainboard/supermicro/h8qme_fam10/romstage.c
@@ -184,7 +184,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
        w83627hf_set_clksel_48(DUMMY_DEV);
        w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
 
-       uart_init();
        console_init();
        write_GPIO();
        printk(BIOS_DEBUG, "\n");

diff --git a/src/mainboard/supermicro/h8scm_fam10/romstage.c b/src/mainboard/supermicro/h8scm_fam10/romstage.c
index f34f8342ad0bd4d36b31fe07cde92771e7537db0..8101d2fad2e1368508986561d12680d52d1d6e8b 100644 (file)
--- a/src/mainboard/supermicro/h8scm_fam10/romstage.c
+++ b/src/mainboard/supermicro/h8scm_fam10/romstage.c
@@ -123,7 +123,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
        wpcm450_enable_dev(WPCM450_SP1, 0x164E, CONFIG_TTYS0_BASE);
 
        sb7xx_51xx_disable_wideio(0);
-       uart_init();
 
        console_init();
 

diff --git a/src/mainboard/supermicro/x6dai_g/romstage.c b/src/mainboard/supermicro/x6dai_g/romstage.c
index 87992cc6e579ecfc971f53123186d3e8dd6418d6..830be38d8875f52f54f3e47dfb28cf15f615197f 100644 (file)
--- a/src/mainboard/supermicro/x6dai_g/romstage.c
+++ b/src/mainboard/supermicro/x6dai_g/romstage.c
@@ -66,7 +66,6 @@ static void main(unsigned long bist)
 
        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 !!! */

diff --git a/src/mainboard/supermicro/x6dhe_g/romstage.c b/src/mainboard/supermicro/x6dhe_g/romstage.c
index 2fb9f229e369c37bd5ce2b553da7d46d444fb6c9..b6c6c1d443106d8ba73feb936cddd76de7ce8ab0 100644 (file)
--- a/src/mainboard/supermicro/x6dhe_g/romstage.c
+++ b/src/mainboard/supermicro/x6dhe_g/romstage.c
@@ -66,7 +66,6 @@ static void main(unsigned long bist)
 
        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 */

diff --git a/src/mainboard/supermicro/x6dhe_g2/romstage.c b/src/mainboard/supermicro/x6dhe_g2/romstage.c
index 177abb4aff1b76256d23d29fa8029b34ba25b758..d86d83d36afab96fbf661cbf07dcb69f20096d8d 100644 (file)
--- a/src/mainboard/supermicro/x6dhe_g2/romstage.c
+++ b/src/mainboard/supermicro/x6dhe_g2/romstage.c
@@ -66,7 +66,6 @@ static void main(unsigned long bist)
        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 */

diff --git a/src/mainboard/supermicro/x6dhr_ig/romstage.c b/src/mainboard/supermicro/x6dhr_ig/romstage.c
index e85ea5ab18014b634f80e7beddc53ac319dc186f..e77fe7bad53664fcc576abfa38b13b5e5b0c9d6e 100644 (file)
--- a/src/mainboard/supermicro/x6dhr_ig/romstage.c
+++ b/src/mainboard/supermicro/x6dhr_ig/romstage.c
@@ -65,7 +65,6 @@ static void main(unsigned long bist)
 
        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 */

diff --git a/src/mainboard/technexion/tim5690/romstage.c b/src/mainboard/technexion/tim5690/romstage.c
index 4af8f6ad5d10fb39b1448a4f630cf9d490d4c1c2..515a1b8f2e676dc035eb9a4dab39af2cabcedace 100644 (file)
--- a/src/mainboard/technexion/tim5690/romstage.c
+++ b/src/mainboard/technexion/tim5690/romstage.c
@@ -98,7 +98,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
        /* it8712f_enable_serial does not use its 1st parameter. */
        it8712f_enable_serial(0, CONFIG_TTYS0_BASE);
        it8712f_kill_watchdog();
-       uart_init();
 
        console_init();
 

diff --git a/src/mainboard/technexion/tim8690/romstage.c b/src/mainboard/technexion/tim8690/romstage.c
index 0953d4c326442850def8911672be8dfa298da059..eb6eca7f2e1e97a22ae1edf31b963c57efef26d8 100644 (file)
--- a/src/mainboard/technexion/tim8690/romstage.c
+++ b/src/mainboard/technexion/tim8690/romstage.c
@@ -93,7 +93,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
        /* it8712f_enable_serial does not use its 1st parameter. */
        it8712f_enable_serial(0, CONFIG_TTYS0_BASE);
        it8712f_kill_watchdog();
-       uart_init();
 
        console_init();
 

diff --git a/src/mainboard/technologic/ts5300/romstage.c b/src/mainboard/technologic/ts5300/romstage.c
index ff296ec23ecca25f94b6b58487ed862c09a07aec..b9b2f1772bcd3990f9bc79992340d6c5a732fc5e 100644 (file)
--- a/src/mainboard/technologic/ts5300/romstage.c
+++ b/src/mainboard/technologic/ts5300/romstage.c
@@ -149,7 +149,6 @@ static void main(unsigned long bist)
                ;
 
         setupsc520();
-        uart_init();
         console_init();
 
 

diff --git a/src/mainboard/televideo/tc7020/romstage.c b/src/mainboard/televideo/tc7020/romstage.c
index e375d5119cb845e2823cde1900095ecd0e907a8b..5d237e28bf1d9c5f4dbd778ceb30475ffb3eb40d 100644 (file)
--- a/src/mainboard/televideo/tc7020/romstage.c
+++ b/src/mainboard/televideo/tc7020/romstage.c
@@ -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();

diff --git a/src/mainboard/thomson/ip1000/romstage.c b/src/mainboard/thomson/ip1000/romstage.c
index e1bdf781bbce1dd11181306e689fa048452d439a..e85de94858b0c0602da037e68c51b15f97dcdec6 100644 (file)
--- a/src/mainboard/thomson/ip1000/romstage.c
+++ b/src/mainboard/thomson/ip1000/romstage.c
@@ -106,7 +106,6 @@ void main(unsigned long bist)
        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. */

diff --git a/src/mainboard/traverse/geos/romstage.c b/src/mainboard/traverse/geos/romstage.c
index 44623db5051b64df03a0d22a25b361027aa399a7..80a95579d1a00288b300147cae226cee95da5d2e 100644 (file)
--- a/src/mainboard/traverse/geos/romstage.c
+++ b/src/mainboard/traverse/geos/romstage.c
@@ -70,7 +70,6 @@ void main(unsigned long bist)
         */
        /* 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 */

diff --git a/src/mainboard/tyan/s1846/romstage.c b/src/mainboard/tyan/s1846/romstage.c
index bf2debc4a21edcf51e5e267ee62b42e34f5e2bff..ecbf902901faf5eb248e179e4cb28952efa58164 100644 (file)
--- a/src/mainboard/tyan/s1846/romstage.c
+++ b/src/mainboard/tyan/s1846/romstage.c
@@ -44,7 +44,6 @@ int spd_read_byte(unsigned int device, unsigned int address)
 void main(unsigned long bist)
 {
        pc87309_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
-       uart_init();
        console_init();
        report_bist_failure(bist);
 

diff --git a/src/mainboard/tyan/s2735/romstage.c b/src/mainboard/tyan/s2735/romstage.c
index 98676df05748f39bb731e85f4a6cb5e7735b3b5c..2bbbf341b72765619c7cf52e981afb4e5da36eb3 100644 (file)
--- a/src/mainboard/tyan/s2735/romstage.c
+++ b/src/mainboard/tyan/s2735/romstage.c
@@ -49,7 +49,6 @@ void main(unsigned long bist)
                enable_lapic();
 
        w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
-        uart_init();
         console_init();
 
        /* Halt if there was a built in self test failure */

diff --git a/src/mainboard/tyan/s2850/romstage.c b/src/mainboard/tyan/s2850/romstage.c
index 8efa54276af1fa8208a7ebf286749283872a9b8a..c87fcb5ffbb9f064c4a3f67126223dfeaa04d349 100644 (file)
--- a/src/mainboard/tyan/s2850/romstage.c
+++ b/src/mainboard/tyan/s2850/romstage.c
@@ -89,7 +89,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 //     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 */

diff --git a/src/mainboard/tyan/s2875/romstage.c b/src/mainboard/tyan/s2875/romstage.c
index 9f8be3bfa5034f420dfa665f110c2145d8800327..435b90ed6109fd235f3fdca9fd3d320246675596 100644 (file)
--- a/src/mainboard/tyan/s2875/romstage.c
+++ b/src/mainboard/tyan/s2875/romstage.c
@@ -98,7 +98,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
                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 */

diff --git a/src/mainboard/tyan/s2880/romstage.c b/src/mainboard/tyan/s2880/romstage.c
index c1ce4125842bb230b5cfde159f4c86d8b5daec98..a394826daeca43ab857b6c9e796dfc6660a8876d 100644 (file)
--- a/src/mainboard/tyan/s2880/romstage.c
+++ b/src/mainboard/tyan/s2880/romstage.c
@@ -98,7 +98,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
                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 */

diff --git a/src/mainboard/tyan/s2881/romstage.c b/src/mainboard/tyan/s2881/romstage.c
index 163ae26746575a3197a9b47718f72d166547e291..3e2426d55fee771c1c8362932b162aedc6175560 100644 (file)
--- a/src/mainboard/tyan/s2881/romstage.c
+++ b/src/mainboard/tyan/s2881/romstage.c
@@ -87,7 +87,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 //     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 */

diff --git a/src/mainboard/tyan/s2882/romstage.c b/src/mainboard/tyan/s2882/romstage.c
index c1ce4125842bb230b5cfde159f4c86d8b5daec98..a394826daeca43ab857b6c9e796dfc6660a8876d 100644 (file)
--- a/src/mainboard/tyan/s2882/romstage.c
+++ b/src/mainboard/tyan/s2882/romstage.c
@@ -98,7 +98,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
                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 */

diff --git a/src/mainboard/tyan/s2885/romstage.c b/src/mainboard/tyan/s2885/romstage.c
index 80f02db8917543b44155d6edb947ff68850ea4c9..41743ae0c43a4563ae3404a429759242a530bda7 100644 (file)
--- a/src/mainboard/tyan/s2885/romstage.c
+++ b/src/mainboard/tyan/s2885/romstage.c
@@ -85,7 +85,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
                 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);

diff --git a/src/mainboard/tyan/s2891/romstage.c b/src/mainboard/tyan/s2891/romstage.c
index 67dea33fcc5549d6720e1614d4f0ed69d249cdd5..8cdeb85494792940f8e10ae9b6a054bb3bbfc0db 100644 (file)
--- a/src/mainboard/tyan/s2891/romstage.c
+++ b/src/mainboard/tyan/s2891/romstage.c
@@ -99,7 +99,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 //     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 */

diff --git a/src/mainboard/tyan/s2892/romstage.c b/src/mainboard/tyan/s2892/romstage.c
index a03f6c0573a23203c938fbf9a9e7d54d98421608..2b2d6fa5d5c72184ac8a6a7a19fae705faa1f431 100644 (file)
--- a/src/mainboard/tyan/s2892/romstage.c
+++ b/src/mainboard/tyan/s2892/romstage.c
@@ -94,7 +94,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 //     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 */

diff --git a/src/mainboard/tyan/s2895/romstage.c b/src/mainboard/tyan/s2895/romstage.c
index bede83755e4dbd35509720f65efe0a6e4cec3843..db777be3fafa0b0616ea23becade16051cf4dbe8 100644 (file)
--- a/src/mainboard/tyan/s2895/romstage.c
+++ b/src/mainboard/tyan/s2895/romstage.c
@@ -120,7 +120,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
                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 */

diff --git a/src/mainboard/tyan/s2912/romstage.c b/src/mainboard/tyan/s2912/romstage.c
index eae4428c49c75706e25b09f37d6dab6de2f736b9..52a100c7dffe4af10be468e3294ae3f3cf268445 100644 (file)
--- a/src/mainboard/tyan/s2912/romstage.c
+++ b/src/mainboard/tyan/s2912/romstage.c
@@ -131,12 +131,12 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 
        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");

diff --git a/src/mainboard/tyan/s2912_fam10/romstage.c b/src/mainboard/tyan/s2912_fam10/romstage.c
index 3699d097770bd6d24e3807fb3bfd2ea6dc0ba2fc..3a220eda197aaa1464faf1350d35d30295dc3c04 100644 (file)
--- a/src/mainboard/tyan/s2912_fam10/romstage.c
+++ b/src/mainboard/tyan/s2912_fam10/romstage.c
@@ -136,7 +136,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
        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 */

diff --git a/src/mainboard/tyan/s4880/romstage.c b/src/mainboard/tyan/s4880/romstage.c
index 737378d3584acc912fa2985a4ac2db540882f4e2..892834ba033e19c5396dd6df2f9c538f16b5424b 100644 (file)
--- a/src/mainboard/tyan/s4880/romstage.c
+++ b/src/mainboard/tyan/s4880/romstage.c
@@ -145,7 +145,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
                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 */

diff --git a/src/mainboard/tyan/s4882/romstage.c b/src/mainboard/tyan/s4882/romstage.c
index bbb0ec4668a09901a6a5f963749c89deb15211f7..2aa4ee5b38c0054bd40ccba597cceb49aba27d0a 100644 (file)
--- a/src/mainboard/tyan/s4882/romstage.c
+++ b/src/mainboard/tyan/s4882/romstage.c
@@ -124,7 +124,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
                 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 */

diff --git a/src/mainboard/via/epia-cn/romstage.c b/src/mainboard/via/epia-cn/romstage.c
index 66b607b9083f613d8d161c2fbfe663fabf90d7f0..00958f0ab32e8843a87fa76de7664bc2712b7694 100644 (file)
--- a/src/mainboard/via/epia-cn/romstage.c
+++ b/src/mainboard/via/epia-cn/romstage.c
@@ -86,7 +86,6 @@ void main(unsigned long bist)
        pci_write_config8(ctrl.d0f0, 0x4f, 0x01);
 
        enable_vt8235_serial();
-       uart_init();
        console_init();
        enable_smbus();
        smbus_fixup(&ctrl);

diff --git a/src/mainboard/via/epia-m/romstage.c b/src/mainboard/via/epia-m/romstage.c
index b22719cedc3331823f6a8edde50795e84ec80c93..f47bbca34ba9afbde4e22c0e0f2afada0e067d8e 100644 (file)
--- a/src/mainboard/via/epia-m/romstage.c
+++ b/src/mainboard/via/epia-m/romstage.c
@@ -84,7 +84,6 @@ static void main(unsigned long bist)
                pci_write_config8(dev, 0x15, 0x1c);
 
        enable_vt8235_serial();
-       uart_init();
        console_init();
 
        enable_smbus();

diff --git a/src/mainboard/via/epia-m700/romstage.c b/src/mainboard/via/epia-m700/romstage.c
index 84d40350867053156b0a956638042124b682a565..5517cc9372d6f18cf85c01da1c34631e695d7ccf 100644 (file)
--- a/src/mainboard/via/epia-m700/romstage.c
+++ b/src/mainboard/via/epia-m700/romstage.c
@@ -387,9 +387,7 @@ void main(unsigned long bist)
        /* EmbedComInit(); */
        w83697hf_set_clksel_48(DUMMY_DEV);
        w83697hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
-       uart_init();
        /* enable_vx800_serial(); */
-       /* uart_init(); */
 
        /*
         * 1. D15F0

diff --git a/src/mainboard/via/epia-n/romstage.c b/src/mainboard/via/epia-n/romstage.c
index e12bdb3d095605bdecfd98ad03d6de40d4ca9f54..9aacd9810acfbf25d2585f0dc4fcd0c2247c71d3 100644 (file)
--- a/src/mainboard/via/epia-n/romstage.c
+++ b/src/mainboard/via/epia-n/romstage.c
@@ -112,7 +112,6 @@ static void main(unsigned long bist)
 
        w83697hf_set_clksel_48(DUMMY_DEV);
        w83697hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
-       uart_init();
        console_init();
 
        enable_smbus();

diff --git a/src/mainboard/via/epia/romstage.c b/src/mainboard/via/epia/romstage.c
index 9d9a3f9a9a7d4f530b5aac117c32ce8727126b79..7c604c10cd474d37474f544dd794a8d78e7c9579 100644 (file)
--- a/src/mainboard/via/epia/romstage.c
+++ b/src/mainboard/via/epia/romstage.c
@@ -76,7 +76,6 @@ static void main(unsigned long bist)
                early_mtrr_init();
 
        enable_vt8231_serial();
-       uart_init();
        console_init();
 
        /* Halt if there was a built in self test failure */

diff --git a/src/mainboard/via/pc2500e/romstage.c b/src/mainboard/via/pc2500e/romstage.c
index caaa171dd30acabfa7af1e2f450ecc31bd319277..ff85c853a5f86acba1fa1bfccd37da58b71ecb18 100644 (file)
--- a/src/mainboard/via/pc2500e/romstage.c
+++ b/src/mainboard/via/pc2500e/romstage.c
@@ -61,7 +61,6 @@ void main(unsigned long bist)
        pci_write_config8(ctrl.d0f0, 0x4f, 0x01);
 
        it8716f_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
-       uart_init();
        console_init();
        enable_smbus();
        smbus_fixup(&ctrl);

diff --git a/src/mainboard/via/vt8454c/romstage.c b/src/mainboard/via/vt8454c/romstage.c
index 9a6a6ca25b7e173db05eba98a921c5f3ba368bd4..739292593ea6eb212bb0d4ea7b0882a8e26891e5 100644 (file)
--- a/src/mainboard/via/vt8454c/romstage.c
+++ b/src/mainboard/via/vt8454c/romstage.c
@@ -96,7 +96,6 @@ void main(unsigned long bist)
        enable_smbus();
 
        enable_cx700_serial();
-       uart_init();
        console_init();
 
        /* Halt if there was a built in self test failure */

diff --git a/src/mainboard/winent/pl6064/romstage.c b/src/mainboard/winent/pl6064/romstage.c
index a3c92346d9d50a56a17d2f5e429c44b7da946002..a8b684e5a37611d614686b7bbacb5e2fb766e6e2 100644 (file)
--- a/src/mainboard/winent/pl6064/romstage.c
+++ b/src/mainboard/winent/pl6064/romstage.c
@@ -72,7 +72,6 @@ void main(unsigned long bist)
         */
        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 @@ void main(unsigned long bist)
        sdram_initialize(1, memctrl);
 
        /* Memory is setup. Return to cache_as_ram.inc and continue to boot. */
-       return;
 }

diff --git a/src/mainboard/wyse/s50/romstage.c b/src/mainboard/wyse/s50/romstage.c
index a5feddb56c91685e3d34c68ab714a8b895369f7d..d80e2d59350030653998574319b5508b2fad0111 100644 (file)
--- a/src/mainboard/wyse/s50/romstage.c
+++ b/src/mainboard/wyse/s50/romstage.c
@@ -62,7 +62,6 @@ void main(unsigned long bist)
        /* 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 */