Cleanup includes in board.h and fix dfu an main build accordingly

Author: pennam

app/board.h

@@ -19,21 +19,7 @@
 #ifndef __TARGET_INIT_H
 #define __TARGET_INIT_H
 
-#include "stm32h7xx_hal.h"
-#include "stm32h7xx_hal_mdma.h"
-#include "stm32h7xx_hal_qspi.h"
-#if MCUBOOT_APPLICATION_DFU
-#include "usbd_core.h"
-#include "usbd_desc.h"
-#include "usbd_dfu.h"
-#include "usbd_dfu_flash.h"
-#endif
-
-#if MCUBOOT_APPLICATION_DFU
-#define APP_DEFAULT_ADD USBD_DFU_APP_DEFAULT_ADD
-#else
-#define APP_DEFAULT_ADD 0x08040000
-#endif
+#define BOARD_APP_DEFAULT_ADD 0x08040000
 
 #define BOOTLOADER_CONFIG_MAGIC   0xA0
 #define BOOTLOADER_VERSION        4

app/dfu/usbd_conf.c

@@ -21,6 +21,9 @@
 
 /* Includes ------------------------------------------------------------------ */
 #include "board.h"
+#include "usbd_core.h"
+#include "usbd_desc.h"
+#include "usbd_conf.h"
 
 /* Private typedef ----------------------------------------------------------- */
 /* Private define ------------------------------------------------------------ */

app/dfu/usbd_conf.h

@@ -22,6 +22,7 @@
 #define __USBD_CONF_H
 
 /* Includes ------------------------------------------------------------------*/
+#include "board.h"
 #include "stm32h7xx_hal.h"
 #include <stdio.h>
 #include <stdlib.h>
@@ -40,7 +41,7 @@
 /* DFU Class Config */
 #define USBD_DFU_MAX_ITF_NUM                   4
 #define USBD_DFU_XFER_SIZE                     4096   /* Max DFU Packet Size = 4096 bytes */
-#define USBD_DFU_APP_DEFAULT_ADD               0x08040000 /* The first sector (32 KB) is reserved for DFU code */
+#define USBD_DFU_APP_DEFAULT_ADD               BOARD_APP_DEFAULT_ADD /* The first sector (32 KB) is reserved for DFU code */
 #define USBD_DFU_MAX_NB_OF_SECTORS             16 /* Max number of sectors */
 
 #define CDC_CLASS_DESC_SIZE                    (8 + 58)

app/main.cpp

@@ -29,6 +29,11 @@
 #include "bootutil/image.h"
 #include "mbedtls/platform.h"
 
+#if MCUBOOT_APPLICATION_DFU
+#include "usbd_desc.h"
+#include "usbd_dfu_flash.h"
+#endif
+
 // clock source is selected with CLOCK_SOURCE in json config
 #define USE_PLL_HSE_EXTC     0x8  // Use external clock (ST Link MCO)
 #define USE_PLL_HSE_XTAL     0x4  // Use external xtal (X3 on board - not provided by default)
@@ -268,9 +273,9 @@ int main(void) {
 
       if (valid_application()) {
         /* Boot Sketch */
-        BOOT_LOG_INF("Booting sketch at 0x%x\n", APP_DEFAULT_ADD);
+        BOOT_LOG_INF("Booting sketch at 0x%x\n", BOARD_APP_DEFAULT_ADD);
         RTCSetBKPRegister(RTC_BKP_DR0, 0);
-        mbed_start_application(APP_DEFAULT_ADD);
+        mbed_start_application(BOARD_APP_DEFAULT_ADD);
       } else {
         BOOT_LOG_INF("No sketch found");
       }