From e3f12486f060b88043ff92736e2cd45c2dda5f5b Mon Sep 17 00:00:00 2001 From: Theodore Ateba Date: Wed, 20 Dec 2017 20:30:10 +0000 Subject: AVR: Update NIL demos files to resolve the error undefined reference to __heap_base__ and undefined reference to __heap_end__ git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11154 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- demos/AVR/NIL-ARDUINO-MEGA/Makefile | 9 ++------- demos/AVR/NIL-ARDUINO-MEGA/chconf.h | 2 +- demos/AVR/NIL-ARDUINO-MINI/Makefile | 9 ++------- demos/AVR/NIL-ARDUINO-MINI/chconf.h | 4 ++-- demos/AVR/NIL-ARDUINO-NANO/Makefile | 9 ++------- demos/AVR/NIL-ARDUINO-NANO/chconf.h | 2 +- demos/AVR/NIL-ARDUINO-UNO/Makefile | 9 ++------- demos/AVR/NIL-ARDUINO-UNO/chconf.h | 2 +- demos/AVR/NIL-DIGISPARK-ATTINY-167/Makefile | 1 - demos/AVR/NIL-DIGISPARK-ATTINY-167/chconf.h | 2 +- demos/AVR/NIL-MT-DB-X4/Makefile | 9 ++------- demos/AVR/NIL-MT-DB-X4/chconf.h | 2 +- 12 files changed, 17 insertions(+), 43 deletions(-) (limited to 'demos') diff --git a/demos/AVR/NIL-ARDUINO-MEGA/Makefile b/demos/AVR/NIL-ARDUINO-MEGA/Makefile index 6c2fd723d..d0b7e6e43 100644 --- a/demos/AVR/NIL-ARDUINO-MEGA/Makefile +++ b/demos/AVR/NIL-ARDUINO-MEGA/Makefile @@ -92,10 +92,6 @@ include $(CHIBIOS)/os/hal/osal/nil/osal.mk # RTOS files (optional). include $(CHIBIOS)/os/nil/nil.mk include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk -# Other files (optional). -include $(CHIBIOS)/test/lib/test.mk -include $(CHIBIOS)/test/nil/nil_test.mk -include $(CHIBIOS)/test/oslib/oslib_test.mk # List C source files here. (C dependencies are automatically generated.) CSRC = $(KERNSRC) \ @@ -104,14 +100,13 @@ CSRC = $(KERNSRC) \ $(HALSRC) \ $(PLATFORMSRC) \ $(BOARDSRC) \ - $(TESTSRC) \ main.c # List C++ sources file here. CPPSRC = -INCDIR = $(CHIBIOS)/os/license $(PORTINC) $(KERNINC) \ - $(HALINC) $(OSALINC) $(PLATFORMINC) $(TESTINC) \ +INCDIR = $(CHIBIOS)/os/license $(PORTINC) $(KERNINC) \ + $(HALINC) $(OSALINC) $(PLATFORMINC) \ $(BOARDINC) # diff --git a/demos/AVR/NIL-ARDUINO-MEGA/chconf.h b/demos/AVR/NIL-ARDUINO-MEGA/chconf.h index 864bdb872..64ed5c174 100644 --- a/demos/AVR/NIL-ARDUINO-MEGA/chconf.h +++ b/demos/AVR/NIL-ARDUINO-MEGA/chconf.h @@ -169,7 +169,7 @@ * provide the @p __heap_base__ and @p __heap_end__ symbols. * @note Requires @p CH_CFG_USE_MEMCORE. */ -#define CH_CFG_MEMCORE_SIZE 0 +#define CH_CFG_MEMCORE_SIZE 128 /** @} */ diff --git a/demos/AVR/NIL-ARDUINO-MINI/Makefile b/demos/AVR/NIL-ARDUINO-MINI/Makefile index 8efdf3ebe..e9db784bd 100644 --- a/demos/AVR/NIL-ARDUINO-MINI/Makefile +++ b/demos/AVR/NIL-ARDUINO-MINI/Makefile @@ -92,10 +92,6 @@ include $(CHIBIOS)/os/hal/osal/nil/osal.mk # RTOS files (optional). include $(CHIBIOS)/os/nil/nil.mk include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk -# Other files (optional). -include $(CHIBIOS)/test/lib/test.mk -include $(CHIBIOS)/test/nil/nil_test.mk -include $(CHIBIOS)/test/oslib/oslib_test.mk # List C source files here. (C dependencies are automatically generated.) CSRC = $(KERNSRC) \ @@ -104,14 +100,13 @@ CSRC = $(KERNSRC) \ $(HALSRC) \ $(PLATFORMSRC) \ $(BOARDSRC) \ - $(TESTSRC) \ main.c # List C++ sources file here. CPPSRC = -INCDIR = $(CHIBIOS)/os/license $(PORTINC) $(KERNINC) \ - $(HALINC) $(OSALINC) $(PLATFORMINC) $(TESTINC) \ +INCDIR = $(CHIBIOS)/os/license $(PORTINC) $(KERNINC) \ + $(HALINC) $(OSALINC) $(PLATFORMINC) \ $(BOARDINC) # diff --git a/demos/AVR/NIL-ARDUINO-MINI/chconf.h b/demos/AVR/NIL-ARDUINO-MINI/chconf.h index 864bdb872..c52704ba7 100644 --- a/demos/AVR/NIL-ARDUINO-MINI/chconf.h +++ b/demos/AVR/NIL-ARDUINO-MINI/chconf.h @@ -169,7 +169,7 @@ * provide the @p __heap_base__ and @p __heap_end__ symbols. * @note Requires @p CH_CFG_USE_MEMCORE. */ -#define CH_CFG_MEMCORE_SIZE 0 +#define CH_CFG_MEMCORE_SIZE 128 /** @} */ @@ -187,7 +187,7 @@ * * @note The default is @p FALSE. */ -#define CH_CFG_USE_FACTORY TRUE +#define CH_CFG_USE_FACTORY FALSE /** * @brief Maximum length for object names. diff --git a/demos/AVR/NIL-ARDUINO-NANO/Makefile b/demos/AVR/NIL-ARDUINO-NANO/Makefile index e64e7a44b..7f4ea1a58 100644 --- a/demos/AVR/NIL-ARDUINO-NANO/Makefile +++ b/demos/AVR/NIL-ARDUINO-NANO/Makefile @@ -92,10 +92,6 @@ include $(CHIBIOS)/os/hal/osal/nil/osal.mk # RTOS files (optional). include $(CHIBIOS)/os/nil/nil.mk include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk -# Other files (optional). -include $(CHIBIOS)/test/lib/test.mk -include $(CHIBIOS)/test/nil/nil_test.mk -include $(CHIBIOS)/test/oslib/oslib_test.mk # List C source files here. (C dependencies are automatically generated.) CSRC = $(KERNSRC) \ @@ -104,14 +100,13 @@ CSRC = $(KERNSRC) \ $(HALSRC) \ $(PLATFORMSRC) \ $(BOARDSRC) \ - $(TESTSRC) \ main.c # List C++ sources file here. CPPSRC = -INCDIR = $(CHIBIOS)/os/license $(PORTINC) $(KERNINC) \ - $(HALINC) $(OSALINC) $(PLATFORMINC) $(TESTINC) \ +INCDIR = $(CHIBIOS)/os/license $(PORTINC) $(KERNINC) \ + $(HALINC) $(OSALINC) $(PLATFORMINC) \ $(BOARDINC) # diff --git a/demos/AVR/NIL-ARDUINO-NANO/chconf.h b/demos/AVR/NIL-ARDUINO-NANO/chconf.h index 864bdb872..64ed5c174 100644 --- a/demos/AVR/NIL-ARDUINO-NANO/chconf.h +++ b/demos/AVR/NIL-ARDUINO-NANO/chconf.h @@ -169,7 +169,7 @@ * provide the @p __heap_base__ and @p __heap_end__ symbols. * @note Requires @p CH_CFG_USE_MEMCORE. */ -#define CH_CFG_MEMCORE_SIZE 0 +#define CH_CFG_MEMCORE_SIZE 128 /** @} */ diff --git a/demos/AVR/NIL-ARDUINO-UNO/Makefile b/demos/AVR/NIL-ARDUINO-UNO/Makefile index a213f036e..159a6f752 100644 --- a/demos/AVR/NIL-ARDUINO-UNO/Makefile +++ b/demos/AVR/NIL-ARDUINO-UNO/Makefile @@ -92,10 +92,6 @@ include $(CHIBIOS)/os/hal/osal/nil/osal.mk # RTOS files (optional). include $(CHIBIOS)/os/nil/nil.mk include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk -# Other files (optional). -include $(CHIBIOS)/test/lib/test.mk -include $(CHIBIOS)/test/nil/nil_test.mk -include $(CHIBIOS)/test/oslib/oslib_test.mk # List C source files here. (C dependencies are automatically generated.) CSRC = $(KERNSRC) \ @@ -104,14 +100,13 @@ CSRC = $(KERNSRC) \ $(HALSRC) \ $(PLATFORMSRC) \ $(BOARDSRC) \ - $(TESTSRC) \ main.c # List C++ sources file here. CPPSRC = -INCDIR = $(CHIBIOS)/os/license $(PORTINC) $(KERNINC) \ - $(HALINC) $(OSALINC) $(PLATFORMINC) $(TESTINC) \ +INCDIR = $(CHIBIOS)/os/license $(PORTINC) $(KERNINC) \ + $(HALINC) $(OSALINC) $(PLATFORMINC) \ $(BOARDINC) # diff --git a/demos/AVR/NIL-ARDUINO-UNO/chconf.h b/demos/AVR/NIL-ARDUINO-UNO/chconf.h index 864bdb872..64ed5c174 100644 --- a/demos/AVR/NIL-ARDUINO-UNO/chconf.h +++ b/demos/AVR/NIL-ARDUINO-UNO/chconf.h @@ -169,7 +169,7 @@ * provide the @p __heap_base__ and @p __heap_end__ symbols. * @note Requires @p CH_CFG_USE_MEMCORE. */ -#define CH_CFG_MEMCORE_SIZE 0 +#define CH_CFG_MEMCORE_SIZE 128 /** @} */ diff --git a/demos/AVR/NIL-DIGISPARK-ATTINY-167/Makefile b/demos/AVR/NIL-DIGISPARK-ATTINY-167/Makefile index 984faaf0c..832dc98e1 100644 --- a/demos/AVR/NIL-DIGISPARK-ATTINY-167/Makefile +++ b/demos/AVR/NIL-DIGISPARK-ATTINY-167/Makefile @@ -93,7 +93,6 @@ include $(CHIBIOS)/os/hal/osal/nil/osal.mk include $(CHIBIOS)/os/nil/nil.mk include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk - # List C source files here. (C dependencies are automatically generated.) CSRC = $(KERNSRC) \ $(PORTSRC) \ diff --git a/demos/AVR/NIL-DIGISPARK-ATTINY-167/chconf.h b/demos/AVR/NIL-DIGISPARK-ATTINY-167/chconf.h index 6e3626b22..51ee2e97d 100644 --- a/demos/AVR/NIL-DIGISPARK-ATTINY-167/chconf.h +++ b/demos/AVR/NIL-DIGISPARK-ATTINY-167/chconf.h @@ -169,7 +169,7 @@ * provide the @p __heap_base__ and @p __heap_end__ symbols. * @note Requires @p CH_CFG_USE_MEMCORE. */ -#define CH_CFG_MEMCORE_SIZE 0 +#define CH_CFG_MEMCORE_SIZE 128 /** @} */ diff --git a/demos/AVR/NIL-MT-DB-X4/Makefile b/demos/AVR/NIL-MT-DB-X4/Makefile index 22eebabb2..92177ac85 100644 --- a/demos/AVR/NIL-MT-DB-X4/Makefile +++ b/demos/AVR/NIL-MT-DB-X4/Makefile @@ -92,11 +92,6 @@ include $(CHIBIOS)/os/hal/osal/nil/osal.mk # RTOS files (optional). include $(CHIBIOS)/os/nil/nil.mk include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk -# Other files (optional). -include $(CHIBIOS)/test/lib/test.mk -include $(CHIBIOS)/test/nil/nil_test.mk -include $(CHIBIOS)/test/oslib/oslib_test.mk - # List C source files here. (C dependencies are automatically generated.) CSRC = $(KERNSRC) \ @@ -111,8 +106,8 @@ CSRC = $(KERNSRC) \ # List C++ sources file here. CPPSRC = -INCDIR = $(CHIBIOS)/os/license $(PORTINC) $(KERNINC) \ - $(HALINC) $(OSALINC) $(PLATFORMINC) $(TESTINC) \ +INCDIR = $(CHIBIOS)/os/license $(PORTINC) $(KERNINC) \ + $(HALINC) $(OSALINC) $(PLATFORMINC) \ $(BOARDINC) # diff --git a/demos/AVR/NIL-MT-DB-X4/chconf.h b/demos/AVR/NIL-MT-DB-X4/chconf.h index 53ed735f1..3b30e3b4c 100644 --- a/demos/AVR/NIL-MT-DB-X4/chconf.h +++ b/demos/AVR/NIL-MT-DB-X4/chconf.h @@ -169,7 +169,7 @@ * provide the @p __heap_base__ and @p __heap_end__ symbols. * @note Requires @p CH_CFG_USE_MEMCORE. */ -#define CH_CFG_MEMCORE_SIZE 0 +#define CH_CFG_MEMCORE_SIZE 128 /** @} */ -- cgit v1.2.3