Merge branch 'bob' of https://repo.or.cz/RPi-MMU-example into alice

# Conflicts:
#	.gitignore
#	PL0_test.ld
#	demo_functionality.c
#	interrupt_vector.S
#	interrupts.c
#	kernel.c
#	memory.h

1 files changed, 0 insertions, 44 deletions

diff --git a/loader_stage2.ld b/loader_stage2.ld
deleted file mode 100644
index 8f215e9..0000000
--- a/loader_stage2.ld
+++ /dev/null
@@ -1,44 +0,0 @@
-ENTRY(_start)
- 
-SECTIONS
-{
-    /* stage2 bootloader gets loaded at 0x4000 */
-    . = 0x4000;
-    __start = .;
-    __text_start = .;
-    .text :
-    {
-        /* have entry point at the beginning */
-        KEEP(*(.text.stage2main))
-        *(.text)
-    }
-    . = ALIGN(4096); /* align to page size */
-    __text_end = .;
- 
-    __rodata_start = .;
-    .rodata :
-    {
-        *(.rodata)
-    }
-    . = ALIGN(4096); /* align to page size */
-    __rodata_end = .;
- 
-    __data_start = .;
-    .data :
-    {
-        *(.data)
-    }
-    . = ALIGN(4096); /* align to page size */
-    __data_end = .;
- 
-    __bss_start = .;
-    .bss :
-    {
-        bss = .;
-        *(.bss)
-    }
-    . = ALIGN(4096); /* align to page size */
-    __bss_end = .;
-    __bss_size = __bss_end - __bss_start;
-    __end = .;
-}