moved app_config data to bord_config.h

8 files changed, 36 insertions, 42 deletions

diff --git a/src/drivers/boards/px4cannode-v1/bootloader/can/driver.c b/src/drivers/boards/px4cannode-v1/bootloader/can/driver.c
index 7e0cbf491..8a8958c4d 100644
--- a/src/drivers/boards/px4cannode-v1/bootloader/can/driver.c
+++ b/src/drivers/boards/px4cannode-v1/bootloader/can/driver.c
@@ -39,7 +39,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include "app_config.h"
+#include "board_config.h"
 
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/src/drivers/boards/px4cannode-v1/bootloader/common/app_config.h b/src/drivers/boards/px4cannode-v1/bootloader/common/app_config.h
deleted file mode 100644
index 3f40d6b56..000000000
--- a/src/drivers/boards/px4cannode-v1/bootloader/common/app_config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#pragma once
-
-#include "protocol.h"
-
-#define OPT_TBOOT_MS            2000
-#define OPT_NODE_STATUS_RATE_MS 800
-#define OPT_NODE_INFO_RATE_MS   200
-#define OPT_BL_NUMBER_TIMERS 6
-
-#define OPT_WAIT_FOR_GETNODEINFO 0
-#define OPT_WAIT_FOR_GETNODEINFO_JUMPER_GPIO        1
-#define OPT_WAIT_FOR_GETNODEINFO_JUMPER_GPIO_INVERT 1
-
-#define OPT_CPU_FREQ_HZ 72000000u
-
-#define OPT_ENABLE_WD
-#define OPT_MIN_APP_PROGRESS 0u
-#define OPT_RESTART_TIMEOUT_MS 20000u
-
-#define OPT_APPLICATION_IMAGE_OFFSET 8192u
-#define OPT_APPLICATION_IMAGE_LENGTH 49152u
-
-#define FLASH_BASE STM32_FLASH_BASE
-#define FLASH_NUMBER_PAGES STM32_FLASH_NPAGES
-#define FLASH_PAGE_SIZE STM32_FLASH_PAGESIZE
-#define FLASH_SIZE (FLASH_NUMBER_PAGES*FLASH_PAGE_SIZE)
-
-#define UAVCAN_SERVICE_RETRIES 3u
-#define UAVCAN_SERVICE_TIMEOUT_MS 1000
-#define UAVCAN_NODESTATUS_INTERVAL_MS 500
-
-#define APPLICATION_LOAD_ADDRESS (FLASH_BASE + OPT_APPLICATION_IMAGE_OFFSET)
-#define APPLICATION_SIZE (FLASH_SIZE-OPT_APPLICATION_IMAGE_OFFSET)
-#define APPLICATION_LAST_32BIT_ADDRRESS ((uint32_t *)((APPLICATION_LOAD_ADDRESS+APPLICATION_SIZE)-sizeof(uint32_t)))
-#define APPLICATION_LAST_64BIT_ADDRRESS ((uint64_t *)((APPLICATION_LOAD_ADDRESS+APPLICATION_SIZE)-sizeof(uint64_t)))
-
diff --git a/src/drivers/boards/px4cannode-v1/bootloader/src/board_config.h b/src/drivers/boards/px4cannode-v1/bootloader/src/board_config.h
index 674621a76..605f13efd 100644
--- a/src/drivers/boards/px4cannode-v1/bootloader/src/board_config.h
+++ b/src/drivers/boards/px4cannode-v1/bootloader/src/board_config.h
@@ -47,12 +47,42 @@
  ************************************************************************************/
 
 #include "../../board_config.h"
