From 526d51aa2b83c7a73a2ecdba8525d2a0847e5587 Mon Sep 17 00:00:00 2001
From: Marti Bolivar <mbolivar@leaflabs.com>
Date: Tue, 15 Nov 2011 08:50:22 -0500
Subject: Tweak family-specific linker file layout.

Move
        support/ld/stm32/f1/performance/vector_symbols.inc
to
        support/ld/stm32/family/f1/performance/vector_symbols.inc

Creating directory "family" under support/ld/stm32 will allow parallel
directories (e.g. support/ld/stm32/mcu) to exist, which allows an
eventual linker script cleanup to go much more smoothly.

Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
---
 support/ld/stm32/f1/performance/vector_symbols.inc | 78 ----------------------
 .../stm32/family/f1/performance/vector_symbols.inc | 78 ++++++++++++++++++++++
 support/make/target-config.mk                      |  2 +-
 3 files changed, 79 insertions(+), 79 deletions(-)
 delete mode 100644 support/ld/stm32/f1/performance/vector_symbols.inc
 create mode 100644 support/ld/stm32/family/f1/performance/vector_symbols.inc

(limited to 'support')

diff --git a/support/ld/stm32/f1/performance/vector_symbols.inc b/support/ld/stm32/f1/performance/vector_symbols.inc
deleted file mode 100644
index f8519bb..0000000
--- a/support/ld/stm32/f1/performance/vector_symbols.inc
+++ /dev/null
@@ -1,78 +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_tamper)
-EXTERN(__irq_rtc)
-EXTERN(__irq_flash)
-EXTERN(__irq_rcc)
-EXTERN(__irq_exti0)
-EXTERN(__irq_exti1)
-EXTERN(__irq_exti2)
-EXTERN(__irq_exti3)
-EXTERN(__irq_exti4)
-EXTERN(__irq_dma1_channel1)
-EXTERN(__irq_dma1_channel2)
-EXTERN(__irq_dma1_channel3)
-EXTERN(__irq_dma1_channel4)
-EXTERN(__irq_dma1_channel5)
-EXTERN(__irq_dma1_channel6)
-EXTERN(__irq_dma1_channel7)
-EXTERN(__irq_adc)
-EXTERN(__irq_usb_hp_can_tx)
-EXTERN(__irq_usb_lp_can_rx0)
-EXTERN(__irq_can_rx1)
-EXTERN(__irq_can_sce)
-EXTERN(__irq_exti9_5)
-EXTERN(__irq_tim1_brk)
-EXTERN(__irq_tim1_up)
-EXTERN(__irq_tim1_trg_com)
-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_rtcalarm)
-EXTERN(__irq_usbwakeup)
-
-EXTERN(__irq_tim8_brk)
-EXTERN(__irq_tim8_up)
-EXTERN(__irq_tim8_trg_com)
-EXTERN(__irq_tim8_cc)
-EXTERN(__irq_adc3)
-EXTERN(__irq_fsmc)
-EXTERN(__irq_sdio)
-EXTERN(__irq_tim5)
-EXTERN(__irq_spi3)
-EXTERN(__irq_uart4)
-EXTERN(__irq_uart5)
-EXTERN(__irq_tim6)
-EXTERN(__irq_tim7)
-EXTERN(__irq_dma2_channel1)
-EXTERN(__irq_dma2_channel2)
-EXTERN(__irq_dma2_channel3)
-EXTERN(__irq_dma2_channel4_5)
diff --git a/support/ld/stm32/family/f1/performance/vector_symbols.inc b/support/ld/stm32/family/f1/performance/vector_symbols.inc
new file mode 100644
index 0000000..f8519bb
--- /dev/null
+++ b/support/ld/stm32/family/f1/performance/vector_symbols.inc
@@ -0,0 +1,78 @@
+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_tamper)
+EXTERN(__irq_rtc)
+EXTERN(__irq_flash)
+EXTERN(__irq_rcc)
+EXTERN(__irq_exti0)
+EXTERN(__irq_exti1)
+EXTERN(__irq_exti2)
+EXTERN(__irq_exti3)
+EXTERN(__irq_exti4)
+EXTERN(__irq_dma1_channel1)
+EXTERN(__irq_dma1_channel2)
+EXTERN(__irq_dma1_channel3)
+EXTERN(__irq_dma1_channel4)
+EXTERN(__irq_dma1_channel5)
+EXTERN(__irq_dma1_channel6)
+EXTERN(__irq_dma1_channel7)
+EXTERN(__irq_adc)
+EXTERN(__irq_usb_hp_can_tx)
+EXTERN(__irq_usb_lp_can_rx0)
+EXTERN(__irq_can_rx1)
+EXTERN(__irq_can_sce)
+EXTERN(__irq_exti9_5)
+EXTERN(__irq_tim1_brk)
+EXTERN(__irq_tim1_up)
+EXTERN(__irq_tim1_trg_com)
+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_rtcalarm)
+EXTERN(__irq_usbwakeup)
+
+EXTERN(__irq_tim8_brk)
+EXTERN(__irq_tim8_up)
+EXTERN(__irq_tim8_trg_com)
+EXTERN(__irq_tim8_cc)
+EXTERN(__irq_adc3)
+EXTERN(__irq_fsmc)
+EXTERN(__irq_sdio)
+EXTERN(__irq_tim5)
+EXTERN(__irq_spi3)
+EXTERN(__irq_uart4)
+EXTERN(__irq_uart5)
+EXTERN(__irq_tim6)
+EXTERN(__irq_tim7)
+EXTERN(__irq_dma2_channel1)
+EXTERN(__irq_dma2_channel2)
+EXTERN(__irq_dma2_channel3)
+EXTERN(__irq_dma2_channel4_5)
diff --git a/support/make/target-config.mk b/support/make/target-config.mk
index 592e808..98fc4d0 100644
--- a/support/make/target-config.mk
+++ b/support/make/target-config.mk
@@ -56,7 +56,7 @@ endif
 # are the only ones we support at this time.  If you add support for
 # STM32F1 connectivity line MCUs or other STM32 families, this section
 # will need to change.
-LD_FAMILY_PATH := $(LDDIR)/stm32/f1/performance
+LD_FAMILY_PATH := $(LDDIR)/stm32/family/f1/performance
 LIBMAPLE_MODULE_FAMILY := $(LIBMAPLE_PATH)/stm32f1
 
 # Memory target-specific configuration values
-- 
cgit v1.2.3