From 5827b0fd6c40bc9c0c8f2d285892ad488a0f26ef Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Sun, 21 Feb 2016 11:17:48 +0100
Subject: [PATCH] Compilation fix on X9E

---
 radio/src/opentx.h                   |  2 +-
 radio/src/targets/taranis/diskio.cpp | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/radio/src/opentx.h b/radio/src/opentx.h
index 8874b5aab..ec78f0d87 100644
--- a/radio/src/opentx.h
+++ b/radio/src/opentx.h
@@ -207,7 +207,7 @@
 
 #if defined(SIMU)
   #define __DMA
-#elif defined(STM32F4)
+#elif defined(STM32F4) && !defined(BOOT)
   #define __DMA __attribute__((section(".ram"), aligned(32)))
 #else
   #define __DMA __ALIGNED
diff --git a/radio/src/targets/taranis/diskio.cpp b/radio/src/targets/taranis/diskio.cpp
index 79f4f0283..53e9a5d1e 100644
--- a/radio/src/targets/taranis/diskio.cpp
+++ b/radio/src/targets/taranis/diskio.cpp
@@ -210,7 +210,7 @@ void release_spi (void)
 
 #ifdef SD_USE_DMA
 
-#if defined(STM32F4)
+#if defined(STM32F4) && !defined(BOOT)
 WORD rw_workbyte[1] __DMA;
 #endif
 
@@ -227,7 +227,7 @@ void stm32_dma_transfer(
 )
 {
   DMA_InitTypeDef DMA_InitStructure;
-#if defined(STM32F4)
+#if defined(STM32F4) && !defined(BOOT)
   rw_workbyte[0] = 0xffff;
 #else
   WORD rw_workbyte[] = { 0xffff };
@@ -387,7 +387,7 @@ void power_off (void)
 /* Receive a data packet from MMC                                        */
 /*-----------------------------------------------------------------------*/
 
-#if defined(SD_USE_DMA) && defined(STM32F4)
+#if defined(SD_USE_DMA) && defined(STM32F4) && !defined(BOOT)
   uint8_t sd_buff[512] __DMA;
 #endif
 
@@ -410,7 +410,7 @@ BOOL rcvr_datablock (
     return FALSE; /* If not valid data token, return with error */
   }
 
-#if defined(SD_USE_DMA) && defined(STM32F4)
+#if defined(SD_USE_DMA) && defined(STM32F4) && !defined(BOOT)
   stm32_dma_transfer(TRUE, sd_buff, btr);
   memcpy(buff, sd_buff, btr);
 #elif defined(SD_USE_DMA)
@@ -458,7 +458,7 @@ BOOL xmit_datablock (
   xmit_spi(token);                                        /* transmit data token */
   if (token != 0xFD) {    /* Is data token */
 
-#if defined(SD_USE_DMA) && defined(STM32F4)
+#if defined(SD_USE_DMA) && defined(STM32F4) && !defined(BOOT)
   memcpy(sd_buff, buff, 512);
   stm32_dma_transfer(FALSE, sd_buff, 512);
 #elif defined(SD_USE_DMA)