Modified makefiles to incorporate changes

7 files changed, 22 insertions, 22 deletions

diff --git a/demos/NRF51/RT-WVSHARE_BLE400/Makefile b/demos/NRF51/RT-WVSHARE_BLE400/Makefile
index c6b59cf..d9efbf7 100644
--- a/demos/NRF51/RT-WVSHARE_BLE400/Makefile
+++ b/demos/NRF51/RT-WVSHARE_BLE400/Makefile
@@ -82,11 +82,11 @@ PROJECT = ch
 # Imported source files and paths

 CHIBIOS = ../../../..

 # Startup files.

-include $(CHIBIOS)/community/os/common/ports/ARMCMx/compilers/GCC/mk/startup_nrf51.mk

+include $(CHIBIOS_CONTRIB)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_nrf51.mk

 # HAL-OSAL files (optional).

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/community/os/hal/ports/NRF51/NRF51822/platform.mk

-include $(CHIBIOS)/community/os/hal/boards/WVSHARE_BLE400/board.mk

+include $(CHIBIOS_CONTRIB)/os/hal/ports/NRF51/NRF51822/platform.mk

+include $(CHIBIOS_CONTRIB)/os/hal/boards/WVSHARE_BLE400/board.mk

 include $(CHIBIOS)/os/hal/osal/rt/osal.mk

 # RTOS files (optional).

 include $(CHIBIOS)/os/rt/rt.mk

diff --git a/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/Makefile b/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/Makefile
index 4e53d19..db8f2c7 100644
--- a/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/Makefile
+++ b/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/Makefile
@@ -90,8 +90,8 @@ CHIBIOS = ../../../..
 # Startup files.

 include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk

 # HAL-OSAL files (optional).

-include $(CHIBIOS)/community/os/hal/hal.mk

-include $(CHIBIOS)/community/os/hal/ports/STM32/STM32F4xx/platform.mk

+include $(CHIBIOS_CONTRIB)/os/hal/hal.mk

+include $(CHIBIOS_CONTRIB)/os/hal/ports/STM32/STM32F4xx/platform.mk

 include $(CHIBIOS)/os/hal/boards/ST_STM32F429I_DISCOVERY/board.mk

 include $(CHIBIOS)/os/hal/osal/rt/osal.mk

 # RTOS files (optional).

@@ -116,7 +116,7 @@ CSRC = $(STARTUPSRC) \
        $(CHIBIOS)/os/various/shell.c \

        $(CHIBIOS)/os/hal/lib/streams/memstreams.c \

        $(CHIBIOS)/os/hal/lib/streams/chprintf.c \

-       $(CHIBIOS)/community/os/various/devices_lib/lcd/ili9341.c \

+       $(CHIBIOS_CONTRIB)/os/various/devices_lib/lcd/ili9341.c \

        ./main.c \

        ./wolf3d_palette.c \

        ./res/wolf3d_vgagraph_chunk87.c \

@@ -153,7 +153,7 @@ INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
          $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \

          $(CHIBIOS)/os/various \

          $(CHIBIOS)/os/hal/lib/streams \

-         $(CHIBIOS)/community/os/various/devices_lib/lcd \

+         $(CHIBIOS_CONTRIB)/os/various/devices_lib/lcd \

          ./res \

          # eol

 

diff --git a/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/Makefile b/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/Makefile
index ac6db0e..961e4ee 100644
--- a/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/Makefile
+++ b/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/Makefile
@@ -90,8 +90,8 @@ CHIBIOS = ../../../..
 # Startup files.

 include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk

 # HAL-OSAL files (optional).

-include $(CHIBIOS)/community/os/hal/hal.mk

-include $(CHIBIOS)/community/os/hal/ports/STM32/STM32F4xx/platform.mk

+include $(CHIBIOS_CONTRIB)/os/hal/hal.mk

+include $(CHIBIOS_CONTRIB)/os/hal/ports/STM32/STM32F4xx/platform.mk

 include $(CHIBIOS)/os/hal/boards/ST_STM32F429I_DISCOVERY/board.mk

 include $(CHIBIOS)/os/hal/osal/rt/osal.mk

 # RTOS files (optional).

@@ -116,7 +116,7 @@ CSRC = $(STARTUPSRC) \
        $(CHIBIOS)/os/various/shell.c \

        $(CHIBIOS)/os/hal/lib/streams/memstreams.c \

        $(CHIBIOS)/os/hal/lib/streams/chprintf.c \

-       $(CHIBIOS)/community/os/various/tribuf.c \

+       $(CHIBIOS_CONTRIB)/os/various/tribuf.c \

        ./usbcfg.c \

        ./main.c \

        # eol

@@ -152,7 +152,7 @@ INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
          $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \

          $(CHIBIOS)/os/various \

          $(CHIBIOS)/os/hal/lib/streams \