+#include "protocol.h"
 #include <nuttx/compiler.h>
 #include <stdint.h>
 
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
+#define OPT_TBOOT_MS            2000
+#define OPT_NODE_STATUS_RATE_MS 800
+#define OPT_NODE_INFO_RATE_MS   200
+#define OPT_BL_NUMBER_TIMERS    6
+
+#define OPT_WAIT_FOR_GETNODEINFO 0
+#define OPT_WAIT_FOR_GETNODEINFO_JUMPER_GPIO        1
+#define OPT_WAIT_FOR_GETNODEINFO_JUMPER_GPIO_INVERT 1
+
+#define OPT_ENABLE_WD
+#define OPT_RESTART_TIMEOUT_MS 20000u
+
+#define OPT_APPLICATION_IMAGE_OFFSET 8192u
+#define OPT_APPLICATION_IMAGE_LENGTH 49152u
+
+#define FLASH_BASE STM32_FLASH_BASE
+#define FLASH_NUMBER_PAGES STM32_FLASH_NPAGES
+#define FLASH_PAGE_SIZE STM32_FLASH_PAGESIZE
+#define FLASH_SIZE (FLASH_NUMBER_PAGES*FLASH_PAGE_SIZE)
+
+#define UAVCAN_SERVICE_RETRIES 3u
+#define UAVCAN_SERVICE_TIMEOUT_MS 1000
+#define UAVCAN_NODESTATUS_INTERVAL_MS 500
+
+#define APPLICATION_LOAD_ADDRESS (FLASH_BASE + OPT_APPLICATION_IMAGE_OFFSET)
+#define APPLICATION_SIZE (FLASH_SIZE-OPT_APPLICATION_IMAGE_OFFSET)
+#define APPLICATION_LAST_32BIT_ADDRRESS ((uint32_t *)((APPLICATION_LOAD_ADDRESS+APPLICATION_SIZE)-sizeof(uint32_t)))
+#define APPLICATION_LAST_64BIT_ADDRRESS ((uint64_t *)((APPLICATION_LOAD_ADDRESS+APPLICATION_SIZE)-sizeof(uint64_t)))
+
 
 /* Bootloader Option*****************************************************************
  *
diff --git a/src/drivers/boards/px4cannode-v1/bootloader/src/boot.c b/src/drivers/boards/px4cannode-v1/bootloader/src/boot.c
index 57897910e..def248819 100644
--- a/src/drivers/boards/px4cannode-v1/bootloader/src/boot.c
+++ b/src/drivers/boards/px4cannode-v1/bootloader/src/boot.c
@@ -39,7 +39,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include "app_config.h"
+#include "board_config.h"
 
 #include <debug.h>
 #include <arch/board/board.h>
diff --git a/src/drivers/boards/px4cannode-v1/bootloader/src/flash.c b/src/drivers/boards/px4cannode-v1/bootloader/src/flash.c
index 8c28b1fbd..de0522281 100644
--- a/src/drivers/boards/px4cannode-v1/bootloader/src/flash.c
+++ b/src/drivers/boards/px4cannode-v1/bootloader/src/flash.c
@@ -1,5 +1,5 @@
 #include <nuttx/config.h>
-#include "app_config.h"
+#include "board_config.h"
 
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/src/drivers/boards/px4cannode-v1/bootloader/src/timer.c b/src/drivers/boards/px4cannode-v1/bootloader/src/timer.c
index ebb8fecbc..6f2014063 100644
--- a/src/drivers/boards/px4cannode-v1/bootloader/src/timer.c
+++ b/src/drivers/boards/px4cannode-v1/bootloader/src/timer.c
@@ -1,7 +1,7 @@
 
 #include <nuttx/config.h>
 
-#include "app_config.h"
+#include "board_config.h"
 
 #include <sys/types.h>
 #include <stdint.h>
diff --git a/src/drivers/boards/px4cannode-v1/bootloader/uavcan/main.c b/src/drivers/boards/px4cannode-v1/bootloader/uavcan/main.c
index 6be947458..d7859ea7a 100644
--- a/src/drivers/boards/px4cannode-v1/bootloader/uavcan/main.c
+++ b/src/drivers/boards/px4cannode-v1/bootloader/uavcan/main.c
@@ -1,5 +1,5 @@
 #include <nuttx/config.h>
-#include "app_config.h"
+#include "board_config.h"
 
 #include <nuttx/arch.h>
 
diff --git a/src/drivers/boards/px4cannode-v1/bootloader/uavcan/protocol.c b/src/drivers/boards/px4cannode-v1/bootloader/uavcan/protocol.c
index fdd078113..edc6135c8 100644
--- a/src/drivers/boards/px4cannode-v1/bootloader/uavcan/protocol.c
+++ b/src/drivers/boards/px4cannode-v1/bootloader/uavcan/protocol.c
@@ -1,5 +1,5 @@
 #include <nuttx/config.h>
-#include "app_config.h"
+#include "board_config.h"
 
 #include <stdint.h>
 #include <stdlib.h>