]> git.friedersdorff.com Git - max/tmk_keyboard.git/commitdiff
projects / max / tmk_keyboard.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8952d61)
Chibios: updates for 3.0.4 git.
authorflabbergast <s3+flabbergast@sdfeu.org>
Mon, 21 Dec 2015 08:45:26 +0000 (08:45 +0000)
committerflabbergast <s3+flabbergast@sdfeu.org>
Mon, 21 Dec 2015 08:45:26 +0000 (08:45 +0000)
keyboard/infinity_chibios/halconf.h patch | blob | history
keyboard/stm32_f103_onekey/halconf.h patch | blob | history
keyboard/stm32_onekey/halconf.h patch | blob | history
keyboard/teensy_lc_onekey/halconf.h patch | blob | history
keyboard/teensy_lc_onekey/ld/MKL26Z64.ld patch | blob | history

diff --git a/keyboard/infinity_chibios/halconf.h b/keyboard/infinity_chibios/halconf.h
index 2472ba7ed78ba10cd8f99cc2d0e2edc5ea510592..61a9ac0a6f459c2bb0810cb21d5af7237c89beec 100644 (file)
--- a/keyboard/infinity_chibios/halconf.h
+++ b/keyboard/infinity_chibios/halconf.h
@@ -163,6 +163,13 @@
 #define HAL_USE_USB                 TRUE\r
 #endif\r
 \r
+/**\r
+ * @brief   Enables the WDG subsystem.\r
+ */\r
+#if !defined(HAL_USE_WDG) || defined(__DOXYGEN__)\r
+#define HAL_USE_WDG                 FALSE\r
+#endif\r
+\r
 /*===========================================================================*/\r
 /* ADC driver related settings.                                              */\r
 /*===========================================================================*/\r
diff --git a/keyboard/stm32_f103_onekey/halconf.h b/keyboard/stm32_f103_onekey/halconf.h
index d3415c555cf7990705d88a023b7cf0e3a8d11ca9..e75c1c367959b771ad8e66a651e1aac716b67193 100644 (file)
--- a/keyboard/stm32_f103_onekey/halconf.h
+++ b/keyboard/stm32_f103_onekey/halconf.h
@@ -163,6 +163,13 @@
 #define HAL_USE_USB                 TRUE
 #endif
 
+/**
+ * @brief   Enables the WDG subsystem.
+ */
+#if !defined(HAL_USE_WDG) || defined(__DOXYGEN__)
+#define HAL_USE_WDG                 FALSE
+#endif
+
 /*===========================================================================*/
 /* ADC driver related settings.                                              */
 /*===========================================================================*/
diff --git a/keyboard/stm32_onekey/halconf.h b/keyboard/stm32_onekey/halconf.h
index d3415c555cf7990705d88a023b7cf0e3a8d11ca9..e75c1c367959b771ad8e66a651e1aac716b67193 100644 (file)
--- a/keyboard/stm32_onekey/halconf.h
+++ b/keyboard/stm32_onekey/halconf.h
@@ -163,6 +163,13 @@
 #define HAL_USE_USB                 TRUE
 #endif
 
+/**
+ * @brief   Enables the WDG subsystem.
+ */
+#if !defined(HAL_USE_WDG) || defined(__DOXYGEN__)
+#define HAL_USE_WDG                 FALSE
+#endif
+
 /*===========================================================================*/
 /* ADC driver related settings.                                              */
 /*===========================================================================*/
diff --git a/keyboard/teensy_lc_onekey/halconf.h b/keyboard/teensy_lc_onekey/halconf.h
index 0d4bc4d08161d4d6946ef443ca7099c9b993e169..868391666427f995ceaee911fb02d5140628cfbd 100644 (file)
--- a/keyboard/teensy_lc_onekey/halconf.h
+++ b/keyboard/teensy_lc_onekey/halconf.h
@@ -163,6 +163,13 @@
 #define HAL_USE_USB                 TRUE\r
 #endif\r
 \r
+/**\r
+ * @brief   Enables the WDG subsystem.\r
+ */\r
+#if !defined(HAL_USE_WDG) || defined(__DOXYGEN__)\r
+#define HAL_USE_WDG                 FALSE\r
+#endif\r
+\r
 #endif /* _HALCONF_H_ */\r
 \r
 /** @} */\r
diff --git a/keyboard/teensy_lc_onekey/ld/MKL26Z64.ld b/keyboard/teensy_lc_onekey/ld/MKL26Z64.ld
index fd9102dea222364c4471c71ae8c8ffbfa050b037..9e9e92502ca6cb3bf8fed94a2a813e86f4dbce6c 100644 (file)
--- a/keyboard/teensy_lc_onekey/ld/MKL26Z64.ld
+++ b/keyboard/teensy_lc_onekey/ld/MKL26Z64.ld
@@ -18,144 +18,43 @@
 */\r
 \r
 /*\r
- * KL25Z64 memory setup.\r
+ * KL26Z64 memory setup.\r
  */\r
-\r
-ENTRY(Reset_Handler)\r
-\r
 MEMORY\r
 {\r
   flash0   :  org = 0x00000000,  len = 0xc0\r
   flashcfg :  org = 0x00000400,  len = 0x10\r
   flash    :  org = 0x00000410,  len = 62k - 0x410\r
   eeprom_emu : org = 0x0000F800, len = 2k\r
-  ram      :  org = 0x1FFFF800,  len = 8k\r
+  ram0     :  org = 0x1FFFF800,  len = 8k\r
+  ram1     :  org = 0x00000000,  len = 0\r
+  ram2     :  org = 0x00000000,  len = 0\r
+  ram3     :  org = 0x00000000,  len = 0\r
+  ram4     :  org = 0x00000000,  len = 0\r
+  ram5     :  org = 0x00000000,  len = 0\r
+  ram6     :  org = 0x00000000,  len = 0\r
+  ram7     :  org = 0x00000000,  len = 0\r
 }\r
 \r
