From abb114475fdd88d7ad4ef35bedfdc27cc3144f67 Mon Sep 17 00:00:00 2001
From: Shivani Tipnis <shivani@espressif.com>
Date: Wed, 27 Mar 2019 14:46:40 +0530
Subject: [PATCH] nvs_part_util: Fix Readme and disable multipage blob by
 default

---
 components/nvs_flash/nvs_partition_generator/README.rst     | 6 ++----
 .../nvs_flash/nvs_partition_generator/nvs_partition_gen.py  | 2 +-
 components/nvs_flash/test_nvs_host/test_nvs.cpp             | 4 +++-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/components/nvs_flash/nvs_partition_generator/README.rst b/components/nvs_flash/nvs_partition_generator/README.rst
index cae8940b8..ab3453d50 100644
--- a/components/nvs_flash/nvs_partition_generator/README.rst
+++ b/components/nvs_flash/nvs_partition_generator/README.rst
@@ -56,8 +56,8 @@ When a new namespace entry is encountered in the CSV file, each follow-up entrie
 Multipage Blob Support
 ----------------------
 
-By default, binary blobs are allowed to span over multiple pages and written in the format mentioned in section :ref:`structure_of_entry`. 
-If older format is intended to be used, the utility provides an option to disable this feature.
+By default, binary blobs are not allowed to span over multiple pages as written in the format mentioned in section :ref:`structure_of_entry`. 
+If this format is intended to be used, the utility provides an option to enable this feature.
 
 Encryption Support
 -------------------
@@ -123,8 +123,6 @@ A sample CSV file is provided with the utility::
 +------------------------+----------------------------------------------------------------------------------------------+
 | output                 | Path to output converted binary file. Will use stdout if omitted                             |
 +------------------------+----------------------------------------------------------------------------------------------+
-| size                   | Size of NVS Partition in KB. Eg. 12KB                                                        |
-+------------------------+----------------------------------------------------------------------------------------------+
 | --version {v1,v2}      |  Set version. Default: v2                                                                    |
 +-------------------------------+---------------------------------------------------------------------------------------+
 | --keygen {True,False}  |  Generate keys for encryption. Default: False                                                |
diff --git a/components/nvs_flash/nvs_partition_generator/nvs_partition_gen.py b/components/nvs_flash/nvs_partition_generator/nvs_partition_gen.py
index 683fc956f..dbf4dd3dc 100755
--- a/components/nvs_flash/nvs_partition_generator/nvs_partition_gen.py
+++ b/components/nvs_flash/nvs_partition_generator/nvs_partition_gen.py
@@ -674,7 +674,7 @@ def main():
             "--version",
             help='Set version. Default: v2',
             choices=['v1','v2'],
-            default='v2')
+            default='v1')
 
     parser.add_argument(
             "--keygen",
diff --git a/components/nvs_flash/test_nvs_host/test_nvs.cpp b/components/nvs_flash/test_nvs_host/test_nvs.cpp
index cc5c2f522..3b24c684d 100644
--- a/components/nvs_flash/test_nvs_host/test_nvs.cpp
+++ b/components/nvs_flash/test_nvs_host/test_nvs.cpp
@@ -2418,7 +2418,9 @@ TEST_CASE("test nvs apis for nvs partition generator utility with encryption ena
                 "--encrypt",
                 "True",
                 "--keyfile",
-                "../nvs_partition_generator/testdata/encryption_keys.txt",NULL));
+                "../nvs_partition_generator/testdata/encryption_keys.txt",
+                "--version",
+                "v2",NULL));
     } else {
         CHECK(childpid > 0);
         int status;