From 807240536f6185d4206f317363ee41558976968e Mon Sep 17 00:00:00 2001
From: Chris Kerkhoff <christopher.kerkhoff@gmail.com>
Date: Wed, 3 Jan 2018 20:21:27 -0600
Subject: [PATCH] Updating flash size passed to esptool to use megabytes
 instead of megabits

---
 examples/i2s_audio/Makefile | 2 +-
 examples/spiffs/Makefile    | 2 +-
 examples/wificfg/local.mk   | 2 +-
 extras/spiffs/README.md     | 4 ++--
 parameters.mk               | 4 ++--
 tests/Makefile              | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/examples/i2s_audio/Makefile b/examples/i2s_audio/Makefile
index d732ffa..546a09c 100644
--- a/examples/i2s_audio/Makefile
+++ b/examples/i2s_audio/Makefile
@@ -1,6 +1,6 @@
 PROGRAM=i2s_audio_example
 EXTRA_COMPONENTS = extras/spiffs extras/i2s_dma
-FLASH_SIZE = 32
+FLASH_SIZE = 4
 
 # spiffs configuration
 SPIFFS_BASE_ADDR = 0x200000
diff --git a/examples/spiffs/Makefile b/examples/spiffs/Makefile
index 813cf79..194405d 100644
--- a/examples/spiffs/Makefile
+++ b/examples/spiffs/Makefile
@@ -1,6 +1,6 @@
 PROGRAM=spiffs_example
 EXTRA_COMPONENTS = extras/spiffs
-FLASH_SIZE = 32
+FLASH_SIZE = 4
 
 # spiffs configuration
 SPIFFS_BASE_ADDR = 0x200000
diff --git a/examples/wificfg/local.mk b/examples/wificfg/local.mk
index c6c3129..6f79b64 100644
--- a/examples/wificfg/local.mk
+++ b/examples/wificfg/local.mk
@@ -1 +1 @@
-FLASH_SIZE ?= 32
+FLASH_SIZE ?= 4
diff --git a/extras/spiffs/README.md b/extras/spiffs/README.md
index 4bc694e..5b06751 100644
--- a/extras/spiffs/README.md
+++ b/extras/spiffs/README.md
@@ -29,7 +29,7 @@ and size is the location of SPIFFS region in SPI flash and its size.
 
 In order to use file system in a project the following steps should be made:
  * Add SPIFFS component in a project Makefile `EXTRA_COMPONENTS = extras/spiffs`
- * Specify your flash size in the Makefile `FLASH_SIZE = 32`
+ * Specify your flash size in the Makefile `FLASH_SIZE = 4`
  * Specify the start address of file system region on the flash memory
 `SPIFFS_BASE_ADDR = 0x200000`. It still needed even for `SPIFFS_SINGLETON = 0`
 in order to flash SPIFFS image to the right location during `make flash`.
@@ -42,7 +42,7 @@ In the end the Makefile should look like:
 ```
 PROGRAM=spiffs_example
 EXTRA_COMPONENTS = extras/spiffs
-FLASH_SIZE = 32
+FLASH_SIZE = 4
 
 SPIFFS_BASE_ADDR = 0x200000
 SPIFFS_SIZE = 0x100000
diff --git a/parameters.mk b/parameters.mk
index 4dede4e..94af235 100644
--- a/parameters.mk
+++ b/parameters.mk
@@ -10,7 +10,7 @@
 
 # Flash size in megabits
 # Valid values are same as for esptool.py - 2,4,8,16,32
-FLASH_SIZE ?= 16
+FLASH_SIZE ?= 2
 
 # Flash mode, valid values are same as for esptool.py - qio,qout,dio.dout
 FLASH_MODE ?= qio
@@ -30,7 +30,7 @@ ESPPORT ?= /dev/ttyUSB0
 ESPBAUD ?= 115200
 
 # firmware tool arguments
-ESPTOOL_ARGS=-fs $(FLASH_SIZE)m -fm $(FLASH_MODE) -ff $(FLASH_SPEED)m
+ESPTOOL_ARGS=-fs $(FLASH_SIZE)MB -fm $(FLASH_MODE) -ff $(FLASH_SPEED)m
 
 
 # set this to 0 if you don't need floating point support in printf/scanf
diff --git a/tests/Makefile b/tests/Makefile
index 9f0fc41..048e4c1 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -4,7 +4,7 @@ EXTRA_COMPONENTS=extras/dhcpserver extras/spiffs
 
 PROGRAM_SRC_DIR = . ./cases
 
-FLASH_SIZE = 32
+FLASH_SIZE = 4
 
 # spiffs configuration
 SPIFFS_BASE_ADDR = 0x200000