-__ram_start__           = ORIGIN(ram);\r
-__ram_size__            = LENGTH(ram);\r
-__ram_end__             = __ram_start__ + __ram_size__;\r
-\r
 __eeprom_workarea_start__ = ORIGIN(eeprom_emu);\r
 __eeprom_workarea_size__  = LENGTH(eeprom_emu);\r
 __eeprom_workarea_end__   = __eeprom_workarea_start__ + __eeprom_workarea_size__;\r
 \r
-SECTIONS\r
-{\r
-  . = 0;\r
-\r
-  .isr : ALIGN(4) SUBALIGN(4)\r
-  {\r
-    KEEP(*(.vectors))\r
-  } > flash0\r
-\r
-  .cfmprotect : ALIGN(4) SUBALIGN(4)\r
-  {\r
-    KEEP(*(.cfmconfig))\r
-  } > flashcfg\r
-\r
-  _text = .;\r
-\r
-  constructors : ALIGN(4) SUBALIGN(4)\r
-  {\r
-    PROVIDE(__init_array_start = .);\r
-    KEEP(*(SORT(.init_array.*)))\r
-    KEEP(*(.init_array))\r
-    PROVIDE(__init_array_end = .);\r
-  } > flash\r
-\r
-  destructors : ALIGN(4) SUBALIGN(4)\r
-  {\r
-    PROVIDE(__fini_array_start = .);\r
-    KEEP(*(.fini_array))\r
-    KEEP(*(SORT(.fini_array.*)))\r
-    PROVIDE(__fini_array_end = .);\r
-  } > flash\r
+/* RAM region to be used for Main stack. This stack accommodates the processing\r
+   of all exceptions and interrupts*/\r
+REGION_ALIAS("MAIN_STACK_RAM", ram0);\r
 \r
-  .text : ALIGN(4) SUBALIGN(4)\r
-  {\r
-    *(.text)\r
-    *(.text.*)\r
-    *(.rodata)\r
-    *(.rodata.*)\r
-    *(.glue_7t)\r
-    *(.glue_7)\r
-    *(.gcc*)\r
-  } > flash\r
+/* RAM region to be used for the process stack. This is the stack used by\r
+   the main() function.*/\r
+REGION_ALIAS("PROCESS_STACK_RAM", ram0);\r
 \r
-  .ARM.extab :\r
-  {\r
-    *(.ARM.extab* .gnu.linkonce.armextab.*)\r
-  } > flash\r
+/* RAM region to be used for data segment.*/\r
+REGION_ALIAS("DATA_RAM", ram0);\r
 \r
-  .ARM.exidx : {\r
-    PROVIDE(__exidx_start = .);\r
-    *(.ARM.exidx* .gnu.linkonce.armexidx.*)\r
-    PROVIDE(__exidx_end = .);\r
-  } > flash\r
-\r
-  .eh_frame_hdr :\r
-  {\r
-    *(.eh_frame_hdr)\r
-  } > flash\r
-\r
-  .eh_frame : ONLY_IF_RO\r
-  {\r
-    *(.eh_frame)\r
-  } > flash\r
-\r
-  .textalign : ONLY_IF_RO\r
-  {\r
-    . = ALIGN(8);\r
-  } > flash\r
-\r
-  _etext = .;\r
-  _textdata = _etext;\r
-\r
-  .stacks :\r
-  {\r
-    . = ALIGN(8);\r
-    __main_stack_base__ = .;\r
-    . += __main_stack_size__;\r
-    . = ALIGN(8);\r
-    __main_stack_end__ = .;\r
-    __process_stack_base__ = .;\r
-    __main_thread_stack_base__ = .;\r
-    . += __process_stack_size__;\r
-    . = ALIGN(8);\r
-    __process_stack_end__ = .;\r
-    __main_thread_stack_end__ = .;\r
-  } > ram\r
-\r
-  .data :\r
-  {\r
-    . = ALIGN(4);\r
-    PROVIDE(_data = .);\r
-    *(.data)\r
-    . = ALIGN(4);\r
-    *(.data.*)\r
-    . = ALIGN(4);\r
-    *(.ramtext)\r
-    . = ALIGN(4);\r
-    PROVIDE(_edata = .);\r
-  } > ram AT > flash\r
-\r
-  .bss :\r
-  {\r
-    . = ALIGN(4);\r
-    PROVIDE(_bss_start = .);\r
-    *(.bss)\r
-    . = ALIGN(4);\r
-    *(.bss.*)\r
-    . = ALIGN(4);\r
-    *(COMMON)\r
-    . = ALIGN(4);\r
-    PROVIDE(_bss_end = .);\r
-  } > ram\r
-}\r
+/* RAM region to be used for BSS segment.*/\r
+REGION_ALIAS("BSS_RAM", ram0);\r
 \r
-PROVIDE(end = .);\r
-_end            = .;\r
+/* RAM region to be used for the default heap.*/\r
+REGION_ALIAS("HEAP_RAM", ram0);\r
 \r
-__heap_base__   = _end;\r
-__heap_end__    = __ram_end__;\r
+INCLUDE ld/rules_kinetis.ld\r
Unnamed repository; edit this file 'description' to name the repository.