[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[2534] 2009-08-25 Vladimir Serbinenko <address@hidden>
From: |
Vladimir Serbinenko |
Subject: |
[2534] 2009-08-25 Vladimir Serbinenko <address@hidden> |
Date: |
Tue, 25 Aug 2009 23:18:49 +0000 |
Revision: 2534
http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2534
Author: phcoder
Date: 2009-08-25 23:18:48 +0000 (Tue, 25 Aug 2009)
Log Message:
-----------
2009-08-25 Vladimir Serbinenko <address@hidden>
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.
Modified Paths:
--------------
trunk/grub2/ChangeLog
trunk/grub2/conf/i386-coreboot.rmk
trunk/grub2/loader/i386/bsd.c
Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog 2009-08-25 19:57:18 UTC (rev 2533)
+++ trunk/grub2/ChangeLog 2009-08-25 23:18:48 UTC (rev 2534)
@@ -1,5 +1,17 @@
2009-08-25 Vladimir Serbinenko <address@hidden>
+ 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 <address@hidden>
+
Cleanup NetBSD root support.
* loader/i386/bsd.c (grub_netbsd_boot): Remove call to
Modified: trunk/grub2/conf/i386-coreboot.rmk
===================================================================
--- trunk/grub2/conf/i386-coreboot.rmk 2009-08-25 19:57:18 UTC (rev 2533)
+++ trunk/grub2/conf/i386-coreboot.rmk 2009-08-25 23:18:48 UTC (rev 2534)
@@ -204,6 +204,13 @@
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)
Modified: trunk/grub2/loader/i386/bsd.c
===================================================================
--- trunk/grub2/loader/i386/bsd.c 2009-08-25 19:57:18 UTC (rev 2533)
+++ trunk/grub2/loader/i386/bsd.c 2009-08-25 23:18:48 UTC (rev 2534)
@@ -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 @@
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;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [2534] 2009-08-25 Vladimir Serbinenko <address@hidden>,
Vladimir Serbinenko <=