2009-08-25 Vladimir Serbinenko <phcoder@gmail.com>

	Enable bsd.mod on coreboot.

	* conf/i386-coreboot.rmk (pkglib_MODULES): Add bsd.mod.
	(bsd_mod_SOURCES): New variable.
	(bsd_mod_CFLAGS): Likewise.
	(bsd_mod_LDFLAGS): Likewise.
	(bsd_mod_ASFLAGS): Likewise.
	* loader/i386/bsd.c [!GRUB_MACHINE_PCBIOS]: Fix includes.
	(grub_bsd_get_device) [!GRUB_MACHINE_PCBIOS]: Set *biosdev to 0xff.

diff --git a/ChangeLog b/ChangeLog
index 1de68adf15be611bb6e779d4b032db39d4e86329..e5d7ba088f70772a16fc095d3a9720485c2a5151 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2009-08-25  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       Enable bsd.mod on coreboot.
+
+       * conf/i386-coreboot.rmk (pkglib_MODULES): Add bsd.mod.
+       (bsd_mod_SOURCES): New variable.
+       (bsd_mod_CFLAGS): Likewise.
+       (bsd_mod_LDFLAGS): Likewise.
+       (bsd_mod_ASFLAGS): Likewise.
+       * loader/i386/bsd.c [!GRUB_MACHINE_PCBIOS]: Fix includes.
+       (grub_bsd_get_device) [!GRUB_MACHINE_PCBIOS]: Set *biosdev to 0xff.
+
 2009-08-25  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Cleanup NetBSD root support.

diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index 7e9f853d7e605b7b8ad8233041001c8d15804f20..196abe68b083074e9a2a47122723118a19ddfbf8 100644 (file)
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -204,6 +204,13 @@ aout_mod_SOURCES = loader/aout.c
 aout_mod_CFLAGS = $(COMMON_CFLAGS)
 aout_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+# For bsd.mod
+pkglib_MODULES += bsd.mod
+bsd_mod_SOURCES = loader/i386/bsd.c loader/i386/bsd32.c loader/i386/bsd64.c loader/i386/bsd_helper.S loader/i386/bsd_trampoline.S
+bsd_mod_CFLAGS = $(COMMON_CFLAGS)
+bsd_mod_LDFLAGS = $(COMMON_LDFLAGS)
+bsd_mod_ASFLAGS = $(COMMON_ASFLAGS)
+
 # For play.mod.
 play_mod_SOURCES = commands/i386/pc/play.c
 play_mod_CFLAGS = $(COMMON_CFLAGS)

diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c
index 0b9a2b4719423d6bfa4bc7b9aa701afa0f5c2f50..0cb3c75f187f90b7be9e49df023ae229ea601e37 100644 (file)
--- a/loader/i386/bsd.c
+++ b/loader/i386/bsd.c
@@ -37,10 +37,10 @@
 
 #ifdef GRUB_MACHINE_PCBIOS
 #include <grub/machine/biosnum.h>
+#endif
 #include <grub/disk.h>
 #include <grub/device.h>
 #include <grub/partition.h>
-#endif
 
 #define ALIGN_DWORD(a) ALIGN_UP (a, 4)
 #define ALIGN_QWORD(a) ALIGN_UP (a, 8)
@@ -138,7 +138,11 @@ grub_bsd_get_device (grub_uint32_t * biosdev,
   char *p;
   grub_device_t dev; 
 
+#ifdef GRUB_MACHINE_PCBIOS
   *biosdev = grub_get_root_biosnumber () & 0xff;
+#else
+  *biosdev = 0xff;
+#endif
   *unit = (*biosdev & 0x7f);
   *slice = 0xff;
   *part = 0xff;