X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fnor%2Fefm32.c;h=be9f8eea0a8056913b246ccfc9febd5ae262dc50;hb=refs%2Fchanges%2F26%2F1426%2F4;hp=57566499908e54d74c7946ca136e5e8e7838e2bd;hpb=7ae9154846f6e268c4fbc0c237c1b2c6301da2ce;p=openocd.git

diff --git a/src/flash/nor/efm32.c b/src/flash/nor/efm32.c
index 5756649990..be9f8eea0a 100644
--- a/src/flash/nor/efm32.c
+++ b/src/flash/nor/efm32.c
@@ -24,7 +24,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -85,7 +85,7 @@
 
 struct efm32x_flash_bank {
 	int probed;
-	uint8_t lb_page[LOCKBITS_PAGE_SZ];
+	uint32_t lb_page[LOCKBITS_PAGE_SZ/4];
 };
 
 struct efm32_info {
@@ -169,14 +169,22 @@ static int efm32x_read_info(struct flash_bank *bank,
 		efm32_info->page_size = 512;
 	else if (EFM_FAMILY_ID_GIANT_GECKO == efm32_info->part_family ||
 			EFM_FAMILY_ID_LEOPARD_GECKO == efm32_info->part_family) {
-		uint8_t pg_size = 0;
-
-		ret = target_read_u8(bank->target, EFM32_MSC_DI_PAGE_SIZE,
-			&pg_size);
-		if (ERROR_OK != ret)
-			return ret;
-
-		efm32_info->page_size = (1 << ((pg_size+10) & 0xff));
+		if (efm32_info->prod_rev >= 18) {
+			uint8_t pg_size = 0;
+			ret = target_read_u8(bank->target, EFM32_MSC_DI_PAGE_SIZE,
+				&pg_size);
+			if (ERROR_OK != ret)
+				return ret;
+
+			efm32_info->page_size = (1 << ((pg_size+10) & 0xff));
+		} else {
+			/* EFM32 GG/LG errata: MEM_INFO_PAGE_SIZE is invalid
+			   for MCUs with PROD_REV < 18 */
+			if (efm32_info->flash_sz_kib < 512)
+				efm32_info->page_size = 2048;
+			else
+				efm32_info->page_size = 4096;
+		}
 
 		if ((2048 != efm32_info->page_size) &&
 				(4096 != efm32_info->page_size)) {
@@ -362,7 +370,7 @@ static int efm32x_read_lock_data(struct flash_bank *bank)
 	data_size = bank->num_sectors / 8; /* number of data bytes */
 	data_size /= 4; /* ...and data dwords */
 
-	ptr = (uint32_t *)efm32x_info->lb_page;
+	ptr = efm32x_info->lb_page;
 
 	for (i = 0; i < data_size; i++, ptr++) {
 		ret = target_read_u32(target, EFM32_MSC_LOCK_BITS+i*4, ptr);
@@ -375,7 +383,7 @@ static int efm32x_read_lock_data(struct flash_bank *bank)
 	/* also, read ULW, DLW and MLW */
 
 	/* ULW, word 126 */
-	ptr = ((uint32_t *)efm32x_info->lb_page) + 126;
+	ptr = efm32x_info->lb_page + 126;
 	ret = target_read_u32(target, EFM32_MSC_LOCK_BITS+126*4, ptr);
 	if (ERROR_OK != ret) {
 		LOG_ERROR("Failed to read ULW");
@@ -383,7 +391,7 @@ static int efm32x_read_lock_data(struct flash_bank *bank)
 	}
 
 	/* DLW, word 127 */
-	ptr = ((uint32_t *)efm32x_info->lb_page) + 127;
+	ptr = efm32x_info->lb_page + 127;
 	ret = target_read_u32(target, EFM32_MSC_LOCK_BITS+127*4, ptr);
 	if (ERROR_OK != ret) {
 		LOG_ERROR("Failed to read DLW");
@@ -391,7 +399,7 @@ static int efm32x_read_lock_data(struct flash_bank *bank)
 	}
 
 	/* MLW, word 125, present in GG and LG */
-	ptr = ((uint32_t *)efm32x_info->lb_page) + 125;
+	ptr = efm32x_info->lb_page + 125;
 	ret = target_read_u32(target, EFM32_MSC_LOCK_BITS+125*4, ptr);
 	if (ERROR_OK != ret) {
 		LOG_ERROR("Failed to read MLW");
@@ -412,14 +420,14 @@ static int efm32x_write_lock_data(struct flash_bank *bank)
 		return ret;
 	}
 
-	return efm32x_write(bank, efm32x_info->lb_page, EFM32_MSC_LOCK_BITS,
+	return efm32x_write(bank, (uint8_t *)efm32x_info->lb_page, EFM32_MSC_LOCK_BITS,
 		LOCKBITS_PAGE_SZ);
 }
 
 static int efm32x_get_page_lock(struct flash_bank *bank, size_t page)
 {
 	struct efm32x_flash_bank *efm32x_info = bank->driver_priv;
-	uint32_t dw = ((uint32_t *)efm32x_info->lb_page)[page >> 5];
+	uint32_t dw = efm32x_info->lb_page[page >> 5];
 	uint32_t mask = 0;
 
 	mask = 1 << (page & 0x1f);
@@ -430,7 +438,7 @@ static int efm32x_get_page_lock(struct flash_bank *bank, size_t page)
 static int efm32x_set_page_lock(struct flash_bank *bank, size_t page, int set)
 {
 	struct efm32x_flash_bank *efm32x_info = bank->driver_priv;
-	uint32_t *dw = &((uint32_t *)efm32x_info->lb_page)[page >> 5];
+	uint32_t *dw = &efm32x_info->lb_page[page >> 5];
 	uint32_t mask = 0;
 
 	mask = 1 << (page & 0x1f);
@@ -602,7 +610,7 @@ static int efm32x_write_block(struct flash_bank *bank, uint8_t *buf,
 	buf_set_u32(reg_params[4].value, 0, 32, address);
 
 	armv7m_info.common_magic = ARMV7M_COMMON_MAGIC;
-	armv7m_info.core_mode = ARMV7M_MODE_ANY;
+	armv7m_info.core_mode = ARM_MODE_THREAD;
 
 	ret = target_run_flash_async_algorithm(target, buf, count, 4,
 			0, NULL,