From 6c18028a35db35c45c8c342d43abd74b13ef1605 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Sat, 4 Nov 2017 19:23:04 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10946 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- demos/SPC5/NIL-SPC560D-EVB/chconf.h | 2 +- demos/STM32/NIL-STM32F051-DISCOVERY/chconf.h | 2 +- demos/STM32/NIL-STM32F100-DISCOVERY/chconf.h | 2 +- demos/STM32/NIL-STM32F303-DISCOVERY/chconf.h | 2 +- demos/STM32/NIL-STM32F373-STM32373C_EVAL/chconf.h | 2 +- demos/STM32/NIL-STM32F746G-DISCOVERY/chconf.h | 2 +- demos/STM32/NIL-STM32L011K4-NUCLEO32/Makefile | 4 +- demos/STM32/NIL-STM32L011K4-NUCLEO32/chconf.h | 2 +- demos/STM32/NIL-STM32L152-DISCOVERY/Makefile | 4 +- demos/STM32/NIL-STM32L152-DISCOVERY/chconf.h | 2 +- ...F746G-DISCOVERY (OpenOCD, Flash and Run).launch | 104 ++++++++++----------- demos/various/NIL-ARMCM0-GENERIC/Makefile | 4 +- demos/various/NIL-ARMCM0-GENERIC/chconf.h | 4 +- demos/various/NIL-ARMCM4-GENERIC/Makefile | 4 +- demos/various/NIL-ARMCM4-GENERIC/chconf.h | 4 +- 15 files changed, 72 insertions(+), 72 deletions(-) (limited to 'demos') diff --git a/demos/SPC5/NIL-SPC560D-EVB/chconf.h b/demos/SPC5/NIL-SPC560D-EVB/chconf.h index 1165a0d88..87f60a583 100644 --- a/demos/SPC5/NIL-SPC560D-EVB/chconf.h +++ b/demos/SPC5/NIL-SPC560D-EVB/chconf.h @@ -29,7 +29,7 @@ #define CHCONF_H #define _CHIBIOS_NIL_CONF_ -#define _CHIBIOS_NIL_CONF_VER_5_0_ +#define _CHIBIOS_NIL_CONF_VER_3_0_ /*===========================================================================*/ /** diff --git a/demos/STM32/NIL-STM32F051-DISCOVERY/chconf.h b/demos/STM32/NIL-STM32F051-DISCOVERY/chconf.h index 912b3a9cf..e2c5ad90d 100644 --- a/demos/STM32/NIL-STM32F051-DISCOVERY/chconf.h +++ b/demos/STM32/NIL-STM32F051-DISCOVERY/chconf.h @@ -29,7 +29,7 @@ #define CHCONF_H #define _CHIBIOS_NIL_CONF_ -#define _CHIBIOS_NIL_CONF_VER_5_0_ +#define _CHIBIOS_NIL_CONF_VER_3_0_ /*===========================================================================*/ /** diff --git a/demos/STM32/NIL-STM32F100-DISCOVERY/chconf.h b/demos/STM32/NIL-STM32F100-DISCOVERY/chconf.h index 260145e60..e584d60b8 100644 --- a/demos/STM32/NIL-STM32F100-DISCOVERY/chconf.h +++ b/demos/STM32/NIL-STM32F100-DISCOVERY/chconf.h @@ -29,7 +29,7 @@ #define CHCONF_H #define _CHIBIOS_NIL_CONF_ -#define _CHIBIOS_NIL_CONF_VER_5_0_ +#define _CHIBIOS_NIL_CONF_VER_3_0_ /*===========================================================================*/ /** diff --git a/demos/STM32/NIL-STM32F303-DISCOVERY/chconf.h b/demos/STM32/NIL-STM32F303-DISCOVERY/chconf.h index fcd948e50..648003a72 100644 --- a/demos/STM32/NIL-STM32F303-DISCOVERY/chconf.h +++ b/demos/STM32/NIL-STM32F303-DISCOVERY/chconf.h @@ -29,7 +29,7 @@ #define CHCONF_H #define _CHIBIOS_NIL_CONF_ -#define _CHIBIOS_NIL_CONF_VER_5_0_ +#define _CHIBIOS_NIL_CONF_VER_3_0_ /*===========================================================================*/ /** diff --git a/demos/STM32/NIL-STM32F373-STM32373C_EVAL/chconf.h b/demos/STM32/NIL-STM32F373-STM32373C_EVAL/chconf.h index c6b882185..523ce8d56 100644 --- a/demos/STM32/NIL-STM32F373-STM32373C_EVAL/chconf.h +++ b/demos/STM32/NIL-STM32F373-STM32373C_EVAL/chconf.h @@ -29,7 +29,7 @@ #define CHCONF_H #define _CHIBIOS_NIL_CONF_ -#define _CHIBIOS_NIL_CONF_VER_5_0_ +#define _CHIBIOS_NIL_CONF_VER_3_0_ /*===========================================================================*/ /** diff --git a/demos/STM32/NIL-STM32F746G-DISCOVERY/chconf.h b/demos/STM32/NIL-STM32F746G-DISCOVERY/chconf.h index 270957fb5..be691148c 100644 --- a/demos/STM32/NIL-STM32F746G-DISCOVERY/chconf.h +++ b/demos/STM32/NIL-STM32F746G-DISCOVERY/chconf.h @@ -29,7 +29,7 @@ #define CHCONF_H #define _CHIBIOS_NIL_CONF_ -#define _CHIBIOS_NIL_CONF_VER_5_0_ +#define _CHIBIOS_NIL_CONF_VER_3_0_ /*===========================================================================*/ /** diff --git a/demos/STM32/NIL-STM32L011K4-NUCLEO32/Makefile b/demos/STM32/NIL-STM32L011K4-NUCLEO32/Makefile index e5b60457f..0421f0446 100644 --- a/demos/STM32/NIL-STM32L011K4-NUCLEO32/Makefile +++ b/demos/STM32/NIL-STM32L011K4-NUCLEO32/Makefile @@ -99,8 +99,8 @@ include $(CHIBIOS)/os/nil/nil.mk include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v6m.mk # Other files (optional). #include $(CHIBIOS)/test/lib/test.mk -include $(CHIBIOS)/test/nil/nil_test.mk -include $(CHIBIOS)/test/oslib/oslib_test.mk +#include $(CHIBIOS)/test/nil/nil_test.mk +#include $(CHIBIOS)/test/oslib/oslib_test.mk # Define linker script file here LDSCRIPT= $(STARTUPLD)/STM32L011x4.ld diff --git a/demos/STM32/NIL-STM32L011K4-NUCLEO32/chconf.h b/demos/STM32/NIL-STM32L011K4-NUCLEO32/chconf.h index 0d4c319d8..9c5c1c810 100644 --- a/demos/STM32/NIL-STM32L011K4-NUCLEO32/chconf.h +++ b/demos/STM32/NIL-STM32L011K4-NUCLEO32/chconf.h @@ -29,7 +29,7 @@ #define CHCONF_H #define _CHIBIOS_NIL_CONF_ -#define _CHIBIOS_NIL_CONF_VER_5_0_ +#define _CHIBIOS_NIL_CONF_VER_3_0_ /*===========================================================================*/ /** diff --git a/demos/STM32/NIL-STM32L152-DISCOVERY/Makefile b/demos/STM32/NIL-STM32L152-DISCOVERY/Makefile index de5aaaebe..3f4968935 100644 --- a/demos/STM32/NIL-STM32L152-DISCOVERY/Makefile +++ b/demos/STM32/NIL-STM32L152-DISCOVERY/Makefile @@ -99,8 +99,8 @@ include $(CHIBIOS)/os/nil/nil.mk include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk # Other files (optional). #include $(CHIBIOS)/test/lib/test.mk -include $(CHIBIOS)/test/nil/nil_test.mk -include $(CHIBIOS)/test/oslib/oslib_test.mk +#include $(CHIBIOS)/test/nil/nil_test.mk +#include $(CHIBIOS)/test/oslib/oslib_test.mk # Define linker script file here LDSCRIPT= $(STARTUPLD)/STM32L152xB.ld diff --git a/demos/STM32/NIL-STM32L152-DISCOVERY/chconf.h b/demos/STM32/NIL-STM32L152-DISCOVERY/chconf.h index 260145e60..e584d60b8 100644 --- a/demos/STM32/NIL-STM32L152-DISCOVERY/chconf.h +++ b/demos/STM32/NIL-STM32L152-DISCOVERY/chconf.h @@ -29,7 +29,7 @@ #define CHCONF_H #define _CHIBIOS_NIL_CONF_ -#define _CHIBIOS_NIL_CONF_VER_5_0_ +#define _CHIBIOS_NIL_CONF_VER_3_0_ /*===========================================================================*/ /** diff --git a/demos/STM32/RT-STM32F746G-DISCOVERY/debug/RT-STM32F746G-DISCOVERY (OpenOCD, Flash and Run).launch b/demos/STM32/RT-STM32F746G-DISCOVERY/debug/RT-STM32F746G-DISCOVERY (OpenOCD, Flash and Run).launch index 92f436493..620c606b2 100644 --- a/demos/STM32/RT-STM32F746G-DISCOVERY/debug/RT-STM32F746G-DISCOVERY (OpenOCD, Flash and Run).launch +++ b/demos/STM32/RT-STM32F746G-DISCOVERY/debug/RT-STM32F746G-DISCOVERY (OpenOCD, Flash and Run).launch @@ -1,52 +1,52 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/demos/various/NIL-ARMCM0-GENERIC/Makefile b/demos/various/NIL-ARMCM0-GENERIC/Makefile index 5a7fe2e0d..32aba1db1 100644 --- a/demos/various/NIL-ARMCM0-GENERIC/Makefile +++ b/demos/various/NIL-ARMCM0-GENERIC/Makefile @@ -99,8 +99,8 @@ include $(CHIBIOS)/os/nil/nil.mk include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v6m.mk # Other files (optional). #include $(CHIBIOS)/test/lib/test.mk -include $(CHIBIOS)/test/nil/nil_test.mk -include $(CHIBIOS)/test/oslib/oslib_test.mk +#include $(CHIBIOS)/test/nil/nil_test.mk +#include $(CHIBIOS)/test/oslib/oslib_test.mk # Define linker script file here LDSCRIPT= $(STARTUPLD)/STM32F051x8.ld diff --git a/demos/various/NIL-ARMCM0-GENERIC/chconf.h b/demos/various/NIL-ARMCM0-GENERIC/chconf.h index 2e965b2b8..af7e94494 100644 --- a/demos/various/NIL-ARMCM0-GENERIC/chconf.h +++ b/demos/various/NIL-ARMCM0-GENERIC/chconf.h @@ -20,7 +20,7 @@ * @details A copy of this file must be placed in each project directory, it * contains the application specific kernel settings. * - * @addtogroup config + * @addtogroup NIL_CONFIG * @details Kernel related settings and hooks. * @{ */ @@ -29,7 +29,7 @@ #define CHCONF_H #define _CHIBIOS_NIL_CONF_ -#define _CHIBIOS_NIL_CONF_VER_5_0_ +#define _CHIBIOS_NIL_CONF_VER_3_0_ /*===========================================================================*/ /** diff --git a/demos/various/NIL-ARMCM4-GENERIC/Makefile b/demos/various/NIL-ARMCM4-GENERIC/Makefile index 52873cd39..21414c527 100644 --- a/demos/various/NIL-ARMCM4-GENERIC/Makefile +++ b/demos/various/NIL-ARMCM4-GENERIC/Makefile @@ -99,8 +99,8 @@ include $(CHIBIOS)/os/nil/nil.mk include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk # Other files (optional). #include $(CHIBIOS)/test/lib/test.mk -include $(CHIBIOS)/test/nil/nil_test.mk -include $(CHIBIOS)/test/oslib/oslib_test.mk +#include $(CHIBIOS)/test/nil/nil_test.mk +#include $(CHIBIOS)/test/oslib/oslib_test.mk # Define linker script file here LDSCRIPT= $(STARTUPLD)/STM32F407xG.ld diff --git a/demos/various/NIL-ARMCM4-GENERIC/chconf.h b/demos/various/NIL-ARMCM4-GENERIC/chconf.h index 2e965b2b8..af7e94494 100644 --- a/demos/various/NIL-ARMCM4-GENERIC/chconf.h +++ b/demos/various/NIL-ARMCM4-GENERIC/chconf.h @@ -20,7 +20,7 @@ * @details A copy of this file must be placed in each project directory, it * contains the application specific kernel settings. * - * @addtogroup config + * @addtogroup NIL_CONFIG * @details Kernel related settings and hooks. * @{ */ @@ -29,7 +29,7 @@ #define CHCONF_H #define _CHIBIOS_NIL_CONF_ -#define _CHIBIOS_NIL_CONF_VER_5_0_ +#define _CHIBIOS_NIL_CONF_VER_3_0_ /*===========================================================================*/ /** -- cgit v1.2.3