diff options
| author | marcoveeneman <marco-veeneman@hotmail.com> | 2017-04-18 21:31:55 +0200 |
|---|---|---|
| committer | marcoveeneman <marco-veeneman@hotmail.com> | 2017-04-18 21:31:55 +0200 |
| commit | 4226442a0c753b8c81f71f1024c4204b711a2637 (patch) | |
| tree | 2547f3cd257e24860447c89fce4d7dabf44f2b6b /demos | |
| parent | 4cf565a7e8f2ee3fa027334f2fc391910b9d8941 (diff) | |
| parent | 4c203dba2d4239878f17474055c13c4293ebbd16 (diff) | |
| download | ChibiOS-Contrib-4226442a0c753b8c81f71f1024c4204b711a2637.tar.gz ChibiOS-Contrib-4226442a0c753b8c81f71f1024c4204b711a2637.tar.bz2 ChibiOS-Contrib-4226442a0c753b8c81f71f1024c4204b711a2637.zip | |
Merge branch 'master' of https://github.com/ChibiOS/ChibiOS-Contrib
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/NRF51/MICROBIT/Makefile | 2 | ||||
| -rw-r--r-- | demos/NRF52/Classic/Makefile | 5 | ||||
| -rw-r--r-- | demos/various/RT-Win32-TriBuf/Makefile | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/demos/NRF51/MICROBIT/Makefile b/demos/NRF51/MICROBIT/Makefile index 46523ce..fec59c6 100644 --- a/demos/NRF51/MICROBIT/Makefile +++ b/demos/NRF51/MICROBIT/Makefile @@ -86,7 +86,7 @@ endif PROJECT = ch
# Imported source files and paths
-CHIBIOS = $(HOME)/ChibiOS/ChibiOS
+CHIBIOS = ../../../../ChibiOS-RT
CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
# Startup files.
include $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_nrf51.mk
diff --git a/demos/NRF52/Classic/Makefile b/demos/NRF52/Classic/Makefile index 24f0f3a..0f318b1 100644 --- a/demos/NRF52/Classic/Makefile +++ b/demos/NRF52/Classic/Makefile @@ -89,9 +89,8 @@ endif PROJECT = ch
# Imported source files and paths
-NRF51SDK = /home/sdalu/nRF51-SDK
-CHIBIOS = /home/sdalu/ChibiOS/ChibiOS
-CHIBIOS_CONTRIB = /home/sdalu/ChibiOS/ChibiOS-Contrib
+CHIBIOS = ../../../../ChibiOS-RT
+CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
# Startup files.
include $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_nrf52.mk
# HAL-OSAL files (optional).
diff --git a/demos/various/RT-Win32-TriBuf/Makefile b/demos/various/RT-Win32-TriBuf/Makefile index 0ed677e..a50f45a 100644 --- a/demos/various/RT-Win32-TriBuf/Makefile +++ b/demos/various/RT-Win32-TriBuf/Makefile @@ -62,7 +62,7 @@ include $(CHIBIOS)/os/hal/boards/simulator/board.mk include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/ports/simulator/win32/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
-include $(CHIBIOS)/os/rt/ports/SIMIA32/compilers/GCC/port.mk
+include $(CHIBIOS)/os/common/ports/SIMIA32/compilers/GCC/port.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/test/rt/test.mk
|