diff --git a/boards/cuav/can-gps-v1/canbootloader.cmake b/boards/cuav/can-gps-v1/canbootloader.cmake index d87b5b3511..765f4a895b 100644 --- a/boards/cuav/can-gps-v1/canbootloader.cmake +++ b/boards/cuav/can-gps-v1/canbootloader.cmake @@ -7,8 +7,8 @@ add_definitions( -DAPP_VERSION_MINOR=${uavcanblid_sw_version_minor} ) -set(uavcanblid_hw_version_major 1) -set(uavcanblid_hw_version_minor 0) +set(uavcanblid_hw_version_major 3) +set(uavcanblid_hw_version_minor 233) set(uavcanblid_name "\"org.cuav.can-gps-v1\"") add_definitions( diff --git a/boards/cuav/can-gps-v1/default.cmake b/boards/cuav/can-gps-v1/default.cmake index 0515102c9a..b17c7c80b8 100644 --- a/boards/cuav/can-gps-v1/default.cmake +++ b/boards/cuav/can-gps-v1/default.cmake @@ -8,8 +8,8 @@ add_definitions( -DAPP_VERSION_MINOR=${uavcanblid_sw_version_minor} ) -set(uavcanblid_hw_version_major 1) -set(uavcanblid_hw_version_minor 0) +set(uavcanblid_hw_version_major 3) +set(uavcanblid_hw_version_minor 233) set(uavcanblid_name "\"org.cuav.can-gps-v1\"") add_definitions( diff --git a/boards/cuav/can-gps-v1/nuttx-config/scripts/canbootloader_script.ld b/boards/cuav/can-gps-v1/nuttx-config/scripts/canbootloader_script.ld index cbf9fddc32..758a42609b 100644 --- a/boards/cuav/can-gps-v1/nuttx-config/scripts/canbootloader_script.ld +++ b/boards/cuav/can-gps-v1/nuttx-config/scripts/canbootloader_script.ld @@ -50,8 +50,9 @@ MEMORY { - flash (rx) : ORIGIN = 0x08000000, LENGTH = 32K - sram (rwx) : ORIGIN = 0x20000000, LENGTH = 192K + flash (rx) : ORIGIN = 0x08000000, LENGTH = 32K + shared_sram (rwx) : ORIGIN = 0x20000000, LENGTH = 256 + sram (rwx) : ORIGIN = 0x20000100, LENGTH = 192K - 256 } OUTPUT_ARCH(arm) @@ -101,6 +102,10 @@ SECTIONS _eronly = ABSOLUTE(.); + .app_bl_shared : { + _sapp_bl_shared = ABSOLUTE(.); + } > shared_sram + .data : { _sdata = ABSOLUTE(.); *(.data .data.*) diff --git a/boards/cuav/can-gps-v1/nuttx-config/scripts/script.ld b/boards/cuav/can-gps-v1/nuttx-config/scripts/script.ld index ccd8ad4b0b..4e866c5acf 100644 --- a/boards/cuav/can-gps-v1/nuttx-config/scripts/script.ld +++ b/boards/cuav/can-gps-v1/nuttx-config/scripts/script.ld @@ -50,8 +50,9 @@ MEMORY { - flash (rx) : ORIGIN = 0x08010000, LENGTH = 448K - sram (rwx) : ORIGIN = 0x20000000, LENGTH = 192K + flash (rx) : ORIGIN = 0x08010000, LENGTH = 448K + shared_sram (rwx) : ORIGIN = 0x20000000, LENGTH = 256 + sram (rwx) : ORIGIN = 0x20000100, LENGTH = 192K - 256 } OUTPUT_ARCH(arm) @@ -114,6 +115,10 @@ SECTIONS _eronly = ABSOLUTE(.); + .app_bl_shared : { + _sapp_bl_shared = ABSOLUTE(.); + } > shared_sram + .data : { _sdata = ABSOLUTE(.); *(.data .data.*)