Skip to content

Commit 1e1228c

Browse files
committed
Merge pull request #216 from ban4jp/master
[KL46Z] Add mbed-rtos define for FRDM-KL46Z
2 parents e2574eb + e86d75f commit 1e1228c

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

libraries/rtos/rtx/RTX_CM_lib.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ extern int main (void);
199199
osThreadDef_t os_thread_def_main = {(os_pthread)main, osPriorityNormal, 0, NULL};
200200

201201
// This define should be probably moved to the CMSIS layer
202-
#ifdef TARGET_LPC1768
202+
#if defined(TARGET_LPC1768)
203203
#define INITIAL_SP (0x10008000UL)
204204

205205
#elif defined(TARGET_LPC11U24)
@@ -217,6 +217,9 @@ osThreadDef_t os_thread_def_main = {(os_pthread)main, osPriorityNormal, 0, NULL}
217217
#elif defined(TARGET_KL25Z)
218218
#define INITIAL_SP (0x20003000UL)
219219

220+
#elif defined(TARGET_KL46Z)
221+
#define INITIAL_SP (0x20006000UL)
222+
220223
#elif defined(TARGET_LPC4088)
221224
#define INITIAL_SP (0x10010000UL)
222225

libraries/rtos/rtx/RTX_Conf_CM.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
// counting "main", but not counting "osTimerThread"
5050
// <i> Default: 6
5151
#ifndef OS_TASKCNT
52-
# if defined(TARGET_LPC1768) || defined(TARGET_LPC2368) || defined(TARGET_LPC4088) || defined(TARGET_LPC1347)
52+
# if defined(TARGET_LPC1768) || defined(TARGET_LPC2368) || defined(TARGET_LPC4088) || defined(TARGET_LPC1347) || defined(TARGET_KL46Z)
5353
# define OS_TASKCNT 14
5454
# elif defined(TARGET_LPC11U24) || defined(TARGET_LPC11U35_401) || defined(TARGET_LPC11U35_501) || defined(TARGET_LPC1114) || defined(TARGET_LPC812) || defined(TARGET_KL25Z)
5555
# define OS_TASKCNT 6
@@ -58,7 +58,7 @@
5858

5959
// <o>Scheduler (+ interrupts) stack size [bytes] <64-4096:8><#/4>
6060
#ifndef OS_SCHEDULERSTKSIZE
61-
# if defined(TARGET_LPC1768) || defined(TARGET_LPC2368) || defined(TARGET_LPC4088) || defined(TARGET_LPC1347)
61+
# if defined(TARGET_LPC1768) || defined(TARGET_LPC2368) || defined(TARGET_LPC4088) || defined(TARGET_LPC1347) || defined(TARGET_KL46Z)
6262
# define OS_SCHEDULERSTKSIZE 256
6363
# elif defined(TARGET_LPC11U24) || defined(TARGET_LPC11U35_401) || defined(TARGET_LPC11U35_501) || defined(TARGET_LPC1114) || defined(TARGET_LPC812) || defined(TARGET_KL25Z)
6464
# define OS_SCHEDULERSTKSIZE 128
@@ -107,7 +107,7 @@
107107
# elif defined(TARGET_LPC1347)
108108
# define OS_CLOCK 72000000
109109

110-
# elif defined(TARGET_LPC11U24) || defined(TARGET_LPC11U35_401) || defined(TARGET_LPC11U35_501) || defined(TARGET_LPC1114) || defined(TARGET_KL25Z)
110+
# elif defined(TARGET_LPC11U24) || defined(TARGET_LPC11U35_401) || defined(TARGET_LPC11U35_501) || defined(TARGET_LPC1114) || defined(TARGET_KL25Z) || defined(TARGET_KL46Z)
111111
# define OS_CLOCK 48000000
112112
#
113113
# elif defined(TARGET_LPC812)

0 commit comments

Comments
 (0)