From 1b94806b35c3ba868f4ca74f69da01b5efdc2d4a Mon Sep 17 00:00:00 2001 From: Gustavo Henrique Nihei Date: Fri, 20 Jan 2023 15:38:08 -0300 Subject: [PATCH] boards/esp32: Remove duplicated MCUboot-related defconfigs These are basically the same from the esp32-devkitc board. As the defconfigs do not make use of any board-specific peripheral, there is no need to duplicate them in every ESP32 board. Signed-off-by: Gustavo Henrique Nihei --- .../configs/mcuboot_slot_confirm/defconfig | 50 ----------- .../configs/mcuboot_update_agent/defconfig | 81 ------------------ .../configs/mcuboot_slot_confirm/defconfig | 51 ------------ .../configs/mcuboot_update_agent/defconfig | 82 ------------------- 4 files changed, 264 deletions(-) delete mode 100644 boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_slot_confirm/defconfig delete mode 100644 boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_update_agent/defconfig delete mode 100644 boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_slot_confirm/defconfig delete mode 100644 boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_update_agent/defconfig diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_slot_confirm/defconfig b/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_slot_confirm/defconfig deleted file mode 100644 index df0b3f0be8..0000000000 --- a/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_slot_confirm/defconfig +++ /dev/null @@ -1,50 +0,0 @@ -# -# This file is autogenerated: PLEASE DO NOT EDIT IT. -# -# You can use "make menuconfig" to make any modifications to the installed .config file. -# You can then do "make savedefconfig" to generate a new defconfig file that includes your -# modifications. -# -# CONFIG_NSH_ARGCAT is not set -# CONFIG_NSH_CMDOPT_HEXDUMP is not set -CONFIG_ARCH="xtensa" -CONFIG_ARCH_BOARD="esp32-ethernet-kit" -CONFIG_ARCH_BOARD_COMMON=y -CONFIG_ARCH_BOARD_ESP32_ETHERNETKIT=y -CONFIG_ARCH_CHIP="esp32" -CONFIG_ARCH_CHIP_ESP32=y -CONFIG_ARCH_CHIP_ESP32WROVER=y -CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH_XTENSA=y -CONFIG_BOARDCTL_RESET=y -CONFIG_BOARD_LOOPSPERMSEC=16717 -CONFIG_BUILTIN=y -CONFIG_ESP32_APP_FORMAT_MCUBOOT=y -CONFIG_ESP32_ESPTOOL_TARGET_SECONDARY=y -CONFIG_ESP32_SPIFLASH=y -CONFIG_ESP32_UART0=y -CONFIG_EXAMPLES_MCUBOOT_SLOT_CONFIRM=y -CONFIG_FS_PROCFS=y -CONFIG_HAVE_CXX=y -CONFIG_HAVE_CXXINITIALIZE=y -CONFIG_IDLETHREAD_STACKSIZE=3072 -CONFIG_INIT_ENTRYPOINT="nsh_main" -CONFIG_INTELHEX_BINARY=y -CONFIG_MM_REGIONS=3 -CONFIG_NSH_ARCHINIT=y -CONFIG_NSH_BUILTIN_APPS=y -CONFIG_NSH_FILEIOSIZE=512 -CONFIG_NSH_LINELEN=64 -CONFIG_NSH_MOTD=y -CONFIG_NSH_MOTD_STRING="Firmware OTA update successfully finished!" -CONFIG_NSH_READLINE=y -CONFIG_PREALLOC_TIMERS=4 -CONFIG_RAM_SIZE=114688 -CONFIG_RAM_START=0x20000000 -CONFIG_RR_INTERVAL=200 -CONFIG_SCHED_WAITPID=y -CONFIG_START_DAY=6 -CONFIG_START_MONTH=12 -CONFIG_START_YEAR=2011 -CONFIG_SYSTEM_NSH=y -CONFIG_UART0_SERIAL_CONSOLE=y diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_update_agent/defconfig b/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_update_agent/defconfig deleted file mode 100644 index eb9b0d2009..0000000000 --- a/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_update_agent/defconfig +++ /dev/null @@ -1,81 +0,0 @@ -# -# This file is autogenerated: PLEASE DO NOT EDIT IT. -# -# You can use "make menuconfig" to make any modifications to the installed .config file. -# You can then do "make savedefconfig" to generate a new defconfig file that includes your -# modifications. -# -# CONFIG_NSH_ARGCAT is not set -# CONFIG_NSH_CMDOPT_HEXDUMP is not set -CONFIG_ARCH="xtensa" -CONFIG_ARCH_BOARD="esp32-ethernet-kit" -CONFIG_ARCH_BOARD_COMMON=y -CONFIG_ARCH_BOARD_ESP32_ETHERNETKIT=y -CONFIG_ARCH_CHIP="esp32" -CONFIG_ARCH_CHIP_ESP32=y -CONFIG_ARCH_CHIP_ESP32WROVER=y -CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH_XTENSA=y -CONFIG_BOARDCTL_RESET=y -CONFIG_BOARD_LOOPSPERMSEC=16717 -CONFIG_BUILTIN=y -CONFIG_DEBUG_ASSERTIONS=y -CONFIG_DEBUG_ERROR=y -CONFIG_DEBUG_FEATURES=y -CONFIG_DEBUG_FULLOPT=y -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_SYMBOLS=y -CONFIG_DEBUG_WARN=y -CONFIG_DRIVERS_IEEE80211=y -CONFIG_DRIVERS_WIRELESS=y -CONFIG_ESP32_APP_FORMAT_MCUBOOT=y -CONFIG_ESP32_SPIFLASH=y -CONFIG_ESP32_UART0=y -CONFIG_ESP32_WIFI=y -CONFIG_EXAMPLES_MCUBOOT_UPDATE_AGENT=y -CONFIG_EXAMPLES_MCUBOOT_UPDATE_AGENT_DL_BUFFER_SIZE=4096 -CONFIG_FS_PROCFS=y -CONFIG_HAVE_CXX=y -CONFIG_HAVE_CXXINITIALIZE=y -CONFIG_IDLETHREAD_STACKSIZE=3072 -CONFIG_INIT_ENTRYPOINT="nsh_main" -CONFIG_INTELHEX_BINARY=y -CONFIG_MM_REGIONS=3 -CONFIG_NAME_MAX=48 -CONFIG_NETDB_DNSCLIENT=y -CONFIG_NETDEV_LATEINIT=y -CONFIG_NETDEV_PHY_IOCTL=y -CONFIG_NETDEV_WIRELESS_IOCTL=y -CONFIG_NETUTILS_WEBCLIENT=y -CONFIG_NET_BROADCAST=y -CONFIG_NET_ICMP=y -CONFIG_NET_ICMP_SOCKET=y -CONFIG_NET_TCP=y -CONFIG_NET_UDP=y -CONFIG_NSH_ARCHINIT=y -CONFIG_NSH_BUILTIN_APPS=y -CONFIG_NSH_FILEIOSIZE=512 -CONFIG_NSH_LINELEN=300 -CONFIG_NSH_MOTD=y -CONFIG_NSH_MOTD_STRING="Welcome to MCUboot support on NuttX!" -CONFIG_NSH_READLINE=y -CONFIG_PREALLOC_TIMERS=4 -CONFIG_PTHREAD_MUTEX_TYPES=y -CONFIG_RAM_SIZE=114688 -CONFIG_RAM_START=0x20000000 -CONFIG_RR_INTERVAL=200 -CONFIG_SCHED_LPWORK=y -CONFIG_SCHED_WAITPID=y -CONFIG_SIG_DEFAULT=y -CONFIG_START_DAY=6 -CONFIG_START_MONTH=12 -CONFIG_START_YEAR=2011 -CONFIG_SYSTEM_DHCPC_RENEW=y -CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_PING=y -CONFIG_TLS_TASK_NELEM=4 -CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_WIRELESS=y -CONFIG_WIRELESS_WAPI=y -CONFIG_WIRELESS_WAPI_CMDTOOL=y -CONFIG_WIRELESS_WAPI_STACKSIZE=4096 diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_slot_confirm/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_slot_confirm/defconfig deleted file mode 100644 index 6dcc02356c..0000000000 --- a/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_slot_confirm/defconfig +++ /dev/null @@ -1,51 +0,0 @@ -# -# This file is autogenerated: PLEASE DO NOT EDIT IT. -# -# You can use "make menuconfig" to make any modifications to the installed .config file. -# You can then do "make savedefconfig" to generate a new defconfig file that includes your -# modifications. -# -# CONFIG_ARCH_LEDS is not set -# CONFIG_NSH_ARGCAT is not set -# CONFIG_NSH_CMDOPT_HEXDUMP is not set -CONFIG_ARCH="xtensa" -CONFIG_ARCH_BOARD="esp32-wrover-kit" -CONFIG_ARCH_BOARD_COMMON=y -CONFIG_ARCH_BOARD_ESP32_WROVERKIT=y -CONFIG_ARCH_CHIP="esp32" -CONFIG_ARCH_CHIP_ESP32=y -CONFIG_ARCH_CHIP_ESP32WROVER=y -CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH_XTENSA=y -CONFIG_BOARDCTL_RESET=y -CONFIG_BOARD_LOOPSPERMSEC=16717 -CONFIG_BUILTIN=y -CONFIG_ESP32_APP_FORMAT_MCUBOOT=y -CONFIG_ESP32_ESPTOOL_TARGET_SECONDARY=y -CONFIG_ESP32_SPIFLASH=y -CONFIG_ESP32_UART0=y -CONFIG_EXAMPLES_MCUBOOT_SLOT_CONFIRM=y -CONFIG_FS_PROCFS=y -CONFIG_HAVE_CXX=y -CONFIG_HAVE_CXXINITIALIZE=y -CONFIG_IDLETHREAD_STACKSIZE=3072 -CONFIG_INIT_ENTRYPOINT="nsh_main" -CONFIG_INTELHEX_BINARY=y -CONFIG_MM_REGIONS=3 -CONFIG_NSH_ARCHINIT=y -CONFIG_NSH_BUILTIN_APPS=y -CONFIG_NSH_FILEIOSIZE=512 -CONFIG_NSH_LINELEN=64 -CONFIG_NSH_MOTD=y -CONFIG_NSH_MOTD_STRING="Firmware OTA update successfully finished!" -CONFIG_NSH_READLINE=y -CONFIG_PREALLOC_TIMERS=4 -CONFIG_RAM_SIZE=114688 -CONFIG_RAM_START=0x20000000 -CONFIG_RR_INTERVAL=200 -CONFIG_SCHED_WAITPID=y -CONFIG_START_DAY=6 -CONFIG_START_MONTH=12 -CONFIG_START_YEAR=2011 -CONFIG_SYSTEM_NSH=y -CONFIG_UART0_SERIAL_CONSOLE=y diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_update_agent/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_update_agent/defconfig deleted file mode 100644 index 6e3df28548..0000000000 --- a/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_update_agent/defconfig +++ /dev/null @@ -1,82 +0,0 @@ -# -# This file is autogenerated: PLEASE DO NOT EDIT IT. -# -# You can use "make menuconfig" to make any modifications to the installed .config file. -# You can then do "make savedefconfig" to generate a new defconfig file that includes your -# modifications. -# -# CONFIG_ARCH_LEDS is not set -# CONFIG_NSH_ARGCAT is not set -# CONFIG_NSH_CMDOPT_HEXDUMP is not set -CONFIG_ARCH="xtensa" -CONFIG_ARCH_BOARD="esp32-wrover-kit" -CONFIG_ARCH_BOARD_COMMON=y -CONFIG_ARCH_BOARD_ESP32_WROVERKIT=y -CONFIG_ARCH_CHIP="esp32" -CONFIG_ARCH_CHIP_ESP32=y -CONFIG_ARCH_CHIP_ESP32WROVER=y -CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH_XTENSA=y -CONFIG_BOARDCTL_RESET=y -CONFIG_BOARD_LOOPSPERMSEC=16717 -CONFIG_BUILTIN=y -CONFIG_DEBUG_ASSERTIONS=y -CONFIG_DEBUG_ERROR=y -CONFIG_DEBUG_FEATURES=y -CONFIG_DEBUG_FULLOPT=y -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_SYMBOLS=y -CONFIG_DEBUG_WARN=y -CONFIG_DRIVERS_IEEE80211=y -CONFIG_DRIVERS_WIRELESS=y -CONFIG_ESP32_APP_FORMAT_MCUBOOT=y -CONFIG_ESP32_SPIFLASH=y -CONFIG_ESP32_UART0=y -CONFIG_ESP32_WIFI=y -CONFIG_EXAMPLES_MCUBOOT_UPDATE_AGENT=y -CONFIG_EXAMPLES_MCUBOOT_UPDATE_AGENT_DL_BUFFER_SIZE=4096 -CONFIG_FS_PROCFS=y -CONFIG_HAVE_CXX=y -CONFIG_HAVE_CXXINITIALIZE=y -CONFIG_IDLETHREAD_STACKSIZE=3072 -CONFIG_INIT_ENTRYPOINT="nsh_main" -CONFIG_INTELHEX_BINARY=y -CONFIG_MM_REGIONS=3 -CONFIG_NAME_MAX=48 -CONFIG_NETDB_DNSCLIENT=y -CONFIG_NETDEV_LATEINIT=y -CONFIG_NETDEV_PHY_IOCTL=y -CONFIG_NETDEV_WIRELESS_IOCTL=y -CONFIG_NETUTILS_WEBCLIENT=y -CONFIG_NET_BROADCAST=y -CONFIG_NET_ICMP=y -CONFIG_NET_ICMP_SOCKET=y -CONFIG_NET_TCP=y -CONFIG_NET_UDP=y -CONFIG_NSH_ARCHINIT=y -CONFIG_NSH_BUILTIN_APPS=y -CONFIG_NSH_FILEIOSIZE=512 -CONFIG_NSH_LINELEN=300 -CONFIG_NSH_MOTD=y -CONFIG_NSH_MOTD_STRING="Welcome to MCUboot support on NuttX!" -CONFIG_NSH_READLINE=y -CONFIG_PREALLOC_TIMERS=4 -CONFIG_PTHREAD_MUTEX_TYPES=y -CONFIG_RAM_SIZE=114688 -CONFIG_RAM_START=0x20000000 -CONFIG_RR_INTERVAL=200 -CONFIG_SCHED_LPWORK=y -CONFIG_SCHED_WAITPID=y -CONFIG_SIG_DEFAULT=y -CONFIG_START_DAY=6 -CONFIG_START_MONTH=12 -CONFIG_START_YEAR=2011 -CONFIG_SYSTEM_DHCPC_RENEW=y -CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_PING=y -CONFIG_TLS_TASK_NELEM=4 -CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_WIRELESS=y -CONFIG_WIRELESS_WAPI=y -CONFIG_WIRELESS_WAPI_CMDTOOL=y -CONFIG_WIRELESS_WAPI_STACKSIZE=4096