From dad1110181ff6a3ea405744c097d98adc75df02a Mon Sep 17 00:00:00 2001 From: jflyper Date: Sun, 5 May 2019 00:20:36 +0900 Subject: [PATCH] [H7] Relocate LD files to match betaflight/master branch --- make/mcu/STM32H7.mk | 3 --- src/{main/target => }/link/stm32_flash_h743_2m.ld | 0 src/{main/target => }/link/stm32_flash_h750_128k.ld | 0 src/{main/target => }/link/stm32_flash_h750_exst.ld | 0 4 files changed, 3 deletions(-) rename src/{main/target => }/link/stm32_flash_h743_2m.ld (100%) rename src/{main/target => }/link/stm32_flash_h750_128k.ld (100%) rename src/{main/target => }/link/stm32_flash_h750_exst.ld (100%) diff --git a/make/mcu/STM32H7.mk b/make/mcu/STM32H7.mk index 5572b563e9..3c4f2e8d35 100644 --- a/make/mcu/STM32H7.mk +++ b/make/mcu/STM32H7.mk @@ -2,9 +2,6 @@ # H7 Make file include # -# Override LINKER_DIR until H7 merge is complete -LINKER_DIR = $(ROOT)/src/main/target/link - ifeq ($(DEBUG_HARDFAULTS),H7) CFLAGS += -DDEBUG_HARDFAULTS endif diff --git a/src/main/target/link/stm32_flash_h743_2m.ld b/src/link/stm32_flash_h743_2m.ld similarity index 100% rename from src/main/target/link/stm32_flash_h743_2m.ld rename to src/link/stm32_flash_h743_2m.ld diff --git a/src/main/target/link/stm32_flash_h750_128k.ld b/src/link/stm32_flash_h750_128k.ld similarity index 100% rename from src/main/target/link/stm32_flash_h750_128k.ld rename to src/link/stm32_flash_h750_128k.ld diff --git a/src/main/target/link/stm32_flash_h750_exst.ld b/src/link/stm32_flash_h750_exst.ld similarity index 100% rename from src/main/target/link/stm32_flash_h750_exst.ld rename to src/link/stm32_flash_h750_exst.ld