From f130d8b91eba82a3ddf40d517038b8d42fbc10a1 Mon Sep 17 00:00:00 2001 From: Gustavo Henrique Nihei Date: Thu, 30 Dec 2021 11:21:28 -0300 Subject: [PATCH] xtensa/esp32s2: Remove unavailable support for ROM Basic Console This feature is only available for ESP32 chips. Signed-off-by: Gustavo Henrique Nihei --- arch/xtensa/src/esp32s2/Bootloader.mk | 1 - arch/xtensa/src/esp32s2/Kconfig.security | 14 -------------- 2 files changed, 15 deletions(-) diff --git a/arch/xtensa/src/esp32s2/Bootloader.mk b/arch/xtensa/src/esp32s2/Bootloader.mk index c15882fe153..3ad1fc0f5a8 100644 --- a/arch/xtensa/src/esp32s2/Bootloader.mk +++ b/arch/xtensa/src/esp32s2/Bootloader.mk @@ -75,7 +75,6 @@ ifeq ($(CONFIG_ESP32S2_APP_FORMAT_MCUBOOT),y) $(if $(CONFIG_ESP32S2_SECURE_SIGNED_APPS_SCHEME_RSA_3072),$(call cfg_en,CONFIG_ESP_USE_MBEDTLS)$(call cfg_en,CONFIG_ESP_SIGN_RSA)$(call cfg_val,CONFIG_ESP_SIGN_RSA_LEN,3072)) \ $(if $(CONFIG_ESP32S2_SECURE_SIGNED_APPS_SCHEME_ECDSA_P256),$(call cfg_en,CONFIG_ESP_USE_TINYCRYPT)$(call cfg_en,CONFIG_ESP_SIGN_EC256)) \ $(if $(CONFIG_ESP32S2_SECURE_SIGNED_APPS_SCHEME_ED25519),$(call cfg_en,CONFIG_ESP_USE_TINYCRYPT)$(call cfg_en,CONFIG_ESP_SIGN_ED25519)) \ - $(if $(CONFIG_ESP32S2_SECURE_BOOT_ALLOW_ROM_BASIC),$(call cfg_en,CONFIG_SECURE_BOOT_ALLOW_ROM_BASIC)) \ $(if $(CONFIG_ESP32S2_SECURE_BOOT_ALLOW_JTAG),$(call cfg_en,CONFIG_SECURE_BOOT_ALLOW_JTAG)) \ $(if $(CONFIG_ESP32S2_SECURE_BOOT_ALLOW_EFUSE_RD_DIS),$(call cfg_en,CONFIG_SECURE_BOOT_V2_ALLOW_EFUSE_RD_DIS)) \ $(if $(CONFIG_ESP32S2_SECURE_DISABLE_ROM_DL_MODE),$(call cfg_en,CONFIG_SECURE_DISABLE_ROM_DL_MODE)) \ diff --git a/arch/xtensa/src/esp32s2/Kconfig.security b/arch/xtensa/src/esp32s2/Kconfig.security index f2bf727ddb5..f9b12975dab 100644 --- a/arch/xtensa/src/esp32s2/Kconfig.security +++ b/arch/xtensa/src/esp32s2/Kconfig.security @@ -109,20 +109,6 @@ menu "Potentially insecure options" # it's possible for the insecure menu to be disabled but the insecure option # to remain on which is very bad.) -config ESP32S2_SECURE_BOOT_ALLOW_ROM_BASIC - bool "Leave ROM BASIC Interpreter available on reset" - default n - depends on ESP32S2_SECURE_BOOT_INSECURE - ---help--- - By default, the BASIC ROM Console starts on reset if no valid bootloader is - read from the flash. - - When either Flash Encryption or Secure Boot are enabled, the default is to - disable this BASIC fallback mode permanently via eFuse. - - If this option is set, this eFuse is not burned and the BASIC ROM Console may - remain accessible. Only set this option in testing environments. - config ESP32S2_SECURE_BOOT_ALLOW_JTAG bool "Allow JTAG Debugging" default n