Merge pull request #149 from marcoveeneman/improve_tiva_makefiles

Improve tiva makefiles

9 files changed, 44 insertions, 18 deletions

diff --git a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_tm4c123x.mk b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_tm4c123x.mk
index e87e60d..835faca 100644
--- a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_tm4c123x.mk
+++ b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_tm4c123x.mk
@@ -11,3 +11,8 @@ STARTUPINC = $(CHIBIOS)/os/common/portability/GCC \
              $(CHIBIOS_CONTRIB)/os/common/ext/TivaWare
 
 STARTUPLD  = $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/ld
+
+# Shared variables
+ALLXASMSRC += $(STARTUPASM)
+ALLCSRC    += $(STARTUPSRC)
+ALLINC     += $(STARTUPINC)
diff --git a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_tm4c129x.mk b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_tm4c129x.mk
index c8c5f82..ac4f76e 100644
--- a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_tm4c129x.mk
+++ b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_tm4c129x.mk
@@ -11,3 +11,8 @@ STARTUPINC = $(CHIBIOS)/os/common/portability/GCC \
              $(CHIBIOS_CONTRIB)/os/common/ext/TivaWare
 
 STARTUPLD  = $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/ld
+
+# Shared variables
+ALLXASMSRC += $(STARTUPASM)
+ALLCSRC    += $(STARTUPSRC)
+ALLINC     += $(STARTUPINC)
diff --git a/os/hal/boards/TI_TM4C123G_LAUNCHPAD/board.mk b/os/hal/boards/TI_TM4C123G_LAUNCHPAD/board.mk
index 8232a30..22b5467 100644
--- a/os/hal/boards/TI_TM4C123G_LAUNCHPAD/board.mk
+++ b/os/hal/boards/TI_TM4C123G_LAUNCHPAD/board.mk
@@ -3,3 +3,7 @@ BOARDSRC = ${CHIBIOS_CONTRIB}/os/hal/boards/TI_TM4C123G_LAUNCHPAD/board.c
 
 # Required include directories
 BOARDINC = ${CHIBIOS_CONTRIB}/os/hal/boards/TI_TM4C123G_LAUNCHPAD
+
+# Shared variables
+ALLCSRC += $(BOARDSRC)
+ALLINC  += $(BOARDINC)
diff --git a/os/hal/boards/TI_TM4C1294_LAUNCHPAD/board.mk b/os/hal/boards/TI_TM4C1294_LAUNCHPAD/board.mk
index 56298eb..e95de0b 100644
--- a/os/hal/boards/TI_TM4C1294_LAUNCHPAD/board.mk
+++ b/os/hal/boards/TI_TM4C1294_LAUNCHPAD/board.mk
@@ -3,3 +3,7 @@ BOARDSRC = ${CHIBIOS_CONTRIB}/os/hal/boards/TI_TM4C1294_LAUNCHPAD/board.c
 
 # Required include directories
 BOARDINC = ${CHIBIOS_CONTRIB}/os/hal/boards/TI_TM4C1294_LAUNCHPAD
+
+# Shared variables
+ALLCSRC += $(BOARDSRC)
+ALLINC  += $(BOARDINC)
diff --git a/os/hal/ports/TIVA/LLD/GPIO/hal_pal_lld.h b/os/hal/ports/TIVA/LLD/GPIO/hal_pal_lld.h
index 993d5c3..e884a92 100644
--- a/os/hal/ports/TIVA/LLD/GPIO/hal_pal_lld.h
+++ b/os/hal/ports/TIVA/LLD/GPIO/hal_pal_lld.h
@@ -665,82 +665,82 @@ typedef uint32_t iopadid_t;
 #error "Invalid IRQ priority assigned to GPION"
 #endif
 
-#if TIVA_HAS_GPIOP0 &&                                                         \
+#if TIVA_HAS_GPIOP &&                                                         \
     !OSAL_IRQ_IS_VALID_PRIORITY(TIVA_PAL_GPIOP0_IRQ_PRIORITY)
 #error "Invalid IRQ priority assigned to GPIOP0"
 #endif
 
-#if TIVA_HAS_GPIOP1 &&                                                         \
+#if TIVA_HAS_GPIOP &&                                                         \
     !OSAL_IRQ_IS_VALID_PRIORITY(TIVA_PAL_GPIOP1_IRQ_PRIORITY)
 #error "Invalid IRQ priority assigned to GPIOP1"
 #endif
 
