Browse Source

Merge branch 'bugfix/hide_unsupported_cmake_features_v3.3' into 'release/v3.3'

security: Hide Secure Boot & Flash Encryption config items when using CMake

See merge request espressif/esp-idf!6899
Angus Gratton 6 years ago
parent
commit
762a9fe83f

+ 1 - 0
components/bootloader/Kconfig.projbuild

@@ -223,6 +223,7 @@ endmenu  # Bootloader
 
 
 
 
 menu "Security features"
 menu "Security features"
+    visible if !IDF_CMAKE
 
 
     # These three are the actual options to check in code,
     # These three are the actual options to check in code,
     # selected by the displayed options
     # selected by the displayed options

+ 4 - 1
docs/en/security/flash-encryption.rst

@@ -8,7 +8,10 @@ Flash Encryption is separate from the :doc:`Secure Boot <secure-boot>` feature,
 When using any non-default configuration in production, additional steps may also be needed to ensure effectiveness of flash encryption. See :ref:`securing-flash-encryption` for more details.
 When using any non-default configuration in production, additional steps may also be needed to ensure effectiveness of flash encryption. See :ref:`securing-flash-encryption` for more details.
 
 
 .. important::
 .. important::
-  Enabling flash encryption limits your options for further updates of your ESP32. Make sure to read this document (including :ref:`flash-encryption-limitations`) and understand the implications of enabling flash encryption.
+    Enabling flash encryption limits your options for further updates of your ESP32. Make sure to read this document (including :ref:`flash-encryption-limitations`) and understand the implications of enabling flash encryption.
+
+.. note::
+    Flash encryption is only supported when using the default GNU Make build system. The CMake build system preview in ESP-IDF v3.x does not support flash encryption.
 
 
 Background
 Background
 ----------
 ----------

+ 4 - 0
docs/en/security/secure-boot.rst

@@ -9,6 +9,10 @@ Secure Boot is separate from the :doc:`Flash Encryption <flash-encryption>` feat
 
 
     Enabling secure boot limits your options for further updates of your ESP32. Make sure to read this document throughly and understand the implications of enabling secure boot.
     Enabling secure boot limits your options for further updates of your ESP32. Make sure to read this document throughly and understand the implications of enabling secure boot.
 
 
+.. note::
+
+    Secure boot is only supported when using the default GNU Make build system. The CMake build system preview in ESP-IDF v3.x does not support secure boot.
+
 Background
 Background
 ----------
 ----------