Remove pc80/serial.c includes in ROMCC boards and include

[coreboot.git] / src / mainboard / hp / e_vectra_p2706t / romstage.c

diff --git a/src/mainboard/hp/e_vectra_p2706t/romstage.c b/src/mainboard/hp/e_vectra_p2706t/romstage.c
index f2c643c8540fff8c898e2446986ce86129041cff..50f59df2bac39ef72f3f2274689df5ee469788bf 100644 (file)
--- a/src/mainboard/hp/e_vectra_p2706t/romstage.c
+++ b/src/mainboard/hp/e_vectra_p2706t/romstage.c
@@ -18,9 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define ASSEMBLY 1
-#define __PRE_RAM__
-
 #include <stdint.h>
 #include <device/pci_def.h>
 #include <arch/io.h>
@@ -28,8 +25,7 @@
 #include <arch/romcc_io.h>
 #include <arch/hlt.h>
 #include <stdlib.h>
-#include "pc80/serial.c"
-#include "arch/i386/lib/console.c"
+#include <console/console.h>
 #include "lib/ramtest.c"
 /* TODO: It's a PC87364 actually! */
 #include "superio/nsc/pc87360/pc87360_early_serial.c"
@@ -66,3 +62,4 @@ static void main(unsigned long bist)
        sdram_enable();
        /* ram_check(0, 640 * 1024); */
 }
+