From 28e2f5256e793232777ae4a4d971d2da490f51a5 Mon Sep 17 00:00:00 2001
From: Theodore Ateba <tf.ateba@gmail.com>
Date: Tue, 19 Dec 2017 22:33:36 +0000
Subject: AVR: Resolve copilation errors due to new flags on configuration
 file. Remove the test suite part due to binary footprint under 100% of flash.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11147 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 demos/AVR/RT-ARDUINO-MEGA/Makefile |  9 ++-------
 demos/AVR/RT-ARDUINO-MEGA/chconf.h | 18 +++++++++++++-----
 demos/AVR/RT-ARDUINO-MEGA/main.c   |  5 -----
 3 files changed, 15 insertions(+), 17 deletions(-)

(limited to 'demos')

diff --git a/demos/AVR/RT-ARDUINO-MEGA/Makefile b/demos/AVR/RT-ARDUINO-MEGA/Makefile
index 9152735a0..10ec9f983 100644
--- a/demos/AVR/RT-ARDUINO-MEGA/Makefile
+++ b/demos/AVR/RT-ARDUINO-MEGA/Makefile
@@ -92,10 +92,6 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk
 # RTOS files (optional).
 include $(CHIBIOS)/os/rt/rt.mk
 include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk
-# Other files (optional).
-include $(CHIBIOS)/test/lib/test.mk
-include $(CHIBIOS)/test/rt/rt_test.mk
-include $(CHIBIOS)/test/oslib/oslib_test.mk
 
 # List C source files here. (C dependencies are automatically generated.)
 CSRC =  $(KERNSRC)                      \
@@ -105,14 +101,13 @@ CSRC =  $(KERNSRC)                      \
         $(PLATFORMSRC)                  \
         $(BOARDSRC)                     \
         $(CHIBIOS)/os/various/evtimer.c \
-        $(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) $(CHIBIOS)/os/various
 
 #
diff --git a/demos/AVR/RT-ARDUINO-MEGA/chconf.h b/demos/AVR/RT-ARDUINO-MEGA/chconf.h
index e4e830630..b752173f0 100644
--- a/demos/AVR/RT-ARDUINO-MEGA/chconf.h
+++ b/demos/AVR/RT-ARDUINO-MEGA/chconf.h
@@ -55,13 +55,13 @@
  * @brief   Time intervals data size.
  * @note    Allowed values are 16, 32 or 64 bits.
  */
-#define CH_CFG_INTERVALS_SIZE               32
+#define CH_CFG_INTERVALS_SIZE               16
 
 /**
  * @brief   Time types data size.
  * @note    Allowed values are 16 or 32 bits.
  */
-#define CH_CFG_TIME_TYPES_SIZE              32
+#define CH_CFG_TIME_TYPES_SIZE              16
 
 /**
  * @brief   Time delta constant for the tick-less mode.
@@ -106,7 +106,7 @@
  *          provide the @p __heap_base__ and @p __heap_end__ symbols.
  * @note    Requires @p CH_CFG_USE_MEMCORE.
  */
-#define CH_CFG_MEMCORE_SIZE                 128
+#define CH_CFG_MEMCORE_SIZE                 16
 
 /**
  * @brief   Idle thread automatic spawn suppression.
@@ -424,6 +424,14 @@
  */
 #define CH_DBG_ENABLE_ASSERTS               FALSE
 
+/**
+ * @brief   Debug option, trace buffer.
+ * @details If enabled then the trace buffer is activated.
+ *
+ * @note    The default is @p CH_DBG_TRACE_MASK_DISABLED.
+ */
+#define CH_DBG_TRACE_MASK                   CH_DBG_TRACE_MASK_DISABLED
+
 /**
  * @brief   Debug option, trace buffer.
  * @details If enabled then the trace buffer is activated.
@@ -506,9 +514,9 @@
 
 /**
  * @brief   Threads initialization hook.
- * @details User initialization code added to the @p _thread_init() function.
+ * @details User initialization code added to the @p chThdInit() API.
  *
- * @note    It is invoked from within @p _thread_init() and implicitly from all
+ * @note    It is invoked from within @p chThdInit() and implicitly from all
  *          the threads creation APIs.
  */
 #define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \
diff --git a/demos/AVR/RT-ARDUINO-MEGA/main.c b/demos/AVR/RT-ARDUINO-MEGA/main.c
index 8380124b7..73aba4ea6 100644
--- a/demos/AVR/RT-ARDUINO-MEGA/main.c
+++ b/demos/AVR/RT-ARDUINO-MEGA/main.c
@@ -16,8 +16,6 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "rt_test_root.h"
-#include "oslib_test_root.h"
 
 static THD_WORKING_AREA(waThread1, 32);
 static THD_FUNCTION(Thread1, arg) {
@@ -57,9 +55,6 @@ int main(void) {
    */
   chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO, Thread1, NULL);
 
-  test_execute((BaseSequentialStream *)&SD1, &rt_test_suite);
-  test_execute((BaseSequentialStream *)&SD1, &oslib_test_suite);
-
   while(TRUE) {
     chThdSleepMilliseconds(1000);
   }
-- 
cgit v1.2.3