From 9daa30c70e3eaf4a95c42f6de055bb6797044c4e Mon Sep 17 00:00:00 2001
From: Marti Bolivar <mbolivar@leaflabs.com>
Date: Wed, 15 Oct 2014 14:51:06 +0800
Subject: Rename various "stm32f2" directories "stm32f2-f4".

Preparatory patch for adding STM32F4 support.

Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
---
 .../ld/stm32/series/stm32f2-f4/vector_symbols.inc  | 98 ++++++++++++++++++++++
 support/ld/stm32/series/stm32f2/vector_symbols.inc | 98 ----------------------
 support/make/target-config.mk                      | 22 +++--
 3 files changed, 113 insertions(+), 105 deletions(-)
 create mode 100644 support/ld/stm32/series/stm32f2-f4/vector_symbols.inc
 delete mode 100644 support/ld/stm32/series/stm32f2/vector_symbols.inc

(limited to 'support')

diff --git a/support/ld/stm32/series/stm32f2-f4/vector_symbols.inc b/support/ld/stm32/series/stm32f2-f4/vector_symbols.inc
new file mode 100644
index 0000000..d275ec3
--- /dev/null
+++ b/support/ld/stm32/series/stm32f2-f4/vector_symbols.inc
@@ -0,0 +1,98 @@
+EXTERN(__msp_init)
+EXTERN(__exc_reset)
+EXTERN(__exc_nmi)
+EXTERN(__exc_hardfault)
+EXTERN(__exc_memmanage)
+EXTERN(__exc_busfault)
+EXTERN(__exc_usagefault)
+EXTERN(__stm32reservedexception7)
+EXTERN(__stm32reservedexception8)
+EXTERN(__stm32reservedexception9)
+EXTERN(__stm32reservedexception10)
+EXTERN(__exc_svc)
+EXTERN(__exc_debug_monitor)
+EXTERN(__stm32reservedexception13)
+EXTERN(__exc_pendsv)
+EXTERN(__exc_systick)
+
+EXTERN(__irq_wwdg)
+EXTERN(__irq_pvd)
+EXTERN(__irq_tamp_stamp)
+EXTERN(__irq_rtc_wkup)
+EXTERN(__irq_flash)
+EXTERN(__irq_rcc)
+EXTERN(__irq_exti0)
+EXTERN(__irq_exti1)
+EXTERN(__irq_exti2)
+EXTERN(__irq_exti3)
+EXTERN(__irq_exti4)
+EXTERN(__irq_dma1_stream0)
+EXTERN(__irq_dma1_stream1)
+EXTERN(__irq_dma1_stream2)
+EXTERN(__irq_dma1_stream3)
+EXTERN(__irq_dma1_stream4)
+EXTERN(__irq_dma1_stream5)
+EXTERN(__irq_dma1_stream6)
+EXTERN(__irq_adc)
+EXTERN(__irq_can1_tx)
+EXTERN(__irq_can1_rx0)
+EXTERN(__irq_can1_rx1)
+EXTERN(__irq_can1_sce)
+EXTERN(__irq_exti9_5)
+EXTERN(__irq_tim1_brk_tim9)
+EXTERN(__irq_tim1_up_tim10)
+EXTERN(__irq_tim1_trg_com_tim11)
+EXTERN(__irq_tim1_cc)
+EXTERN(__irq_tim2)
+EXTERN(__irq_tim3)
+EXTERN(__irq_tim4)
+EXTERN(__irq_i2c1_ev)
+EXTERN(__irq_i2c1_er)
+EXTERN(__irq_i2c2_ev)
+EXTERN(__irq_i2c2_er)
+EXTERN(__irq_spi1)
+EXTERN(__irq_spi2)
+EXTERN(__irq_usart1)
+EXTERN(__irq_usart2)
+EXTERN(__irq_usart3)
+EXTERN(__irq_exti15_10)
+EXTERN(__irq_rtc_alarm)
+EXTERN(__irq_otg_fs_wkup)
+EXTERN(__irq_tim8_brk_tim12)
+EXTERN(__irq_tim8_up_tim13)
+EXTERN(__irq_tim8_trg_com_tim14)
+EXTERN(__irq_tim8_cc)
+EXTERN(__irq_dma1_stream7)
+EXTERN(__irq_fsmc)
+EXTERN(__irq_sdio)
+EXTERN(__irq_tim5)
+EXTERN(__irq_spi3)
+EXTERN(__irq_uart4)
+EXTERN(__irq_uart5)
+EXTERN(__irq_tim6_dac)
+EXTERN(__irq_tim7)
+EXTERN(__irq_dma2_stream0)
+EXTERN(__irq_dma2_stream1)
+EXTERN(__irq_dma2_stream2)
+EXTERN(__irq_dma2_stream3)
+EXTERN(__irq_dma2_stream4)
+EXTERN(__irq_eth)
+EXTERN(__irq_eth_wkup)
+EXTERN(__irq_can2_tx)
+EXTERN(__irq_can2_rx0)
+EXTERN(__irq_can2_rx1)
+EXTERN(__irq_can2_sce)
+EXTERN(__irq_otg_fs)
+EXTERN(__irq_dma2_stream5)
+EXTERN(__irq_dma2_stream6)
+EXTERN(__irq_dma2_stream7)
+EXTERN(__irq_usart6)
+EXTERN(__irq_i2c3_ev)
+EXTERN(__irq_i2c3_er)
+EXTERN(__irq_otg_hs_ep1_out)
+EXTERN(__irq_otg_hs_ep1_in)
+EXTERN(__irq_otg_hs_wkup)
+EXTERN(__irq_otg_hs)
+EXTERN(__irq_dcmi)
+EXTERN(__irq_cryp)
+EXTERN(__irq_hash_rng)
diff --git a/support/ld/stm32/series/stm32f2/vector_symbols.inc b/support/ld/stm32/series/stm32f2/vector_symbols.inc
deleted file mode 100644
index d275ec3..0000000
--- a/support/ld/stm32/series/stm32f2/vector_symbols.inc
+++ /dev/null
@@ -1,98 +0,0 @@
-EXTERN(__msp_init)
-EXTERN(__exc_reset)
-EXTERN(__exc_nmi)
-EXTERN(__exc_hardfault)
-EXTERN(__exc_memmanage)
-EXTERN(__exc_busfault)
-EXTERN(__exc_usagefault)
-EXTERN(__stm32reservedexception7)
-EXTERN(__stm32reservedexception8)
-EXTERN(__stm32reservedexception9)
-EXTERN(__stm32reservedexception10)
-EXTERN(__exc_svc)
-EXTERN(__exc_debug_monitor)
-EXTERN(__stm32reservedexception13)
-EXTERN(__exc_pendsv)
-EXTERN(__exc_systick)
-
-EXTERN(__irq_wwdg)
-EXTERN(__irq_pvd)
-EXTERN(__irq_tamp_stamp)
-EXTERN(__irq_rtc_wkup)
-EXTERN(__irq_flash)
-EXTERN(__irq_rcc)
-EXTERN(__irq_exti0)
-EXTERN(__irq_exti1)
-EXTERN(__irq_exti2)
-EXTERN(__irq_exti3)
-EXTERN(__irq_exti4)
-EXTERN(__irq_dma1_stream0)
-EXTERN(__irq_dma1_stream1)
-EXTERN(__irq_dma1_stream2)
-EXTERN(__irq_dma1_stream3)
-EXTERN(__irq_dma1_stream4)
-EXTERN(__irq_dma1_stream5)
-EXTERN(__irq_dma1_stream6)
-EXTERN(__irq_adc)
-EXTERN(__irq_can1_tx)
-EXTERN(__irq_can1_rx0)
-EXTERN(__irq_can1_rx1)
-EXTERN(__irq_can1_sce)
-EXTERN(__irq_exti9_5)
-EXTERN(__irq_tim1_brk_tim9)
-EXTERN(__irq_tim1_up_tim10)
-EXTERN(__irq_tim1_trg_com_tim11)
-EXTERN(__irq_tim1_cc)
-EXTERN(__irq_tim2)
-EXTERN(__irq_tim3)
-EXTERN(__irq_tim4)
-EXTERN(__irq_i2c1_ev)
-EXTERN(__irq_i2c1_er)
-EXTERN(__irq_i2c2_ev)
-EXTERN(__irq_i2c2_er)
-EXTERN(__irq_spi1)
-EXTERN(__irq_spi2)
-EXTERN(__irq_usart1)
-EXTERN(__irq_usart2)
-EXTERN(__irq_usart3)
-EXTERN(__irq_exti15_10)
-EXTERN(__irq_rtc_alarm)
-EXTERN(__irq_otg_fs_wkup)
-EXTERN(__irq_tim8_brk_tim12)
-EXTERN(__irq_tim8_up_tim13)
-EXTERN(__irq_tim8_trg_com_tim14)
-EXTERN(__irq_tim8_cc)
-EXTERN(__irq_dma1_stream7)
-EXTERN(__irq_fsmc)
-EXTERN(__irq_sdio)
-EXTERN(__irq_tim5)
-EXTERN(__irq_spi3)
-EXTERN(__irq_uart4)
-EXTERN(__irq_uart5)
-EXTERN(__irq_tim6_dac)
-EXTERN(__irq_tim7)
-EXTERN(__irq_dma2_stream0)
-EXTERN(__irq_dma2_stream1)
-EXTERN(__irq_dma2_stream2)
-EXTERN(__irq_dma2_stream3)
-EXTERN(__irq_dma2_stream4)
-EXTERN(__irq_eth)
-EXTERN(__irq_eth_wkup)
-EXTERN(__irq_can2_tx)
-EXTERN(__irq_can2_rx0)
-EXTERN(__irq_can2_rx1)
-EXTERN(__irq_can2_sce)
-EXTERN(__irq_otg_fs)
-EXTERN(__irq_dma2_stream5)
-EXTERN(__irq_dma2_stream6)
-EXTERN(__irq_dma2_stream7)
-EXTERN(__irq_usart6)
-EXTERN(__irq_i2c3_ev)
-EXTERN(__irq_i2c3_er)
-EXTERN(__irq_otg_hs_ep1_out)
-EXTERN(__irq_otg_hs_ep1_in)
-EXTERN(__irq_otg_hs_wkup)
-EXTERN(__irq_otg_hs)
-EXTERN(__irq_dcmi)
-EXTERN(__irq_cryp)
-EXTERN(__irq_hash_rng)
diff --git a/support/make/target-config.mk b/support/make/target-config.mk
index 0e3a2c2..ac5845d 100644
--- a/support/make/target-config.mk
+++ b/support/make/target-config.mk
@@ -24,17 +24,27 @@ include $(BOARD_INCLUDE_DIR)/$(BOARD).mk
 
 # Configuration derived from $(BOARD).mk
 
