Merge pull request ARMmbed#23 from linlingao/dbghdr_arm

Added a section to store dbghdr to the linker files

Author: linlingao

targets/TARGET_TI/TARGET_CC32XX/TARGET_CC3220SF/device/CC3220SF_LAUNCHXL.c

@@ -93,13 +93,13 @@ void CC3220SF_LAUNCHXL_initGeneral(void)
                              0, PRCM_RUN_MODE_CLK );
 }
 
-//TODO: Support other toolchains!
-//#if defined(__SF_DEBUG__)
-//#if defined TOOLCHAIN_ARM
-//__attribute__ ((section (FLASH_HDR)))
-//#elif defined TOOLCHAIN_IAR
-//#pragma data_location=".dbghdr"
-#if defined TOOLCHAIN_GCC_ARM
+#define __SF_DEBUG__
+#if defined(__SF_DEBUG__)
+#if defined TOOLCHAIN_ARM
+__attribute__((at(0x01000000)))
+#elif defined TOOLCHAIN_IAR
+#pragma default_variable_attributes = @ ".dbghdr"
+#elif defined TOOLCHAIN_GCC_ARM
 __attribute__ ((section (".dbghdr")))
 #endif
 const unsigned long ulDebugHeader[]=
@@ -108,4 +108,4 @@ const unsigned long ulDebugHeader[]=
                 0x000FF800,
                 0xEFA3247D
 };
-//#endif
+#endif

targets/TARGET_TI/TARGET_CC32XX/TARGET_CC3220SF/device/TOOLCHAIN_ARM_STD/CC3220SF.sct

@@ -1,21 +1,22 @@
 #! armcc -E
 
 /* Device specific values */
-
-#define ROM_START   0x01000000
-#define ROM_SIZE    0x100000
-#define RAM_START   0x20000000
-#define RAM_SIZE    0x40000
-#define VECTORS     195   /* This value must match NVIC_NUM_VECTORS */
+#define ROM_START       0x01000000
+#define ROM_SIZE        0x100000
+#define FLASH_HDR_START ROM_START
+#define FLASH_HDR_SIZE  0x800
+#define RAM_START       0x20000000
+#define RAM_SIZE        0x40000
+#define VECTORS         195   /* This value must match NVIC_NUM_VECTORS */
 
 /* Common - Do not change */
 
 #if !defined(MBED_APP_START)
-  #define MBED_APP_START ROM_START
+  #define MBED_APP_START (ROM_START + FLASH_HDR_SIZE)
 #endif
 
 #if !defined(MBED_APP_SIZE)
-  #define MBED_APP_SIZE ROM_SIZE
+  #define MBED_APP_SIZE (ROM_SIZE - FLASH_HDR_SIZE)
 #endif
 
 /* Round up VECTORS_SIZE to 8 bytes */

targets/TARGET_TI/TARGET_CC32XX/TARGET_CC3220SF/device/TOOLCHAIN_GCC_ARM/gcc_arm.ld

@@ -3,27 +3,27 @@
 #define ROM_START       0x01000000
 #define ROM_SIZE        0x100000
 #define FLASH_HDR_START ROM_START
-#define FLASH_HDR_SIZE  0x7FF
+#define FLASH_HDR_SIZE  0x800
 #define RAM_START       0x20000000
 #define RAM_SIZE        0x40000
 #define VECTORS         195   /* This value must match NVIC_NUM_VECTORS */
 
 /* Common - Do not change */
 
 #if !defined(MBED_APP_START)
-  #define MBED_APP_START (ROM_START + FLASH_HDR_SIZE + 1)
+  #define MBED_APP_START (ROM_START + FLASH_HDR_SIZE)
 #endif
 
 #if !defined(MBED_APP_SIZE)
-  #define MBED_APP_SIZE (ROM_SIZE - FLASH_HDR_SIZE - 1)
+  #define MBED_APP_SIZE (ROM_SIZE - FLASH_HDR_SIZE)
 #endif
 
 /* Round up VECTORS_SIZE to 8 bytes */
 #define VECTORS_SIZE (((VECTORS * 4) + 7) & 0xFFFFFFF8)
 
 MEMORY
 {
-    FLASH_HDR (rx) : ORIGIN = ROM_START, LENGTH = 0x7FF
+    FLASH_HDR (rx) : ORIGIN = ROM_START, LENGTH = 0x800
     FLASH (rx)     : ORIGIN = MBED_APP_START, LENGTH = MBED_APP_SIZE
     RAM (rwx)      : ORIGIN = RAM_START + VECTORS_SIZE, LENGTH = RAM_SIZE - VECTORS_SIZE
 }

targets/TARGET_TI/TARGET_CC32XX/TARGET_CC3220SF/device/TOOLCHAIN_IAR/CC3220SF.icf

@@ -1,20 +1,22 @@
 /* Device specific values */
 
-define symbol ROM_START   = 0x01000000;
-define symbol ROM_SIZE    = 0x100000;
-define symbol RAM_START   = 0x20000000;
-define symbol RAM_SIZE    = 0x40000;
-define symbol VECTORS     = 195; /* This value must match NVIC_NUM_VECTORS */
-define symbol HEAP_SIZE   = 0x8000;
+define symbol ROM_START       = 0x01000000;
+define symbol ROM_SIZE        = 0x100000;
+define symbol FLASH_HDR_START = ROM_START;
+define symbol FLASH_HDR_SIZE  = 0x800;
+define symbol RAM_START       = 0x20000000;
+define symbol RAM_SIZE        = 0x40000;
+define symbol VECTORS         = 195; /* This value must match NVIC_NUM_VECTORS */
+define symbol HEAP_SIZE       = 0x8000;
 
 /* Common - Do not change */
 
 if (!isdefinedsymbol(MBED_APP_START)) {
-    define symbol MBED_APP_START = ROM_START;
+    define symbol MBED_APP_START = (ROM_START + FLASH_HDR_SIZE);
 }
 
 if (!isdefinedsymbol(MBED_APP_SIZE)) {
-    define symbol MBED_APP_SIZE = ROM_SIZE;
+    define symbol MBED_APP_SIZE = (ROM_SIZE - FLASH_HDR_SIZE);
 }
 
 /* Round up VECTORS_SIZE to 8 bytes */
@@ -24,9 +26,16 @@ define symbol RAM_REGION_SIZE = RAM_SIZE - VECTORS_SIZE;
 define symbol ISR_STACK_SIZE = 0x400;
 
 define memory mem with size = 4G;
-define region ROM_region = mem:[from MBED_APP_START size MBED_APP_SIZE];
+define region FLASH_HDR_region = mem:[from FLASH_HDR_START size FLASH_HDR_SIZE];
+define region FLASH_region = mem:[from MBED_APP_START size MBED_APP_SIZE];
 define region RAM_region = mem:[from RAM_REGION_START size RAM_REGION_SIZE];
 
+//
+// Keep the debug header
+//
+keep {section .dbghdr};
+place at start of FLASH_HDR_region { readonly section .dbghdr };
+
 define block CSTACK    with alignment = 8, size = ISR_STACK_SIZE   { };
 define block HEAP      with alignment = 8, size = HEAP_SIZE     { };
 
@@ -35,6 +44,6 @@ do not initialize  { section .noinit };
 
 place at address mem: MBED_APP_START { readonly section .intvec };
 
-place in ROM_region   { readonly };
+place in FLASH_region   { readonly };
 place in RAM_region   { readwrite,
                         block CSTACK, block HEAP };