From 04e194c54f4a208b14d8c17aaddf3170e943eea8 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Tue, 10 Mar 2015 14:05:47 +0000 Subject: [PATCH] git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7749 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- demos/various/NIL-ARMCM4-GENERIC/.cproject | 52 +++++ demos/various/NIL-ARMCM4-GENERIC/.project | 95 +++++++++ demos/various/NIL-ARMCM4-GENERIC/Makefile | 201 ++++++++++++++++++ demos/various/NIL-ARMCM4-GENERIC/ch.ld | 26 +++ demos/various/NIL-ARMCM4-GENERIC/cmparams.h | 66 ++++++ ...C4-GENERIC (OpenOCD, Flash and Run).launch | 52 +++++ demos/various/NIL-ARMCM4-GENERIC/main.c | 58 +++++ demos/various/NIL-ARMCM4-GENERIC/nilconf.h | 179 ++++++++++++++++ demos/various/RT-ARM7-GENERIC/armparams.h | 2 +- demos/various/RT-ARMCM0-GENERIC/cmparams.h | 2 + demos/various/RT-ARMCM4-GENERIC/cmparams.h | 4 +- os/rt/ports/ARM/compilers/GCC/chcoreasm.s | 2 +- 12 files changed, 736 insertions(+), 3 deletions(-) create mode 100644 demos/various/NIL-ARMCM4-GENERIC/.cproject create mode 100644 demos/various/NIL-ARMCM4-GENERIC/.project create mode 100644 demos/various/NIL-ARMCM4-GENERIC/Makefile create mode 100644 demos/various/NIL-ARMCM4-GENERIC/ch.ld create mode 100644 demos/various/NIL-ARMCM4-GENERIC/cmparams.h create mode 100644 demos/various/NIL-ARMCM4-GENERIC/debug/NIL-ARMC4-GENERIC (OpenOCD, Flash and Run).launch create mode 100644 demos/various/NIL-ARMCM4-GENERIC/main.c create mode 100644 demos/various/NIL-ARMCM4-GENERIC/nilconf.h diff --git a/demos/various/NIL-ARMCM4-GENERIC/.cproject b/demos/various/NIL-ARMCM4-GENERIC/.cproject new file mode 100644 index 000000000..d9e1ee787 --- /dev/null +++ b/demos/various/NIL-ARMCM4-GENERIC/.cproject @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/demos/various/NIL-ARMCM4-GENERIC/.project b/demos/various/NIL-ARMCM4-GENERIC/.project new file mode 100644 index 000000000..d0b5986d4 --- /dev/null +++ b/demos/various/NIL-ARMCM4-GENERIC/.project @@ -0,0 +1,95 @@ + + + NIL-ARMCM4-GENERIC + + + + + + org.eclipse.cdt.managedbuilder.core.genmakebuilder + clean,full,incremental, + + + ?name? + + + + org.eclipse.cdt.make.core.append_environment + true + + + org.eclipse.cdt.make.core.autoBuildTarget + all + + + org.eclipse.cdt.make.core.buildArguments + + + + org.eclipse.cdt.make.core.buildCommand + mingw32-make + + + org.eclipse.cdt.make.core.cleanBuildTarget + clean + + + org.eclipse.cdt.make.core.contents + org.eclipse.cdt.make.core.activeConfigSettings + + + org.eclipse.cdt.make.core.enableAutoBuild + false + + + org.eclipse.cdt.make.core.enableCleanBuild + true + + + org.eclipse.cdt.make.core.enableFullBuild + true + + + org.eclipse.cdt.make.core.fullBuildTarget + all + + + org.eclipse.cdt.make.core.stopOnError + true + + + org.eclipse.cdt.make.core.useDefaultBuildCmd + false + + + + + org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder + full,incremental, + + + + + + org.eclipse.cdt.core.cnature + org.eclipse.cdt.managedbuilder.core.managedBuildNature + org.eclipse.cdt.managedbuilder.core.ScannerConfigNature + + + + board + 2 + CHIBIOS/os/hal/boards/ST_STM32F3_DISCOVERY + + + os + 2 + CHIBIOS/os + + + test + 2 + CHIBIOS/test + + + diff --git a/demos/various/NIL-ARMCM4-GENERIC/Makefile b/demos/various/NIL-ARMCM4-GENERIC/Makefile new file mode 100644 index 000000000..305cba9b0 --- /dev/null +++ b/demos/various/NIL-ARMCM4-GENERIC/Makefile @@ -0,0 +1,201 @@ +############################################################################## +# Build global options +# NOTE: Can be overridden externally. +# + +# Compiler options here. +ifeq ($(USE_OPT),) + USE_OPT = -O2 -ggdb -fomit-frame-pointer -falign-functions=16 +endif + +# C specific options here (added to USE_OPT). +ifeq ($(USE_COPT),) + USE_COPT = +endif + +# C++ specific options here (added to USE_OPT). +ifeq ($(USE_CPPOPT),) + USE_CPPOPT = -fno-rtti +endif + +# Enable this if you want the linker to remove unused code and data +ifeq ($(USE_LINK_GC),) + USE_LINK_GC = yes +endif + +# Linker extra options here. +ifeq ($(USE_LDOPT),) + USE_LDOPT = +endif + +# Enable this if you want link time optimizations (LTO) +ifeq ($(USE_LTO),) + USE_LTO = yes +endif + +# If enabled, this option allows to compile the application in THUMB mode. +ifeq ($(USE_THUMB),) + USE_THUMB = yes +endif + +# Enable this if you want to see the full log while compiling. +ifeq ($(USE_VERBOSE_COMPILE),) + USE_VERBOSE_COMPILE = no +endif + +# +# Build global options +############################################################################## + +############################################################################## +# Architecture or project specific options +# + +# Stack size to be allocated to the Cortex-M process stack. This stack is +# the stack used by the main() thread. +ifeq ($(USE_PROCESS_STACKSIZE),) + USE_PROCESS_STACKSIZE = 0x100 +endif + +# Stack size to the allocated to the Cortex-M main/exceptions stack. This +# stack is used for processing interrupts and exceptions. +ifeq ($(USE_EXCEPTIONS_STACKSIZE),) + USE_EXCEPTIONS_STACKSIZE = 0x400 +endif + +# Enables the use of FPU on Cortex-M4 (no, softfp, hard). +ifeq ($(USE_FPU),) + USE_FPU = no +endif + +# +# Architecture or project specific options +############################################################################## + +############################################################################## +# Project, sources and paths +# + +# Define project name here +PROJECT = ch + +# Imported source files and paths +CHIBIOS = ../../.. +include $(CHIBIOS)/os/nil/nil.mk +include $(CHIBIOS)/os/nil/ports/ARMCMx/compilers/GCC/mk/port_generic.mk + +# Define linker script file here +LDSCRIPT = ch.ld + +# C sources that can be compiled in ARM or THUMB mode depending on the global +# setting. +CSRC = $(PORTSRC) \ + $(KERNSRC) \ + main.c + +# C++ sources that can be compiled in ARM or THUMB mode depending on the global +# setting. +CPPSRC = + +# C sources to be compiled in ARM mode regardless of the global setting. +# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler +# option that results in lower performance and larger code size. +ACSRC = + +# C++ sources to be compiled in ARM mode regardless of the global setting. +# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler +# option that results in lower performance and larger code size. +ACPPSRC = + +# C sources to be compiled in THUMB mode regardless of the global setting. +# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler +# option that results in lower performance and larger code size. +TCSRC = + +# C sources to be compiled in THUMB mode regardless of the global setting. +# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler +# option that results in lower performance and larger code size. +TCPPSRC = + +# List ASM source files here +ASMSRC = $(PORTASM) + +INCDIR = $(PORTINC) $(KERNINC) + +# Make this point to your CMSIS device file. +INCDIR += $(CHIBIOS)/os/ext/CMSIS/ST + +# +# Project, sources and paths +############################################################################## + +############################################################################## +# Compiler settings +# + +MCU = cortex-m4 + +#TRGT = arm-elf- +TRGT = arm-none-eabi- +CC = $(TRGT)gcc +CPPC = $(TRGT)g++ +# Enable loading with g++ only if you need C++ runtime support. +# NOTE: You can use C++ even without C++ support if you are careful. C++ +# runtime support makes code size explode. +LD = $(TRGT)gcc +#LD = $(TRGT)g++ +CP = $(TRGT)objcopy +AS = $(TRGT)gcc -x assembler-with-cpp +AR = $(TRGT)ar +OD = $(TRGT)objdump +SZ = $(TRGT)size +HEX = $(CP) -O ihex +BIN = $(CP) -O binary + +# ARM-specific options here +AOPT = + +# THUMB-specific options here +TOPT = -mthumb -DTHUMB + +# Define C warning options here +CWARN = -Wall -Wextra -Wstrict-prototypes + +# Define C++ warning options here +CPPWARN = -Wall -Wextra + +# +# Compiler settings +############################################################################## + +############################################################################## +# Start of user section +# + +# List all user C define here, like -D_DEBUG=1 +UDEFS = + +# Define ASM defines here +UADEFS = + +# List all user directories here +UINCDIR = + +# List the user directory to look for the libraries here +ULIBDIR = + +# List all user libraries here +ULIBS = + +# +# End of user defines +############################################################################## + +RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC +include $(RULESPATH)/rules.mk + +############################################################################## +# MISRA check rule, requires PCLint and the setup files, not provided. +# +misra: + @lint-nt -v -w3 $(DEFS) pclint/co-gcc.lnt pclint/au-misra3.lnt pclint/waivers.lnt $(IINCDIR) $(CSRC) &> misra.txt diff --git a/demos/various/NIL-ARMCM4-GENERIC/ch.ld b/demos/various/NIL-ARMCM4-GENERIC/ch.ld new file mode 100644 index 000000000..cb367b8ae --- /dev/null +++ b/demos/various/NIL-ARMCM4-GENERIC/ch.ld @@ -0,0 +1,26 @@ +/* + ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +/* + * Generic device memory setup, customize it for your device. + */ +MEMORY +{ + flash : org = 0x08000000, len = 128k + ram : org = 0x20000000, len = 32k +} + +INCLUDE rules.ld diff --git a/demos/various/NIL-ARMCM4-GENERIC/cmparams.h b/demos/various/NIL-ARMCM4-GENERIC/cmparams.h new file mode 100644 index 000000000..f7c0b8895 --- /dev/null +++ b/demos/various/NIL-ARMCM4-GENERIC/cmparams.h @@ -0,0 +1,66 @@ +/* + ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +/** + * @file cmparams.h + * @brief ARM Cortex-M4 parameters. + * + * @defgroup ARMCMx_ARMCM4 ARM Cortex-M4 Specific Parameters + * @ingroup ARMCMx_SPECIFIC + * @details This file contains the Cortex-M4 specific parameters for a + * generic platform. + * @{ + */ + +#ifndef _CMPARAMS_H_ +#define _CMPARAMS_H_ + +/** + * @brief Cortex core model. + */ +#define CORTEX_MODEL CORTEX_M4 + +/** + * @brief Floating Point unit presence. + */ +#define CORTEX_HAS_FPU 1 + +/** + * @brief Number of bits in priority masks. + */ +#define CORTEX_PRIORITY_BITS 4 + +/** + * @brief Number of interrupt vectors. + * @note This number does not include the 16 system vectors and must be + * rounded to a multiple of 8. + */ +#define CORTEX_NUM_VECTORS 96 + +#if !defined(_FROM_ASM_) + +/* + * Replace the following inclusion with your vendor-provided CMSIS + * device file. + */ +#define STM32F407xx +#include "stm32f4xx.h" + +#endif /* !defined(__FROM_ASM__) */ + +#endif /* _CMPARAMS_H_ */ + +/** @} */ diff --git a/demos/various/NIL-ARMCM4-GENERIC/debug/NIL-ARMC4-GENERIC (OpenOCD, Flash and Run).launch b/demos/various/NIL-ARMCM4-GENERIC/debug/NIL-ARMC4-GENERIC (OpenOCD, Flash and Run).launch new file mode 100644 index 000000000..9241157a7 --- /dev/null +++ b/demos/various/NIL-ARMCM4-GENERIC/debug/NIL-ARMC4-GENERIC (OpenOCD, Flash and Run).launch @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/demos/various/NIL-ARMCM4-GENERIC/main.c b/demos/various/NIL-ARMCM4-GENERIC/main.c new file mode 100644 index 000000000..20af5d493 --- /dev/null +++ b/demos/various/NIL-ARMCM4-GENERIC/main.c @@ -0,0 +1,58 @@ +/* + ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +#include "nil.h" + +/* + * Blinker thread #1. + */ +static THD_WORKING_AREA(waThread1, 128); +static THD_FUNCTION(Thread1, arg) { + + (void)arg; + + while (true) { + chThdSleepMilliseconds(1000); + } +} + +/* + * Threads static table, one entry per thread. The number of entries must + * match NIL_CFG_NUM_THREADS. + */ +THD_TABLE_BEGIN + THD_TABLE_ENTRY(waThread1, "sleeper", Thread1, NULL) +THD_TABLE_END + +/* + * Application entry point. + */ +int main(void) { + + /* + * System initializations. + * - Kernel initialization, the main() function becomes a thread and the + * RTOS is active. + */ + chSysInit(); + + /* This is now the idle thread loop, you may perform here a low priority + task but you must never try to sleep or wait in this loop. Note that + this tasks runs at the lowest priority level so any instruction added + here will be executed after all other tasks have been started.*/ + while (true) { + } +} diff --git a/demos/various/NIL-ARMCM4-GENERIC/nilconf.h b/demos/various/NIL-ARMCM4-GENERIC/nilconf.h new file mode 100644 index 000000000..6718e19ff --- /dev/null +++ b/demos/various/NIL-ARMCM4-GENERIC/nilconf.h @@ -0,0 +1,179 @@ +/* + ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +/** + * @file nilconf.h + * @brief Configuration file template. + * @details A copy of this file must be placed in each project directory, it + * contains the application specific kernel settings. + * + * @addtogroup config + * @details Kernel related settings and hooks. + * @{ + */ + +#ifndef _NILCONF_H_ +#define _NILCONF_H_ + +/*===========================================================================*/ +/** + * @name Kernel parameters and options + * @{ + */ +/*===========================================================================*/ + +/** + * @brief Number of user threads in the application. + * @note This number is not inclusive of the idle thread which is + * Implicitly handled. + */ +#define NIL_CFG_NUM_THREADS 1 + +/** @} */ + +/*===========================================================================*/ +/** + * @name System timer settings + * @{ + */ +/*===========================================================================*/ + +/** + * @brief System time counter resolution. + * @note Allowed values are 16 or 32 bits. + */ +#define NIL_CFG_ST_RESOLUTION 32 + +/** + * @brief System tick frequency. + * @note This value together with the @p NIL_CFG_ST_RESOLUTION + * option defines the maximum amount of time allowed for + * timeouts. + */ +#define NIL_CFG_ST_FREQUENCY 1000 + +/** + * @brief Time delta constant for the tick-less mode. + * @note If this value is zero then the system uses the classic + * periodic tick. This value represents the minimum number + * of ticks that is safe to specify in a timeout directive. + * The value one is not valid, timeouts are rounded up to + * this value. + */ +#define NIL_CFG_ST_TIMEDELTA 0 + +/** @} */ + +/*===========================================================================*/ +/** + * @name Subsystem options + * @{ + */ +/*===========================================================================*/ + +/** + * @brief Events Flags APIs. + * @details If enabled then the event flags APIs are included in the kernel. + * + * @note The default is @p TRUE. + */ +#define NIL_CFG_USE_EVENTS TRUE + +/** @} */ + +/*===========================================================================*/ +/** + * @name Debug options + * @{ + */ +/*===========================================================================*/ + +/** + * @brief System assertions. + */ +#define NIL_CFG_ENABLE_ASSERTS FALSE + +/** + * @brief Stack check. + */ +#define NIL_CFG_ENABLE_STACK_CHECK FALSE + +/** @} */ + +/*===========================================================================*/ +/** + * @name Kernel hooks + * @{ + */ +/*===========================================================================*/ + +/** + * @brief System initialization hook. + */ +#if !defined(NIL_CFG_SYSTEM_INIT_HOOK) || defined(__DOXYGEN__) +#define NIL_CFG_SYSTEM_INIT_HOOK() { \ +} +#endif + +/** + * @brief Threads descriptor structure extension. + * @details User fields added to the end of the @p thread_t structure. + */ +#define NIL_CFG_THREAD_EXT_FIELDS \ + /* Add threads custom fields here.*/ + +/** + * @brief Threads initialization hook. + */ +#define NIL_CFG_THREAD_EXT_INIT_HOOK(tr) { \ + /* Add custom threads initialization code here.*/ \ +} + +/** + * @brief Idle thread enter hook. + * @note This hook is invoked within a critical zone, no OS functions + * should be invoked from here. + * @note This macro can be used to activate a power saving mode. + */ +#define NIL_CFG_IDLE_ENTER_HOOK() { \ +} + +/** + * @brief Idle thread leave hook. + * @note This hook is invoked within a critical zone, no OS functions + * should be invoked from here. + * @note This macro can be used to deactivate a power saving mode. + */ +#define NIL_CFG_IDLE_LEAVE_HOOK() { \ +} + +/** + * @brief System halt hook. + */ +#if !defined(NIL_CFG_SYSTEM_HALT_HOOK) || defined(__DOXYGEN__) +#define NIL_CFG_SYSTEM_HALT_HOOK(reason) { \ +} +#endif + +/** @} */ + +/*===========================================================================*/ +/* Port-specific settings (override port settings defaulted in nilcore.h). */ +/*===========================================================================*/ + +#endif /* _NILCONF_H_ */ + +/** @} */ diff --git a/demos/various/RT-ARM7-GENERIC/armparams.h b/demos/various/RT-ARM7-GENERIC/armparams.h index 7c3a26cb1..6bbc42af9 100644 --- a/demos/various/RT-ARM7-GENERIC/armparams.h +++ b/demos/various/RT-ARM7-GENERIC/armparams.h @@ -51,7 +51,7 @@ */ #define ARM_WFI_IMPL -#if !defined(__FROM_ASM__) || defined(__DOXYGEN__) +#if !defined(_FROM_ASM_) || defined(__DOXYGEN__) /** * @brief Address of the IRQ vector register in the interrupt controller. */ diff --git a/demos/various/RT-ARMCM0-GENERIC/cmparams.h b/demos/various/RT-ARMCM0-GENERIC/cmparams.h index 1b960366e..420f49dda 100644 --- a/demos/various/RT-ARMCM0-GENERIC/cmparams.h +++ b/demos/various/RT-ARMCM0-GENERIC/cmparams.h @@ -51,12 +51,14 @@ #define CORTEX_NUM_VECTORS 32 #if !defined(_FROM_ASM_) + /* * Replace the following inclusion with your vendor-provided CMSIS * device file. */ #define STM32F051x8 #include "stm32f0xx.h" + #endif /* !defined(_FROM_ASM_) */ #endif /* _CMPARAMS_H_ */ diff --git a/demos/various/RT-ARMCM4-GENERIC/cmparams.h b/demos/various/RT-ARMCM4-GENERIC/cmparams.h index 023fa05f3..f7c0b8895 100644 --- a/demos/various/RT-ARMCM4-GENERIC/cmparams.h +++ b/demos/various/RT-ARMCM4-GENERIC/cmparams.h @@ -51,13 +51,15 @@ #define CORTEX_NUM_VECTORS 96 #if !defined(_FROM_ASM_) + /* * Replace the following inclusion with your vendor-provided CMSIS * device file. */ #define STM32F407xx #include "stm32f4xx.h" -#endif /* !defined(_FROM_ASM_) */ + +#endif /* !defined(__FROM_ASM__) */ #endif /* _CMPARAMS_H_ */ diff --git a/os/rt/ports/ARM/compilers/GCC/chcoreasm.s b/os/rt/ports/ARM/compilers/GCC/chcoreasm.s index 2dc88e7d6..619a90bd7 100644 --- a/os/rt/ports/ARM/compilers/GCC/chcoreasm.s +++ b/os/rt/ports/ARM/compilers/GCC/chcoreasm.s @@ -25,7 +25,7 @@ * @{ */ -#define __FROM_ASM__ +#define _FROM_ASM_ #include "chconf.h" #include "armparams.h"