From d335209efc6e27b8be0873c0e91c50fa85de926a Mon Sep 17 00:00:00 2001
From: Ivan Grokhotkov <igrokhotkov@gmail.com>
Date: Mon, 18 May 2015 12:33:09 +0300
Subject: [PATCH] Fix flash size/mode/frequency initialization order

-bo command used to reset flash size/mode/frequency to default values
---
 binimage/esptool_binimage.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/binimage/esptool_binimage.c b/binimage/esptool_binimage.c
index 82b21d4..6cbc018 100644
--- a/binimage/esptool_binimage.c
+++ b/binimage/esptool_binimage.c
@@ -29,7 +29,12 @@
 #include "infohelper.h"
 #include "esptool_binimage.h"
 
-static bin_image b_image;
+static bin_image b_image = {
+ .magic             = 0xe9,
+ .num_segments      = 0,
+ .flash_mode        = FLASH_MODE_QIO,
+ .flash_size_freq   = FLASH_SIZE_512K | FLASH_FREQ_40
+};
 
 int binimage_add_segment(uint32_t address, uint32_t size, unsigned char *data)
 {
@@ -80,12 +85,7 @@ int binimage_prepare(const char *fname, uint32_t entry)
         return 0;
     }
     
-    b_image.magic = 0xE9;
-    b_image.num_segments = 0;
-    b_image.flash_mode = FLASH_MODE_QIO;
-    b_image.flash_size_freq = FLASH_SIZE_512K | FLASH_FREQ_40;
-    b_image.entry = entry;
-    
+    b_image.entry = entry;    
     
     if(fname[0])
     {