From 10649ae23b23a3dde5f7523a54d63261f999b205 Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Wed, 21 Aug 2019 12:20:04 +1000 Subject: [PATCH] app_update: Remove deprecated "make erase_ota" target Deprecated in v3.2 --- components/app_update/Makefile.projbuild | 3 --- docs/en/api-guides/build-system-legacy.rst | 2 +- docs/zh_CN/api-guides/build-system-legacy.rst | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/components/app_update/Makefile.projbuild b/components/app_update/Makefile.projbuild index 4081aab97..886ca569a 100644 --- a/components/app_update/Makefile.projbuild +++ b/components/app_update/Makefile.projbuild @@ -40,9 +40,6 @@ read_otadata: $(PARTITION_TABLE_CSV_PATH) partition_table_get_info | check_pytho --partition-table-offset $(partition_table_offset) \ read_otadata -erase_ota: erase_otadata - @echo "WARNING: erase_ota is deprecated. Use erase_otadata instead." - all: blank_ota_data flash: blank_ota_data ifdef CONFIG_SECURE_FLASH_ENCRYPTION_MODE_DEVELOPMENT diff --git a/docs/en/api-guides/build-system-legacy.rst b/docs/en/api-guides/build-system-legacy.rst index 52ca8642c..19c1ad3ee 100644 --- a/docs/en/api-guides/build-system-legacy.rst +++ b/docs/en/api-guides/build-system-legacy.rst @@ -360,7 +360,7 @@ Advanced Make Targets --------------------- - ``make app``, ``make bootloader``, ``make partition table`` can be used to build only the app, bootloader, or partition table from the project as applicable. -- ``make erase_flash`` and ``make erase_ota`` will use esptool.py to erase the entire flash chip and the OTA selection setting from the flash chip, respectively. +- ``make erase_flash`` and ``make erase_otadata`` will use esptool.py to erase the entire flash chip and the OTA selection setting from the flash chip, respectively. - ``make size`` prints some size information about the app. ``make size-components`` and ``make size-files`` are similar targets which print more detailed per-component or per-source-file information, respectively. diff --git a/docs/zh_CN/api-guides/build-system-legacy.rst b/docs/zh_CN/api-guides/build-system-legacy.rst index cc7241005..3ae2cdda4 100644 --- a/docs/zh_CN/api-guides/build-system-legacy.rst +++ b/docs/zh_CN/api-guides/build-system-legacy.rst @@ -289,7 +289,7 @@ ESP-IDF 构建系统会在命令行中添加以下 C 预处理定义： ~~~~~~~~~~~~~~~~~~ - ``make app``，``make bootloader``，``make partition table`` 可以根据需要为项目单独构建生成应用程序文件、启动引导文件和分区表文件。 -- ``make erase_flash`` 和 ``make erase_ota`` 会调用 esptool.py 脚本分别擦除整块闪存芯片或者其中 OTA 分区的内容。 +- ``make erase_flash`` 和 ``make erase_otadata`` 会调用 esptool.py 脚本分别擦除整块闪存芯片或者其中 OTA 分区的内容。 - ``make size`` 会打印应用程序的大小信息。``make size-components`` 和 ``make size-files`` 两者功能相似，分别打印每个组件或者每个源文件大小的详细信息。 调试 Make 的过程