-#if TIVA_HAS_GPIOP2 &&                                                         \
+#if TIVA_HAS_GPIOP &&                                                         \
     !OSAL_IRQ_IS_VALID_PRIORITY(TIVA_PAL_GPIOP2_IRQ_PRIORITY)
 #error "Invalid IRQ priority assigned to GPIOP2"
 #endif
 
-#if TIVA_HAS_GPIOP3 &&                                                         \
+#if TIVA_HAS_GPIOP &&                                                         \
     !OSAL_IRQ_IS_VALID_PRIORITY(TIVA_PAL_GPIOP3_IRQ_PRIORITY)
 #error "Invalid IRQ priority assigned to GPIOP3"
 #endif
 
-#if TIVA_HAS_GPIOP4 &&                                                         \
+#if TIVA_HAS_GPIOP &&                                                         \
     !OSAL_IRQ_IS_VALID_PRIORITY(TIVA_PAL_GPIOP4_IRQ_PRIORITY)
 #error "Invalid IRQ priority assigned to GPIOP4"
 #endif
 
-#if TIVA_HAS_GPIOP5 &&                                                         \
+#if TIVA_HAS_GPIOP &&                                                         \
     !OSAL_IRQ_IS_VALID_PRIORITY(TIVA_PAL_GPIOP5_IRQ_PRIORITY)
 #error "Invalid IRQ priority assigned to GPIOP5"
 #endif
 
-#if TIVA_HAS_GPIOP6 &&                                                         \
+#if TIVA_HAS_GPIOP &&                                                         \
     !OSAL_IRQ_IS_VALID_PRIORITY(TIVA_PAL_GPIOP6_IRQ_PRIORITY)
 #error "Invalid IRQ priority assigned to GPIOP6"
 #endif
 
-#if TIVA_HAS_GPIOP7 &&                                                         \
+#if TIVA_HAS_GPIOP &&                                                         \
     !OSAL_IRQ_IS_VALID_PRIORITY(TIVA_PAL_GPIOP7_IRQ_PRIORITY)
 #error "Invalid IRQ priority assigned to GPIOP7"
 #endif
 
-#if TIVA_HAS_GPIOQ0 &&                                                         \
+#if TIVA_HAS_GPIOQ &&                                                         \
     !OSAL_IRQ_IS_VALID_PRIORITY(TIVA_PAL_GPIOQ0_IRQ_PRIORITY)
 #error "Invalid IRQ priority assigned to GPIOQ0"
 #endif
 
-#if TIVA_HAS_GPIOQ1 &&                                                         \
+#if TIVA_HAS_GPIOQ &&                                                         \
     !OSAL_IRQ_IS_VALID_PRIORITY(TIVA_PAL_GPIOQ1_IRQ_PRIORITY)
 #error "Invalid IRQ priority assigned to GPIOQ1"
 #endif
 
-#if TIVA_HAS_GPIOQ2 &&                                                         \
+#if TIVA_HAS_GPIOQ &&                                                         \
     !OSAL_IRQ_IS_VALID_PRIORITY(TIVA_PAL_GPIOQ2_IRQ_PRIORITY)
 #error "Invalid IRQ priority assigned to GPIOQ2"
 #endif
 
-#if TIVA_HAS_GPIOQ3 &&                                                         \
+#if TIVA_HAS_GPIOQ &&                                                         \
     !OSAL_IRQ_IS_VALID_PRIORITY(TIVA_PAL_GPIOQ3_IRQ_PRIORITY)
 #error "Invalid IRQ priority assigned to GPIOQ3"
 #endif
 
-#if TIVA_HAS_GPIOQ4 &&                                                         \
+#if TIVA_HAS_GPIOQ &&                                                         \
     !OSAL_IRQ_IS_VALID_PRIORITY(TIVA_PAL_GPIOQ4_IRQ_PRIORITY)
 #error "Invalid IRQ priority assigned to GPIOQ4"
 #endif
 
-#if TIVA_HAS_GPIOQ5 &&                                                         \
+#if TIVA_HAS_GPIOQ &&                                                         \
     !OSAL_IRQ_IS_VALID_PRIORITY(TIVA_PAL_GPIOQ5_IRQ_PRIORITY)
 #error "Invalid IRQ priority assigned to GPIOQ5"
 #endif
 
