X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fnor%2Fstm32f1x.c;h=f077fe548137b196bbe17428e3080cb4a5238ebb;hp=baf6b2752c10ea8ec252cfea03285989fece8f69;hb=552e027f6867059302267e4d52624a6da158844a;hpb=e26ddb627ba035ab9bfc9c54a5585865a6c89132

diff --git a/src/flash/nor/stm32f1x.c b/src/flash/nor/stm32f1x.c
index baf6b2752c..f077fe5481 100644
--- a/src/flash/nor/stm32f1x.c
+++ b/src/flash/nor/stm32f1x.c
@@ -249,6 +249,14 @@ static int stm32x_erase_options(struct flash_bank *bank)
 
 	stm32x_info = bank->driver_priv;
 
+	/* stlink is currently does not support 16bit
+	 * read/writes. so we cannot write option bytes */
+	struct armv7m_common *armv7m = target_to_armv7m(target);
+	if (armv7m && armv7m->stlink) {
+		LOG_ERROR("Option bytes currently unsupported for stlink");
+		return ERROR_FAIL;
+	}
+
 	/* read current options */
 	stm32x_read_options(bank);