X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fnor%2Fstm32f1x.c;h=8e5bf79a1342091cf8bf6086bab4cc9d83f5dd96;hb=6efcd943b28cf904362283226b3f51cf52ce3252;hp=58b7ba16acf7f24e3f288d50010bd9c0eaae65bb;hpb=b9dbf569b4a8f7fae227f93dd21cd305b4efc16b;p=openocd.git

diff --git a/src/flash/nor/stm32f1x.c b/src/flash/nor/stm32f1x.c
index 58b7ba16ac..8e5bf79a13 100644
--- a/src/flash/nor/stm32f1x.c
+++ b/src/flash/nor/stm32f1x.c
@@ -110,6 +110,7 @@
 struct stm32x_options {
 	uint16_t RDP;
 	uint16_t user_options;
+	uint16_t user_data;
 	uint16_t protection[4];
 };
 
@@ -121,6 +122,8 @@ struct stm32x_flash_bank {
 	bool has_dual_banks;
 	/* used to access dual flash bank stm32xl */
 	uint32_t register_base;
+	uint16_t default_rdp;
+	int user_data_offset;
 };
 
 static int stm32x_mass_erase(struct flash_bank *bank);
@@ -228,7 +231,8 @@ static int stm32x_read_options(struct flash_bank *bank)
 	if (retval != ERROR_OK)
 		return retval;
 
-	stm32x_info->option_bytes.user_options = (uint16_t)0xFFF8 | ((optiondata >> 2) & 0x07);
+	stm32x_info->option_bytes.user_options = (uint16_t)0xFFF0 | ((optiondata >> 2) & 0x0f);
+	stm32x_info->option_bytes.user_data = (optiondata >> stm32x_info->user_data_offset) & 0xffff;
 	stm32x_info->option_bytes.RDP = (optiondata & (1 << OPT_READOUT)) ? 0xFFFF : 0x5AA5;
 
 	if (optiondata & (1 << OPT_READOUT))
@@ -288,7 +292,7 @@ static int stm32x_erase_options(struct flash_bank *bank)
 
 	/* clear readout protection and complementary option bytes
 	 * this will also force a device unlock if set */
-	stm32x_info->option_bytes.RDP = 0x5AA5;
+	stm32x_info->option_bytes.RDP = stm32x_info->default_rdp;
 
 	return ERROR_OK;
 }
@@ -325,8 +329,8 @@ static int stm32x_write_options(struct flash_bank *bank)
 
 	target_buffer_set_u16(target, opt_bytes, stm32x_info->option_bytes.RDP);
 	target_buffer_set_u16(target, opt_bytes + 2, stm32x_info->option_bytes.user_options);
-	target_buffer_set_u16(target, opt_bytes + 4, 0x00FF);
-	target_buffer_set_u16(target, opt_bytes + 6, 0x00FF);
+	target_buffer_set_u16(target, opt_bytes + 4, stm32x_info->option_bytes.user_data & 0xff);
+	target_buffer_set_u16(target, opt_bytes + 6, (stm32x_info->option_bytes.user_data >> 8) & 0xff);
 	target_buffer_set_u16(target, opt_bytes + 8, stm32x_info->option_bytes.protection[0]);
 	target_buffer_set_u16(target, opt_bytes + 10, stm32x_info->option_bytes.protection[1]);
 	target_buffer_set_u16(target, opt_bytes + 12, stm32x_info->option_bytes.protection[2]);
@@ -852,6 +856,10 @@ static int stm32x_probe(struct flash_bank *bank)
 
 	stm32x_info->probed = 0;
 	stm32x_info->register_base = FLASH_REG_BASE_B0;
+	stm32x_info->user_data_offset = 10;
+
+	/* default factory protection level */
+	stm32x_info->default_rdp = 0x5AA5;
 
 	/* read stm32 device id register */
 	int retval = stm32x_get_device_id(bank, &device_id);
@@ -891,6 +899,8 @@ static int stm32x_probe(struct flash_bank *bank)
 		page_size = 2048;
 		stm32x_info->ppage_size = 2;
 		max_flash_size_in_kb = 256;
+		stm32x_info->user_data_offset = 16;
+		stm32x_info->default_rdp = 0x55AA;
 		break;
 	case 0x428: /* value line High density */
 		page_size = 2048;
@@ -907,11 +917,15 @@ static int stm32x_probe(struct flash_bank *bank)
 		page_size = 2048;
 		stm32x_info->ppage_size = 2;
 		max_flash_size_in_kb = 256;
