|
 |
6b2dd0f |
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
752ceb1 |
From: Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
752ceb1 |
Date: Wed, 30 Aug 2017 16:29:59 +0200
|
|
|
752ceb1 |
Subject: [PATCH] qemu, coreboot, multiboot: Change linking address to 0x9000.
|
|
|
752ceb1 |
|
|
|
752ceb1 |
It's common for distros to use a defective ld which links at 0x9000. Instead
|
|
|
752ceb1 |
of fighting it, just move link target to 0x9000.
|
|
|
752ceb1 |
---
|
|
|
752ceb1 |
grub-core/Makefile.core.def | 6 +++---
|
|
|
752ceb1 |
include/grub/offsets.h | 4 ++--
|
|
|
752ceb1 |
2 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
752ceb1 |
|
|
|
752ceb1 |
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
|
|
|
752ceb1 |
index 6edf68286c3..d90ad622082 100644
|
|
|
752ceb1 |
--- a/grub-core/Makefile.core.def
|
|
|
752ceb1 |
+++ b/grub-core/Makefile.core.def
|
|
|
752ceb1 |
@@ -68,11 +68,11 @@ kernel = {
|
|
|
752ceb1 |
i386_pc_ldflags = '$(TARGET_IMG_LDFLAGS)';
|
|
|
752ceb1 |
i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x9000';
|
|
|
752ceb1 |
i386_qemu_ldflags = '$(TARGET_IMG_LDFLAGS)';
|
|
|
752ceb1 |
- i386_qemu_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x8200';
|
|
|
752ceb1 |
+ i386_qemu_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x9000';
|
|
|
752ceb1 |
i386_coreboot_ldflags = '$(TARGET_IMG_LDFLAGS)';
|
|
|
752ceb1 |
- i386_coreboot_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x8200';
|
|
|
752ceb1 |
+ i386_coreboot_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x9000';
|
|
|
752ceb1 |
i386_multiboot_ldflags = '$(TARGET_IMG_LDFLAGS)';
|
|
|
752ceb1 |
- i386_multiboot_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x8200';
|
|
|
752ceb1 |
+ i386_multiboot_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x9000';
|
|
|
752ceb1 |
i386_ieee1275_ldflags = '$(TARGET_IMG_LDFLAGS)';
|
|
|
752ceb1 |
i386_ieee1275_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x10000';
|
|
|
752ceb1 |
i386_xen_ldflags = '$(TARGET_IMG_LDFLAGS)';
|
|
|
752ceb1 |
diff --git a/include/grub/offsets.h b/include/grub/offsets.h
|
|
|
752ceb1 |
index bf0689fc99a..330e4c70738 100644
|
|
|
752ceb1 |
--- a/include/grub/offsets.h
|
|
|
752ceb1 |
+++ b/include/grub/offsets.h
|
|
|
752ceb1 |
@@ -50,7 +50,7 @@
|
|
|
752ceb1 |
/* The offset of GRUB_CORE_ENTRY_ADDR. */
|
|
|
752ceb1 |
#define GRUB_KERNEL_I386_QEMU_CORE_ENTRY_ADDR 0x8
|
|
|
752ceb1 |
|
|
|
752ceb1 |
-#define GRUB_KERNEL_I386_QEMU_LINK_ADDR 0x8200
|
|
|
752ceb1 |
+#define GRUB_KERNEL_I386_QEMU_LINK_ADDR 0x9000
|
|
|
752ceb1 |
|
|
|
752ceb1 |
/* The offset of GRUB_TOTAL_MODULE_SIZE. */
|
|
|
752ceb1 |
#define GRUB_KERNEL_SPARC64_IEEE1275_TOTAL_MODULE_SIZE 0x8
|
|
|
752ceb1 |
@@ -91,7 +91,7 @@
|
|
|
752ceb1 |
|
|
|
752ceb1 |
#define GRUB_KERNEL_MIPS_ARC_TOTAL_MODULE_SIZE 0x08
|
|
|
752ceb1 |
|
|
|
752ceb1 |
-#define GRUB_KERNEL_I386_COREBOOT_LINK_ADDR 0x8200
|
|
|
752ceb1 |
+#define GRUB_KERNEL_I386_COREBOOT_LINK_ADDR 0x9000
|
|
|
752ceb1 |
#define GRUB_KERNEL_I386_COREBOOT_MODULES_ADDR 0x100000
|
|
|
752ceb1 |
|
|
|
752ceb1 |
#define GRUB_KERNEL_I386_IEEE1275_LINK_ADDR 0x10000
|