-LD_SERIES_PATH := $(LDDIR)/stm32/series/$(MCU_SERIES)
+TARGET_SERIES_MODULE := $(MCU_SERIES)
+
+# Override TARGET_SERIES_MODULE for STM32F2 and STM32F4, which are
+# basically the same and thus share a module.
+ifeq ($(MCU_SERIES), stm32f2)
+TARGET_SERIES_MODULE := stm32f2-f4
+endif
+ifeq ($(MCU_SERIES), stm32f4)
+TARGET_SERIES_MODULE := stm32f2-f4
+endif
+
+LIBMAPLE_MODULE_SERIES := $(LIBMAPLE_PATH)/$(TARGET_SERIES_MODULE)
+LD_SERIES_PATH := $(LDDIR)/stm32/series/$(TARGET_SERIES_MODULE)
 LD_MEM_PATH := $(LDDIR)/stm32/mem/$(LD_MEM_DIR)
+
 ifeq ($(MCU_SERIES), stm32f1)
+TARGET_FLAGS += -mcpu=cortex-m3 -march=armv7-m
 # Due to the Balkanization on F1, we need to specify the line when
 # making linker decisions.
 LD_SERIES_PATH := $(LD_SERIES_PATH)/$(MCU_F1_LINE)
 endif
-
-ifeq ($(MCU_SERIES), stm32f1)
-TARGET_FLAGS += -mcpu=cortex-m3 -march=armv7-m
-endif
 ifeq ($(MCU_SERIES), stm32f2)
 TARGET_FLAGS += -mcpu=cortex-m3 -march=armv7-m
 endif
@@ -50,5 +60,3 @@ TARGET_FLAGS += -mthumb -DBOARD_$(BOARD) -DMCU_$(MCU) \
                 -DERROR_LED_PORT=$(ERROR_LED_PORT) \
                 -DERROR_LED_PIN=$(ERROR_LED_PIN) \
                 -D$(VECT_BASE_ADDR)
-
-LIBMAPLE_MODULE_SERIES := $(LIBMAPLE_PATH)/$(MCU_SERIES)
-- 
cgit v1.2.3