+		stm32x_info->user_data_offset = 16;
+		stm32x_info->default_rdp = 0x55AA;
 		break;
 	case 0x440: /* stm32f0x */
 		page_size = 1024;
 		stm32x_info->ppage_size = 4;
 		max_flash_size_in_kb = 64;
+		stm32x_info->user_data_offset = 16;
+		stm32x_info->default_rdp = 0x55AA;
 		break;
 	default:
 		LOG_WARNING("Cannot identify target as a STM32 family.");
@@ -1338,6 +1352,11 @@ COMMAND_HANDLER(stm32x_handle_options_read_command)
 			command_print(CMD_CTX, "Boot: Bank 1");
 	}
 
+	command_print(CMD_CTX, "User Option0: 0x%02" PRIx8,
+			(optionbyte >> stm32x_info->user_data_offset) & 0xff);
+	command_print(CMD_CTX, "User Option1: 0x%02" PRIx8,
+			(optionbyte >> (stm32x_info->user_data_offset + 8)) & 0xff);
+
 	return ERROR_OK;
 }
 
@@ -1345,9 +1364,9 @@ COMMAND_HANDLER(stm32x_handle_options_write_command)
 {
 	struct target *target = NULL;
 	struct stm32x_flash_bank *stm32x_info = NULL;
-	uint16_t optionbyte = 0xF8;
+	uint16_t optionbyte;
 
-	if (CMD_ARGC < 4)
+	if (CMD_ARGC < 2)
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
 	struct flash_bank *bank;
@@ -1368,34 +1387,41 @@ COMMAND_HANDLER(stm32x_handle_options_write_command)
 	if (ERROR_OK != retval)
 		return retval;
 
-	/* REVISIT: ignores some options which we will display...
-	 * and doesn't insist on the specified syntax.
-	 */
-
-	/* OPT_RDWDGSW */
-	if (strcmp(CMD_ARGV[1], "SWWDG") == 0)
-		optionbyte |= (1 << 0);
-	else	/* REVISIT must be "HWWDG" then ... */
-		optionbyte &= ~(1 << 0);
-
-	/* OPT_RDRSTSTOP */
-	if (strcmp(CMD_ARGV[2], "NORSTSTOP") == 0)
-		optionbyte |= (1 << 1);
-	else	/* REVISIT must be "RSTSTNDBY" then ... */
-		optionbyte &= ~(1 << 1);
-
-	/* OPT_RDRSTSTDBY */
-	if (strcmp(CMD_ARGV[3], "NORSTSTNDBY") == 0)
-		optionbyte |= (1 << 2);
-	else	/* REVISIT must be "RSTSTOP" then ... */
-		optionbyte &= ~(1 << 2);
-
-	if (CMD_ARGC > 4 && stm32x_info->has_dual_banks) {
-		/* OPT_BFB2 */
-		if (strcmp(CMD_ARGV[4], "BOOT0") == 0)
-			optionbyte |= (1 << 3);
-		else
-			optionbyte &= ~(1 << 3);
+	retval = stm32x_read_options(bank);
+	if (ERROR_OK != retval)
+		return retval;
+
+	/* start with current options */
+	optionbyte = stm32x_info->option_bytes.user_options;
+
+	/* skip over flash bank */
+	CMD_ARGC--;
+	CMD_ARGV++;
+
+	while (CMD_ARGC) {
+		if (strcmp("SWWDG", CMD_ARGV[0]) == 0)
+			optionbyte |= (1 << 0);
+		else if (strcmp("HWWDG", CMD_ARGV[0]) == 0)
+			optionbyte &= ~(1 << 0);
+		else if (strcmp("NORSTSTOP", CMD_ARGV[0]) == 0)
+			optionbyte &= ~(1 << 1);
+		else if (strcmp("RSTSTNDBY", CMD_ARGV[0]) == 0)
+			optionbyte &= ~(1 << 1);
+		else if (strcmp("NORSTSTNDBY", CMD_ARGV[0]) == 0)
+			optionbyte &= ~(1 << 2);
+		else if (strcmp("RSTSTOP", CMD_ARGV[0]) == 0)
+			optionbyte &= ~(1 << 2);
+		else if (stm32x_info->has_dual_banks) {
+			if (strcmp("BOOT0", CMD_ARGV[0]) == 0)
+				optionbyte |= (1 << 3);
+			else if (strcmp("BOOT1", CMD_ARGV[0]) == 0)
+				optionbyte &= ~(1 << 3);
+			else
+				return ERROR_COMMAND_SYNTAX_ERROR;
+		} else
+			return ERROR_COMMAND_SYNTAX_ERROR;
+		CMD_ARGC--;
+		CMD_ARGV++;
 	}
 
 	if (stm32x_erase_options(bank) != ERROR_OK) {