From 5bdaae5b10d1bd779057385ae1a206e328c9da06 Mon Sep 17 00:00:00 2001
From: shripad621git <shripad62001@gmail.com>
Date: Wed, 1 Nov 2023 12:43:47 +0530
Subject: [PATCH] made outdir user governed

---
 .../tools/generate_esp32_chip_factory_bin.py  | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/scripts/tools/generate_esp32_chip_factory_bin.py b/scripts/tools/generate_esp32_chip_factory_bin.py
index 12e00f395ef9f4..eedbd33b6a2652 100755
--- a/scripts/tools/generate_esp32_chip_factory_bin.py
+++ b/scripts/tools/generate_esp32_chip_factory_bin.py
@@ -52,6 +52,7 @@
 FACTORY_PARTITION_CSV = 'nvs_partition.csv'
 FACTORY_PARTITION_BIN = 'factory_partition.bin'
 NVS_KEY_PARTITION_BIN = 'nvs_key_partition.bin'
+ESP_SECURE_CERT_PARTITION_BIN   = 'esp_secure_cert_partititon.bin'
 
 FACTORY_DATA = {
     # CommissionableDataProvider
@@ -165,12 +166,6 @@
     # in the respective functions.
 }
 
-OUT_DIR = {
-    'top': None,
-    'chip': None,
-}
-
-
 class CalendarTypes(enum.Enum):
     Buddhist = 0
     Chinese = 1
@@ -330,8 +325,7 @@ def populate_factory_data(args, spake2p_params):
             FACTORY_DATA['dac-key']['value'] = os.path.abspath('dac_raw_privkey.bin')
             FACTORY_DATA['dac-pub-key']['value'] = os.path.abspath('dac_raw_pubkey.bin')
     else:
-        file_name = "esp_secure_cert_partititon.bin"
-        secure_cert_partition_file_path = os.path.join(OUT_DIR['top'], file_name)
+        secure_cert_partition_file_path = os.path.join(args.output_dir,ESP_SECURE_CERT_PARTITION_BIN)
         if args.ds_peripheral:
             if args.target != "esp32h2":
                 logging.error("DS peripheral is only supported for esp32h2 target")
@@ -515,9 +509,9 @@ def generate_nvs_csv(out_csv_filename):
     logging.info('Generated the factory partition csv file : {}'.format(os.path.abspath(out_csv_filename)))
 
 
-def generate_nvs_bin(encrypt, size, csv_filename, bin_filename):
+def generate_nvs_bin(encrypt, size, csv_filename, bin_filename, output_dir):
     nvs_args = SimpleNamespace(version=2,
-                               outdir=OUT_DIR['top'],
+                               outdir=output_dir,
                                input=csv_filename,
                                output=bin_filename,
                                size=hex(size))
@@ -603,6 +597,8 @@ def any_base_int(s): return int(s, 0)
                         help='Encrypt the factory parititon NVS binary')
     parser.add_argument('--no-bin', action='store_false', dest='generate_bin',
                         help='Do not generate the factory partition binary')
+    parser.add_argument('--output_dir', type=str, default='bin', help='Created image output file path')
+
     parser.set_defaults(generate_bin=True)
 
     return parser.parse_args()
@@ -627,14 +623,13 @@ def set_up_factory_data(args):
 def generate_factory_partiton_binary(args):
     generate_nvs_csv(FACTORY_PARTITION_CSV)
     if args.generate_bin:
-        generate_nvs_bin(args.encrypt, args.size, FACTORY_PARTITION_CSV, FACTORY_PARTITION_BIN)
+        generate_nvs_bin(args.encrypt, args.size, FACTORY_PARTITION_CSV, FACTORY_PARTITION_BIN,args.output_dir)
         print_flashing_help(args.encrypt, FACTORY_PARTITION_BIN)
     clean_up()
 
 
 def set_up_out_dirs(args):
-    OUT_DIR['top'] = os.sep.join(['out', 'bin'])
-    os.makedirs(OUT_DIR['top'], exist_ok=True)
+    os.makedirs(args.output_dir, exist_ok=True)
 
 
 def main():