From 2b8e64aada976519f7a6d7f6c84b2eb7a6b2b779 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Tue, 24 Oct 2017 08:54:27 +0000 Subject: NASA OSAL test suite reworked. Fixes to the OSAL related to the API change. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10892 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/Makefile | 3 ++- demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/chconf.h | 2 +- demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/Makefile | 3 ++- demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/chconf.h | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) (limited to 'demos') diff --git a/demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/Makefile b/demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/Makefile index 16eed43f1..20d8e28cc 100644 --- a/demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/Makefile +++ b/demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/Makefile @@ -98,7 +98,8 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk # Other files (optional). -include $(CHIBIOS)/test/nasa_osal/test.mk +include $(CHIBIOS)/test/lib/test.mk +include $(CHIBIOS)/test/nasa_osal/nasa_osal_test.mk include $(CHIBIOS)/os/common/abstractions/nasa_cfe/osal/cfe_osal.mk include $(CHIBIOS)/os/common/abstractions/nasa_cfe/psp/cfe_psp.mk diff --git a/demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/chconf.h b/demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/chconf.h index a4e130fdb..7a192f6ac 100644 --- a/demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/chconf.h +++ b/demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/chconf.h @@ -331,7 +331,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/STM32/NASA-OSAL-STM32F746G-DISCOVERY/Makefile b/demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/Makefile index 0c23ce29f..4eb2de745 100644 --- a/demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/Makefile +++ b/demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/Makefile @@ -98,7 +98,8 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk # Other files (optional). -include $(CHIBIOS)/test/nasa_osal/test.mk +include $(CHIBIOS)/test/lib/test.mk +include $(CHIBIOS)/test/nasa_osal/nasa_osal_test.mk include $(CHIBIOS)/os/common/abstractions/nasa_cfe/osal/cfe_osal.mk include $(CHIBIOS)/os/common/abstractions/nasa_cfe/psp/cfe_psp.mk diff --git a/demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/chconf.h b/demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/chconf.h index 3da22fc8b..42edb2413 100644 --- a/demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/chconf.h +++ b/demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/chconf.h @@ -331,7 +331,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. -- cgit v1.2.3