Merge pull request #150 from marcoveeneman/update_tiva_pal_testhal

Changed directory structure of Tiva PAL testhal

os/hal/ports/TIVA/LLD/SSI/hal_spi_lld.c

@@ -258,7 +258,7 @@ void spi_lld_start(SPIDriver *spip)
       nvicEnableVector(TIVA_SSI1_NUMBER, TIVA_SPI_SSI1_IRQ_PRIORITY);
     }
 #endif
-#if TIVASPI_USE_SSI2
+#if TIVA_SPI_USE_SSI2
     if (&SPID2 == spip) {
       bool b;
       b = udmaChannelAllocate(spip->dmarxnr);

os/hal/ports/TIVA/LLD/SSI/hal_spi_lld.h

@@ -156,7 +156,7 @@
 #error "Invalid IRQ priority assigned to SSI2"
 #endif
 
-#if TM4C123x_SPI_USE_SSI3 && \
+#if TIVA_SPI_USE_SSI3 && \
     !OSAL_IRQ_IS_VALID_PRIORITY(TIVA_SPI_SSI3_IRQ_PRIORITY)
 #error "Invalid IRQ priority assigned to SSI3"
 #endif

testhal/TIVA/multi/PAL/Makefile

@@ -5,19 +5,19 @@
 all:
 	@echo
 	@echo === Building for TM4C123G LaunchPad ================================
-	@make --no-print-directory -f Makefile-tm4c123g_launchpad all
+	@make --no-print-directory -f ./make/tm4c123g_launchpad all
 	@echo ====================================================================
 	@echo
 	@echo === Building for TM4C1294 Connected LaunchPad ======================
-	@make --no-print-directory -f Makefile-tm4c1294_launchpad all
+	@make --no-print-directory -f ./make/tm4c1294_launchpad all
 	@echo ====================================================================
 	@echo
 
 clean:
 	@echo
-	-@make --no-print-directory -f Makefile-tm4c123g_launchpad clean
+	-@make --no-print-directory -f ./make/tm4c123g_launchpad clean
 	@echo
-	-@make --no-print-directory -f Makefile-tm4c1294_launchpad clean
+	-@make --no-print-directory -f ./make/tm4c1294_launchpad clean
 	@echo
 
 #

testhal/TIVA/multi/PAL/make/tm4c123g_launchpad

@@ -88,9 +88,9 @@ PROJECT = ch
 # Imported source files and paths
 CHIBIOS = ../../../../../ChibiOS-RT
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
-CONFDIR  := ./cfg-tm4c123g_launchpad
-BUILDDIR := ./build-tm4c123g_launchpad
-DEPDIR   := ./.dep-tm4c123g_launchpad
+CONFDIR  := ./cfg/tm4c123g_launchpad
+BUILDDIR := ./build/tm4c123g_launchpad
+DEPDIR   := ./.dep/tm4c123g_launchpad
 
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk

testhal/TIVA/multi/PAL/make/tm4c1294_launchpad

@@ -88,9 +88,9 @@ PROJECT = ch
 # Imported source files and paths
 CHIBIOS = ../../../../../ChibiOS-RT
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
-CONFDIR  := ./cfg-tm4c1294_launchpad
-BUILDDIR := ./build-tm4c1294_launchpad
-DEPDIR   := ./.dep-tm4c1294_launchpad
+CONFDIR  := ./cfg/tm4c1294_launchpad
+BUILDDIR := ./build/tm4c1294_launchpad
+DEPDIR   := ./.dep/tm4c1294_launchpad
 
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk