[src/trunk]: src/sys/arch/amd64/conf Rollback kernel link scrpt change for mu...

[manu <manu%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b89b38065e55
branches:  trunk
changeset: 847116:b89b38065e55
user:      manu <manu%NetBSD.org@localhost>
date:      Wed Dec 11 02:31:44 2019 +0000

description:
Rollback kernel link scrpt change for multiboot

The multiboot section breaks BIOS boot. Rolling back the link script
removes the section, which breaks multiboot but should restore BIOS boot.

diffstat:

 sys/arch/amd64/conf/kern.ldscript |  8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diffs (24 lines):

diff -r ed23664fbf89 -r b89b38065e55 sys/arch/amd64/conf/kern.ldscript
--- a/sys/arch/amd64/conf/kern.ldscript Wed Dec 11 02:22:38 2019 +0000
+++ b/sys/arch/amd64/conf/kern.ldscript Wed Dec 11 02:31:44 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern.ldscript,v 1.28 2019/12/10 02:06:07 manu Exp $    */
+/*     $NetBSD: kern.ldscript,v 1.29 2019/12/11 02:31:44 manu Exp $    */
 
 #include "assym.h"
 
@@ -13,13 +13,9 @@
 ENTRY(_start)
 SECTIONS
 {
-       multiboot 0x4000 :
-       {
-               KEEP(*(multiboot));
-       }
        .text : AT (ADDR(.text) & 0x0fffffff)
        {
-               . = ALIGN(__LARGE_PAGE_SIZE);
+               . = ALIGN(__PAGE_SIZE);
                __text_user_start = . ;
                *(.text.user)
                . = ALIGN(__PAGE_SIZE);