From b14620812f8af7a2f9e5f740e2ae047b321d3197 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 17 Jan 2010 19:22:36 +0100
Subject: [PATCH] Enable serial on all i386.rmk

---
 conf/i386-coreboot.rmk | 8 +-------
 conf/i386-pc.rmk       | 7 +------
 conf/i386.rmk          | 6 ++++++
 term/i386/pc/serial.c  | 3 +--
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index 2c1174459..2e835e814 100644
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -102,7 +102,7 @@ bin_SCRIPTS += grub-mkrescue
 grub_mkrescue_SOURCES = util/grub-mkrescue.in
 
 # Modules.
-pkglib_MODULES = play.mod serial.mod		\
+pkglib_MODULES = play.mod		\
 	memdisk.mod pci.mod lspci.mod reboot.mod	\
 	halt.mod datetime.mod date.mod datehook.mod	\
 	lsmmap.mod mmap.mod
@@ -129,12 +129,6 @@ halt_mod_SOURCES = commands/halt.c
 halt_mod_CFLAGS = $(COMMON_CFLAGS)
 halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For serial.mod.
-serial_mod_SOURCES = term/i386/pc/serial.c
-serial_mod_CFLAGS = $(COMMON_CFLAGS)
-serial_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-
 # For play.mod.
 play_mod_SOURCES = commands/i386/pc/play.c
 play_mod_CFLAGS = $(COMMON_CFLAGS)
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 8de04e283..24d7a7cf2 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -117,7 +117,7 @@ grub_mkrescue_SOURCES = util/grub-mkrescue.in
 
 pkglib_MODULES = biosdisk.mod chain.mod 				\
 	reboot.mod halt.mod				\
-	vbe.mod vbetest.mod vbeinfo.mod play.mod serial.mod		\
+	vbe.mod vbetest.mod vbeinfo.mod play.mod 		\
 	vga.mod memdisk.mod pci.mod lspci.mod				\
 	pxe.mod pxecmd.mod datetime.mod date.mod 	\
 	datehook.mod lsmmap.mod ata_pthru.mod hdparm.mod 		\
@@ -191,11 +191,6 @@ halt_mod_SOURCES = commands/i386/pc/halt.c
 halt_mod_CFLAGS = $(COMMON_CFLAGS)
 halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For serial.mod.
-serial_mod_SOURCES = term/i386/pc/serial.c
-serial_mod_CFLAGS = $(COMMON_CFLAGS)
-serial_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For vbe.mod.
 vbe_mod_SOURCES = video/i386/pc/vbe.c
 vbe_mod_CFLAGS = $(COMMON_CFLAGS)
diff --git a/conf/i386.rmk b/conf/i386.rmk
index 73ca95764..110a40ef4 100644
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -62,3 +62,9 @@ multiboot2_mod_SOURCES = loader/i386/multiboot.c \
 multiboot2_mod_CFLAGS = $(COMMON_CFLAGS) -DGRUB_USE_MULTIBOOT2
 multiboot2_mod_LDFLAGS = $(COMMON_LDFLAGS)
 multiboot2_mod_ASFLAGS = $(COMMON_ASFLAGS)
+
+# For serial.mod.
+pkglib_MODULES += serial.mod
+serial_mod_SOURCES = term/i386/pc/serial.c
+serial_mod_CFLAGS = $(COMMON_CFLAGS)
+serial_mod_LDFLAGS = $(COMMON_LDFLAGS)
diff --git a/term/i386/pc/serial.c b/term/i386/pc/serial.c
index b94b09553..135bb6cc5 100644
--- a/term/i386/pc/serial.c
+++ b/term/i386/pc/serial.c
@@ -17,8 +17,7 @@
  */
 
 #include <grub/machine/memory.h>
-#include <grub/machine/serial.h>
-#include <grub/machine/console.h>
+#include <grub/i386/pc/serial.h>
 #include <grub/term.h>
 #include <grub/types.h>
 #include <grub/dl.h>