-#if TIVA_HAS_GPIOQ6 &&                                                         \
+#if TIVA_HAS_GPIOQ &&                                                         \
     !OSAL_IRQ_IS_VALID_PRIORITY(TIVA_PAL_GPIOQ6_IRQ_PRIORITY)
 #error "Invalid IRQ priority assigned to GPIOQ6"
 #endif
 
-#if TIVA_HAS_GPIOQ7 &&                                                         \
+#if TIVA_HAS_GPIOQ &&                                                         \
     !OSAL_IRQ_IS_VALID_PRIORITY(TIVA_PAL_GPIOQ7_IRQ_PRIORITY)
 #error "Invalid IRQ priority assigned to GPIOQ7"
 #endif
diff --git a/os/hal/ports/TIVA/LLD/GPTM/hal_st_lld.c b/os/hal/ports/TIVA/LLD/GPTM/hal_st_lld.c
index 7da95b8..0f9576a 100644
--- a/os/hal/ports/TIVA/LLD/GPTM/hal_st_lld.c
+++ b/os/hal/ports/TIVA/LLD/GPTM/hal_st_lld.c
@@ -74,7 +74,7 @@
 #error "TIVA_ST_USE_TIMER specifies an unsupported timer"
 #endif
 
-#if (ST_CLOCK_SRC / OSAL_ST_FREQUENCY) - 1 > 0xFFFF
+#if (TIVA_SYSCLK / OSAL_ST_FREQUENCY) - 1 > 0xFFFF
 #error "the selected ST frequency is not obtainable because TIM timer prescaler limits"
 #endif
 
diff --git a/os/hal/ports/TIVA/TM4C123x/hal_lld.h b/os/hal/ports/TIVA/TM4C123x/hal_lld.h
index 5937b88..5d38a67 100644
--- a/os/hal/ports/TIVA/TM4C123x/hal_lld.h
+++ b/os/hal/ports/TIVA/TM4C123x/hal_lld.h
@@ -203,7 +203,7 @@
 #error "Invalid value for TIVA_BYPASS_VALUE defined"
 #endif
 
-#if (TIVA_OSCSRC == TIVA_RCC_OSCSRC_MOSC) && (TIVA_MOSC_ENABLE == FALSE)
+#if (TIVA_OSCSRC == SYSCTL_RCC2_OSCSRC2_MO) && (TIVA_MOSC_ENABLE == FALSE)
 #error "Main Oscillator selected but not enabled"
 #endif
 
diff --git a/os/hal/ports/TIVA/TM4C123x/platform.mk b/os/hal/ports/TIVA/TM4C123x/platform.mk
index 8372c25..8e447ec 100644
--- a/os/hal/ports/TIVA/TM4C123x/platform.mk
+++ b/os/hal/ports/TIVA/TM4C123x/platform.mk
@@ -27,3 +27,7 @@ include $(CHIBIOS_CONTRIB)/os/hal/ports/TIVA/LLD/SSI/driver.mk
 include $(CHIBIOS_CONTRIB)/os/hal/ports/TIVA/LLD/UART/driver.mk
 include $(CHIBIOS_CONTRIB)/os/hal/ports/TIVA/LLD/uDMA/driver.mk
 include $(CHIBIOS_CONTRIB)/os/hal/ports/TIVA/LLD/WDT/driver.mk
+
+# Shared variables
+ALLCSRC += $(PLATFORMSRC)
+ALLINC  += $(PLATFORMINC)
diff --git a/os/hal/ports/TIVA/TM4C129x/platform.mk b/os/hal/ports/TIVA/TM4C129x/platform.mk
index 934a6c2..9702796 100644
--- a/os/hal/ports/TIVA/TM4C129x/platform.mk
+++ b/os/hal/ports/TIVA/TM4C129x/platform.mk
@@ -28,3 +28,7 @@ include $(CHIBIOS_CONTRIB)/os/hal/ports/TIVA/LLD/SSI/driver.mk
 include $(CHIBIOS_CONTRIB)/os/hal/ports/TIVA/LLD/UART/driver.mk
 include $(CHIBIOS_CONTRIB)/os/hal/ports/TIVA/LLD/uDMA/driver.mk
 include $(CHIBIOS_CONTRIB)/os/hal/ports/TIVA/LLD/WDT/driver.mk
+
+# Shared variables
+ALLCSRC += $(PLATFORMSRC)
+ALLINC  += $(PLATFORMINC)