--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -40,9 +40,9 @@
 #include <linux/mtd/xip.h>
 
 #define AMD_BOOTLOC_BUG
-#define FORCE_WORD_WRITE 0
+#define FORCE_WORD_WRITE 1
 
-#define MAX_WORD_RETRIES 3
+#define MAX_WORD_RETRIES 10
 
 #define SST49LF004B	        0x0060
 #define SST49LF040B	        0x0050