X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fnor%2Fxmc4xxx.c;h=02df46a3fd2444a3c0ec4b9d94bea5eb8daea459;hb=790a7b2a8d22e04d9447d35d3bbb8684a11446a3;hp=f396ca3d573f48ab1e6e45db6013e8add663e733;hpb=eaacb900dd3ce5257dcfec35a8032a873d141b6a;p=openocd.git

diff --git a/src/flash/nor/xmc4xxx.c b/src/flash/nor/xmc4xxx.c
index f396ca3d57..02df46a3fd 100644
--- a/src/flash/nor/xmc4xxx.c
+++ b/src/flash/nor/xmc4xxx.c
@@ -183,7 +183,7 @@
 
 /* Flash controller configuration values */
 #define FLASH_ID_XMC4500        0xA2
-#define FLASH_ID_XMC4700_4800   0x92
+#define FLASH_ID_XMC4300_XMC4700_4800   0x92
 #define FLASH_ID_XMC4100_4200   0x9C
 #define FLASH_ID_XMC4400        0x9F
 
@@ -383,7 +383,7 @@ static int xmc4xxx_probe(struct flash_bank *bank)
 		bank->num_sectors = 12;
 		LOG_DEBUG("XMC4xxx: XMC4500 detected.");
 		break;
-	case FLASH_ID_XMC4700_4800:
+	case FLASH_ID_XMC4300_XMC4700_4800:
 		bank->num_sectors = 16;
 		LOG_DEBUG("XMC4xxx: XMC4700/4800 detected.");
 		break;
@@ -851,6 +851,14 @@ static int xmc4xxx_get_info_command(struct flash_bank *bank, char *buf, int buf_
 			break;
 		}
 		break;
+	case 0x300:
+		dev_str = "XMC4300";
+
+		switch (rev_id) {
+		case 0x1:
+			rev_str = "AA";
+		}
+		break;
 	case 0x400:
 		dev_str = "XMC4400";
 
@@ -998,11 +1006,6 @@ static int xmc4xxx_flash_unprotect(struct flash_bank *bank, int32_t level)
 	uint32_t addr;
 	int res;
 
-	if ((level < 0) || (level > 1)) {
-		LOG_ERROR("Invalid user level. Must be 0-1");
-		return ERROR_FAIL;
-	}
-
 	switch (level) {
 	case 0:
 		addr = UCB0_BASE;
@@ -1010,6 +1013,9 @@ static int xmc4xxx_flash_unprotect(struct flash_bank *bank, int32_t level)
 	case 1:
 		addr = UCB1_BASE;
 		break;
+	default:
+		LOG_ERROR("Invalid user level. Must be 0-1");
+		return ERROR_FAIL;
 	}
 
 	res = xmc4xxx_erase_sector(bank, addr, true);