X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Lib%2Fmk20dx256vlh7.bootloader.ld;h=ade94eab38d73e4c7d15de39fac3918680781076;hb=0013d7a4f31d35ad054369037e20b683085c6116;hp=08927484cfd59374083ccce1f4f50c83b014fbb8;hpb=f5a1e1bcf56325e3ff5bcc1f1d5be9231db38889;p=kiibohd-controller.git

diff --git a/Lib/mk20dx256vlh7.bootloader.ld b/Lib/mk20dx256vlh7.bootloader.ld
index 0892748..ade94ea 100644
--- a/Lib/mk20dx256vlh7.bootloader.ld
+++ b/Lib/mk20dx256vlh7.bootloader.ld
@@ -1,7 +1,7 @@
 /* Teensyduino Core Library
  * http://www.pjrc.com/teensy/
  * Copyright (c) 2013 PJRC.COM, LLC.
- * Modifications by Jacob Alexander 2014 for use with McHCK and Kiibohd-dfu
+ * Modifications by Jacob Alexander 2014-2015 for use with McHCK and Kiibohd-dfu
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -29,8 +29,6 @@
  * SOFTWARE.
  */
 
-/* XXX Not tested yet -HaaTa */
-
 MEMORY
 {
 	FLASH (rx)     : ORIGIN = 0x0, LENGTH = 256K
@@ -39,6 +37,7 @@ MEMORY
 }
 
 /* Starting Address of the application ROM */
+_bootloader = ORIGIN( FLASH );
 _app_rom = ORIGIN( FLASH_APP );
 
 FlexRAM = 0x14000000;
@@ -52,12 +51,10 @@ SECTIONS
 {
 	.text :
 	{
-		. = 0;
-		KEEP(* (.vectors))
+		. = 0; KEEP(* (.vectors)) /* MUST BE AT 0 */
 		*(.startup*)
+		. = 0x400; KEEP(* (.flashconfig)) /* MUST BE AT 0x400 */
 		*(.rodata*)
-		. = 0x400;
-		KEEP(* (.flashconfig))
 		*(.text*)
 		. = ALIGN(4);
 		KEEP(*(.init))