diff options
| author | Fabien Poussin <fabien.poussin@gmail.com> | 2017-04-14 13:01:28 +0200 |
|---|---|---|
| committer | Fabien Poussin <fabien.poussin@gmail.com> | 2017-04-14 13:01:28 +0200 |
| commit | 4186e908ee40f09bdc22360cfdc0cb3207262d32 (patch) | |
| tree | 555049e79730a825e9d37d9c734698f04a23612b /demos | |
| parent | 2212cb731fd691e1394ba955fb5cc85ceec43ac8 (diff) | |
| download | ChibiOS-Contrib-4186e908ee40f09bdc22360cfdc0cb3207262d32.tar.gz ChibiOS-Contrib-4186e908ee40f09bdc22360cfdc0cb3207262d32.tar.bz2 ChibiOS-Contrib-4186e908ee40f09bdc22360cfdc0cb3207262d32.zip | |
Fixed NRF52 and Win32 demos.
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/NRF52/Classic/Makefile | 5 | ||||
| -rw-r--r-- | demos/various/RT-Win32-TriBuf/Makefile | 2 |
2 files changed, 3 insertions, 4 deletions
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
|