|
 |
6b3c76 |
From 738e0c73073b27de660696d32c2030bc683de2a2 Mon Sep 17 00:00:00 2001
|
|
|
a85e8e |
From: Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
a85e8e |
Date: Fri, 28 Feb 2014 10:50:05 +0100
|
|
|
6b3c76 |
Subject: [PATCH 065/261] * include/grub/i386/openbsd_bootarg.h: Add addr and
|
|
|
6b3c76 |
frequency fields. * grub-core/loader/i386/bsd.c (grub_cmd_openbsd): Fill addr
|
|
|
6b3c76 |
field.
|
|
|
a85e8e |
MIME-Version: 1.0
|
|
|
a85e8e |
Content-Type: text/plain; charset=UTF-8
|
|
|
a85e8e |
Content-Transfer-Encoding: 8bit
|
|
|
a85e8e |
|
|
|
a85e8e |
Suggested by: Markus Müller.
|
|
|
a85e8e |
---
|
|
|
6b3c76 |
ChangeLog | 7 +++++++
|
|
|
a85e8e |
grub-core/loader/i386/bsd.c | 2 ++
|
|
|
a85e8e |
include/grub/i386/openbsd_bootarg.h | 2 ++
|
|
|
a85e8e |
3 files changed, 11 insertions(+)
|
|
|
a85e8e |
|
|
|
6b3c76 |
diff --git a/ChangeLog b/ChangeLog
|
|
|
6b3c76 |
index 97cf57e25..f571f6653 100644
|
|
|
6b3c76 |
--- a/ChangeLog
|
|
|
6b3c76 |
+++ b/ChangeLog
|
|
|
6b3c76 |
@@ -1,5 +1,12 @@
|
|
|
6b3c76 |
2014-02-28 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
6b3c76 |
|
|
|
6b3c76 |
+ * include/grub/i386/openbsd_bootarg.h: Add addr and frequency fields.
|
|
|
6b3c76 |
+ * grub-core/loader/i386/bsd.c (grub_cmd_openbsd): Fill addr field.
|
|
|
6b3c76 |
+
|
|
|
6b3c76 |
+ Suggested by: Markus Müller.
|
|
|
6b3c76 |
+
|
|
|
6b3c76 |
+2014-02-28 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
6b3c76 |
+
|
|
|
6b3c76 |
* grub-core/kern/i386/pc/mmap.c: Fallback to EISA memory map
|
|
|
6b3c76 |
if E820 failed to return any regions.
|
|
|
6b3c76 |
|
|
|
a85e8e |
diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c
|
|
|
6b3c76 |
index ea0edfafe..19985f03e 100644
|
|
|
a85e8e |
--- a/grub-core/loader/i386/bsd.c
|
|
|
a85e8e |
+++ b/grub-core/loader/i386/bsd.c
|
|
|
a85e8e |
@@ -1646,6 +1646,7 @@ grub_cmd_openbsd (grub_extcmd_context_t ctxt, int argc, char *argv[])
|
|
|
a85e8e |
|
|
|
a85e8e |
serial.device = (GRUB_OPENBSD_COM_MAJOR << 8) | port;
|
|
|
a85e8e |
serial.speed = speed;
|
|
|
a85e8e |
+ serial.addr = grub_ns8250_hw_get_port (port);
|
|
|
a85e8e |
|
|
|
a85e8e |
grub_bsd_add_meta (OPENBSD_BOOTARG_CONSOLE, &serial, sizeof (serial));
|
|
|
a85e8e |
bootflags |= OPENBSD_RB_SERCONS;
|
|
|
a85e8e |
@@ -1656,6 +1657,7 @@ grub_cmd_openbsd (grub_extcmd_context_t ctxt, int argc, char *argv[])
|
|
|
a85e8e |
|
|
|
a85e8e |
grub_memset (&serial, 0, sizeof (serial));
|
|
|
a85e8e |
serial.device = (GRUB_OPENBSD_VGA_MAJOR << 8);
|
|
|
a85e8e |
+ serial.addr = 0xffffffff;
|
|
|
a85e8e |
grub_bsd_add_meta (OPENBSD_BOOTARG_CONSOLE, &serial, sizeof (serial));
|
|
|
a85e8e |
bootflags &= ~OPENBSD_RB_SERCONS;
|
|
|
a85e8e |
}
|
|
|
a85e8e |
diff --git a/include/grub/i386/openbsd_bootarg.h b/include/grub/i386/openbsd_bootarg.h
|
|
|
6b3c76 |
index 01ca4868b..9ebe6b4e4 100644
|
|
|
a85e8e |
--- a/include/grub/i386/openbsd_bootarg.h
|
|
|
a85e8e |
+++ b/include/grub/i386/openbsd_bootarg.h
|
|
|
a85e8e |
@@ -75,6 +75,8 @@ struct grub_openbsd_bootarg_console
|
|
|
a85e8e |
{
|
|
|
a85e8e |
grub_uint32_t device;
|
|
|
a85e8e |
grub_uint32_t speed;
|
|
|
a85e8e |
+ grub_uint32_t addr;
|
|
|
a85e8e |
+ grub_uint32_t frequency;
|
|
|
a85e8e |
};
|
|
|
a85e8e |
|
|
|
a85e8e |
struct grub_openbsd_bootarg_pcibios
|
|
|
6b3c76 |
--
|
|
|
6b3c76 |
2.13.5
|
|
|
6b3c76 |
|