Quellcode durchsuchen

Merge branch 'refactor/add_target_name_for_parttool' into 'master'

parttool: don't print target name

See merge request espressif/esp-idf!7904
Ivan Grokhotkov vor 5 Jahren
Ursprung
Commit
95c275109b

+ 1 - 1
components/partition_table/gen_esp32part.py

@@ -241,7 +241,7 @@ class PartitionTable(list):
         return result
 
     def to_csv(self, simple_formatting=False):
-        rows = ["# Espressif ESP32 Partition Table",
+        rows = ["# ESP-IDF Partition Table",
                 "# Name, Type, SubType, Offset, Size, Flags"]
         rows += [x.to_csv(simple_formatting) for x in self]
         return "\n".join(rows) + "\n"

+ 2 - 2
docs/en/api-guides/partition-tables.rst

@@ -23,7 +23,7 @@ Built-in Partition Tables
 
 Here is the summary printed for the "Single factory app, no OTA" configuration::
 
-  # Espressif ESP Partition Table
+  # ESP-IDF Partition Table
   # Name,   Type, SubType, Offset,  Size, Flags
   nvs,      data, nvs,     0x9000,  0x6000,
   phy_init, data, phy,     0xf000,  0x1000,
@@ -34,7 +34,7 @@ Here is the summary printed for the "Single factory app, no OTA" configuration::
 
 Here is the summary printed for the "Factory app, two OTA definitions" configuration::
 
-  # Espressif ESP Partition Table
+  # ESP-IDF Partition Table
   # Name,   Type, SubType, Offset,  Size, Flags
   nvs,      data, nvs,     0x9000,  0x4000,
   otadata,  data, ota,     0xd000,  0x2000,

+ 2 - 2
docs/zh_CN/api-guides/partition-tables.rst

@@ -26,7 +26,7 @@
 以下是 "Single factory app, no OTA" 选项的分区表信息摘要:
 
 
-   # Espressif {IDF_TARGET_NAME} Partition Table
+   # ESP-IDF Partition Table
    # Name,   Type, SubType, Offset,  Size,   Flags
    nvs,      data, nvs,     0x9000,  0x6000,
    phy_init, data, phy,     0xf000,  0x1000,
@@ -37,7 +37,7 @@
 
 以下是 "Factory app, two OTA definitions" 选项的分区表信息摘要:
 
-   # Espressif {IDF_TARGET_NAME} Partition Table
+   # ESP-IDF Partition Table
    # Name,   Type, SubType, Offset,   Size,   Flags
    nvs,      data, nvs,     0x9000,   0x4000,
    otadata,  data, ota,     0xd000,   0x2000,

+ 1 - 1
tools/ci/test_build_system_cmake.sh

@@ -461,7 +461,7 @@ function run_tests()
     rm -r build
 
     print_status "Displays partition table when executing target partition_table"
-    idf.py partition_table | grep -E "# Espressif .+ Partition Table"
+    idf.py partition_table | grep -E "# ESP-IDF .+ Partition Table"
     rm -r build
 
     print_status "Make sure a full build never runs '/usr/bin/env python' or similar"