Skip to content
Snippets Groups Projects
Commit 15997d58 authored by Robert Morris's avatar Robert Morris
Browse files

move the kernel to 0x80000000

parent 5c292b3d
No related branches found
No related tags found
No related merge requests found
......@@ -43,7 +43,7 @@ bootmain(void)
// Call the entry point from the ELF header.
// Does not return!
entry = (void(*)(void))(elf->entry & 0xFFFFFF);
entry = (void(*)(void))(elf->entry - KERNBASE);
entry();
}
......
......@@ -8,7 +8,8 @@ ENTRY(_start)
SECTIONS
{
/* Load the kernel at this address: "." means the current address */
. = 0xF0100000;
/* Must be equal to KERNLINK */
. = 0x80100000;
.text : AT(0x100000) {
*(.text .stub .text.* .gnu.linkonce.t.*)
......
......@@ -5,7 +5,7 @@
#define DEVSPACE 0xFE000000 // Other devices are at high addresses
// Key addresses for address space layout (see kmap in vm.c for the layout)
#define KERNBASE 0xF0000000 // First kernel virtual address
#define KERNBASE 0x80000000 // First kernel virtual address
#define KERNLINK (KERNBASE+EXTMEM) // Address where kernel is linked
#ifndef __ASSEMBLER__
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment