RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

cpu/kw2x: adapted to centralized cpu conf

Browse Source
This commit is contained in:
Hauke Petersen 2015-05-27 23:05:56 +02:00
parent de31e1f9e8
commit 6102896f7a
3 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cpu/kw2x/Makefile.include
View File

@ -1,3 +1,5 @@
export CPU_ARCH = cortex-m4
# this CPU implementation is using the explicit core/CPU interface # this CPU implementation is using the explicit core/CPU interface
export CFLAGS += -DCOREIF_NG=1 export CFLAGS += -DCOREIF_NG=1
@ -26,6 +28,8 @@ export LINKERSCRIPT = $(RIOTCPU)/$(CPU)/$(CPU_MODEL)_linkerscript.ld
#export the CPU model #export the CPU model
MODEL = $(shell echo $(CPU_MODEL)|tr 'a-z' 'A-Z') MODEL = $(shell echo $(CPU_MODEL)|tr 'a-z' 'A-Z')
export CFLAGS += -DCPU_MODEL_$(MODEL) export CFLAGS += -DCPU_MODEL_$(MODEL)
ARCH = $(shell echo $(CPU_ARCH) | tr 'a-z-' 'A-Z_')
export CFLAGS += -DCPU_ARCH_$(ARCH)
# include CPU specific includes # include CPU specific includes
export INCLUDES += -I$(RIOTCPU)/$(CPU)/include export INCLUDES += -I$(RIOTCPU)/$(CPU)/include

8
cpu/kw2x/cpu.c
View File

@ -31,14 +31,10 @@ static void cpu_clock_init(void);
*/ */
void cpu_init(void) void cpu_init(void)
{ {
/* configure the vector table location to internal flash */ /* initialize the Cortex-M core */
SCB->VTOR = FLASH_BASE; cortexm_init();
/* initialize the clock system */ /* initialize the clock system */
cpu_clock_init(); cpu_clock_init();
/* set pendSV interrupt to lowest possible priority */
NVIC_SetPriority(PendSV_IRQn, 0xff);
} }
static inline void modem_clock_init(void) static inline void modem_clock_init(void)

24
cpu/kw2x/include/cpu_conf.h
View File

@ -43,17 +43,12 @@ extern "C"
#endif #endif
/** /**
* @name Kernel configuration * @brief ARM Cortex-M specific CPU configuration
*
* @{ * @{
*/ */
#define THREAD_EXTRA_STACKSIZE_PRINTF (1024) #define CPU_DEFAULT_IRQ_PRIO (1U)
#define CPU_IRQ_NUMOF (65U)
#ifndef THREAD_STACKSIZE_DEFAULT #define CPU_FLASH_BASE (0x00000000)
#define THREAD_STACKSIZE_DEFAULT (1024)
#endif
#define THREAD_STACKSIZE_IDLE (256)
/** @} */ /** @} */
/** /**
@ -66,17 +61,6 @@ extern "C"
*/ */
#define CPUID_ID_PTR ((void *)(&(SIM_UIDH))) #define CPUID_ID_PTR ((void *)(&(SIM_UIDH)))
/**
* @name UART0 buffer size definition for compatibility reasons.
*
* TODO: remove once the remodeling of the uart0 driver is done.
* @{
*/
#ifndef UART0_BUFSIZE
#define UART0_BUFSIZE (128)
#endif
/** @} */
#define TRANSCEIVER_BUFFER_SIZE (3) /**< Buffer Size for Transceiver Module */ #define TRANSCEIVER_BUFFER_SIZE (3) /**< Buffer Size for Transceiver Module */
/** /**