Merge pull request #6683 from ganesh-ramachandran/master

Cruz Monrreal · web-flow · commit a27700da3354 · 2018-04-23T10:53:55.000-05:00
Add IAR export and nvstore page size fix for TMPM46B
diff --git a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/flash_api.c b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/flash_api.c
@@ -20,6 +20,7 @@
 
 #define PROGRAM_WIRTE_MAX             16U      /* Page program could be written 16 bytes/4 words once */
 #define SECTOR_SIZE                   0x8000   /* (512 * 8) sectors  */
+#define PAGE_SIZE                     16U      /* Page program size is 16 bytes */
 
 #if defined ( __ICCARM__ )    /* IAR Compiler */
 #define FLASH_API_ROM           ((uint32_t *)__section_begin("FLASH_CODE_ROM"))
@@ -143,7 +144,7 @@ uint32_t flash_get_sector_size(const flash_t *obj, uint32_t address)
 #endif
 uint32_t flash_get_page_size(const flash_t *obj)
 {
-    return FLASH_PAGE_SIZE;
+    return PAGE_SIZE;
 }
 
 #if defined ( __ICCARM__ )    /* IAR Compiler */
diff --git a/tools/export/iar/iar_definitions.json b/tools/export/iar/iar_definitions.json
@@ -273,5 +273,10 @@
     },
     "ADuCM4050": {
         "OGChipSelectEditMenu": "ADuCM4050\tAnalogDevices ADuCM4050"
+    },
+    "TMPM46BF10FG":{
+        "OGChipSelectEditMenu": "TMPM46BF10FG\tToshiba TMPM46BF10FG",
+        "GFPUCoreSlave": 21,
+        "GBECoreSlave": 21
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`
`21`	`21`	`#define PROGRAM_WIRTE_MAX 16U /* Page program could be written 16 bytes/4 words once */`
`22`	`22`	`#define SECTOR_SIZE 0x8000 /* (512 * 8) sectors */`
	`23`	`+#define PAGE_SIZE 16U /* Page program size is 16 bytes */`
`23`	`24`
`24`	`25`	`#if defined ( __ICCARM__ ) /* IAR Compiler */`
`25`	`26`	`#define FLASH_API_ROM ((uint32_t *)__section_begin("FLASH_CODE_ROM"))`
`@@ -143,7 +144,7 @@ uint32_t flash_get_sector_size(const flash_t *obj, uint32_t address)`
`143`	`144`	`#endif`
`144`	`145`	`uint32_t flash_get_page_size(const flash_t *obj)`
`145`	`146`	`{`
`146`		`- return FLASH_PAGE_SIZE;`
	`147`	`+ return PAGE_SIZE;`
`147`	`148`	`}`
`148`	`149`
`149`	`150`	`#if defined ( __ICCARM__ ) /* IAR Compiler */`
Original file line number	Diff line number	Diff line change
`@@ -273,5 +273,10 @@`
`273`	`273`	`},`
`274`	`274`	`"ADuCM4050": {`
`275`	`275`	`"OGChipSelectEditMenu": "ADuCM4050\tAnalogDevices ADuCM4050"`
	`276`	`+ },`
	`277`	`+ "TMPM46BF10FG":{`
	`278`	`+ "OGChipSelectEditMenu": "TMPM46BF10FG\tToshiba TMPM46BF10FG",`
	`279`	`+ "GFPUCoreSlave": 21,`
	`280`	`+ "GBECoreSlave": 21`
`276`	`281`	`}`
`277`	`282`	`}`