-         $(CHIBIOS)/community/os/various \

+         $(CHIBIOS_CONTRIB)/os/various \

          # eol

 

 #

diff --git a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/Makefile b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/Makefile
index 884406a..c43e2aa 100644
--- a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/Makefile
+++ b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/Makefile
@@ -82,11 +82,11 @@ PROJECT = ch
 # Imported source files and paths
 CHIBIOS = ../../../..
 # Startup files.
-include $(CHIBIOS)/community/os/common/ports/ARMCMx/compilers/GCC/mk/startup_tm4c123x.mk
+include $(CHIBIOS_CONTRIB)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_tm4c123x.mk
 # HAL-OSAL files (optional).
 include $(CHIBIOS)/os/hal/hal.mk
-include $(CHIBIOS)/community/os/hal/ports/TIVA/TM4C123x/platform.mk
-include $(CHIBIOS)/community/os/hal/boards/TI_TM4C123G_LAUNCHPAD/board.mk
+include $(CHIBIOS_CONTRIB)/os/hal/ports/TIVA/TM4C123x/platform.mk
+include $(CHIBIOS_CONTRIB)/os/hal/boards/TI_TM4C123G_LAUNCHPAD/board.mk
 include $(CHIBIOS)/os/hal/osal/rt/osal.mk
 # RTOS files (optional).
 include $(CHIBIOS)/os/rt/rt.mk
diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/Makefile b/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/Makefile
index ed53024..7f833f8 100644
--- a/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/Makefile
+++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/Makefile
@@ -82,11 +82,11 @@ PROJECT = ch
 # Imported source files and paths
 CHIBIOS = ../../../..
 # Startup files.
-include $(CHIBIOS)/community/os/common/ports/ARMCMx/compilers/GCC/mk/startup_tm4c129x.mk
+include $(CHIBIOS_CONTRIB)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_tm4c129x.mk
 # HAL-OSAL files (optional).
 include $(CHIBIOS)/os/hal/hal.mk
-include $(CHIBIOS)/community/os/hal/ports/TIVA/TM4C129x/platform.mk
-include $(CHIBIOS)/community/os/hal/boards/TI_TM4C1294_LAUNCHPAD/board.mk
+include $(CHIBIOS_CONTRIB)/os/hal/ports/TIVA/TM4C129x/platform.mk
+include $(CHIBIOS_CONTRIB)/os/hal/boards/TI_TM4C1294_LAUNCHPAD/board.mk
 include $(CHIBIOS)/os/hal/osal/rt/osal.mk
 # RTOS files (optional).
 include $(CHIBIOS)/os/rt/rt.mk
diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/Makefile b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/Makefile
index 12680c1..d7b834c 100644
--- a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/Makefile
+++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/Makefile
@@ -82,11 +82,11 @@ PROJECT = ch
 # Imported source files and paths
 CHIBIOS = ../../../..
 # Startup files.
-include $(CHIBIOS)/community/os/common/ports/ARMCMx/compilers/GCC/mk/startup_tm4c129x.mk
+include $(CHIBIOS_CONTRIB)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_tm4c129x.mk
 # HAL-OSAL files (optional).
 include $(CHIBIOS)/os/hal/hal.mk
-include $(CHIBIOS)/community/os/hal/ports/TIVA/TM4C129x/platform.mk
-include $(CHIBIOS)/community/os/hal/boards/TI_TM4C1294_LAUNCHPAD/board.mk
+include $(CHIBIOS_CONTRIB)/os/hal/ports/TIVA/TM4C129x/platform.mk
+include $(CHIBIOS_CONTRIB)/os/hal/boards/TI_TM4C1294_LAUNCHPAD/board.mk
 include $(CHIBIOS)/os/hal/osal/rt/osal.mk
 # RTOS files (optional).
 include $(CHIBIOS)/os/rt/rt.mk
diff --git a/demos/various/RT-Win32-TriBuf/Makefile b/demos/various/RT-Win32-TriBuf/Makefile
index 8674226..40e5179 100644
--- a/demos/various/RT-Win32-TriBuf/Makefile
+++ b/demos/various/RT-Win32-TriBuf/Makefile
@@ -73,7 +73,7 @@ SRC =  $(PORTSRC) \
        $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

-       $(CHIBIOS)/community/os/various/tribuf.c \

+       $(CHIBIOS_CONTRIB)/os/various/tribuf.c \

        main.c \

        # eol

 

@@ -83,7 +83,7 @@ ASRC =
 # List all user directories here

 UINCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

           $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

-          $(CHIBIOS)/community/os/various/ \

+          $(CHIBIOS_CONTRIB)/os/various/ \

           # eol

 

 # List the user directory to look for the libraries here