You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by pk...@apache.org on 2022/03/19 14:10:02 UTC
[incubator-nuttx] branch master updated (3fff450 -> 6740ec3)
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from 3fff450 netinitialize: call xxx_netinitialize unconditionally
new 4caa8b1 boards/risc-v/esp32c3: Fix mcuboot configs
new 2d906bb boards/xtensa/esp32: Fix mcuboot configs
new 2965345 boards/arm/samv7: Fix mcuboot configs
new 6740ec3 boards/arm/samv7/samv71-xult: Add mcuboot update example configs
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
boards/arm/samv7/same70-qmtech/README.txt | 5 +-
.../defconfig | 3 +-
boards/arm/samv7/same70-xplained/README.txt | 5 +-
.../defconfig | 3 +-
boards/arm/samv7/samv71-xult/README.txt | 111 +++++++++++++++++++--
.../defconfig | 3 +-
.../{mcuboot-nsh => mcuboot-swap-test}/defconfig | 3 +-
.../configs/mcuboot-update-agent}/defconfig | 68 ++++++++++---
.../defconfig | 3 +-
.../defconfig | 3 +-
.../defconfig | 5 +-
.../defconfig | 3 +-
.../defconfig | 5 +-
.../defconfig | 3 +-
.../defconfig | 5 +-
15 files changed, 174 insertions(+), 54 deletions(-)
rename boards/arm/samv7/same70-qmtech/configs/{mcuboot-confirm => mcuboot-slot-confirm}/defconfig (96%)
copy boards/arm/samv7/same70-xplained/configs/{mcuboot-confirm => mcuboot-slot-confirm}/defconfig (97%)
copy boards/arm/samv7/samv71-xult/configs/{mcuboot-nsh => mcuboot-slot-confirm}/defconfig (96%)
rename boards/arm/samv7/samv71-xult/configs/{mcuboot-nsh => mcuboot-swap-test}/defconfig (96%)
rename boards/arm/samv7/{same70-xplained/configs/mcuboot-confirm => samv71-xult/configs/mcuboot-update-agent}/defconfig (54%)
rename boards/risc-v/esp32c3/esp32c3-devkit/configs/{mcuboot_confirm => mcuboot_slot_confirm}/defconfig (96%)
rename boards/xtensa/esp32/esp32-devkitc/configs/{mcuboot_confirm => mcuboot_slot_confirm}/defconfig (96%)
rename boards/xtensa/esp32/esp32-devkitc/configs/{mcuboot_agent => mcuboot_update_agent}/defconfig (94%)
rename boards/xtensa/esp32/esp32-ethernet-kit/configs/{mcuboot_confirm => mcuboot_slot_confirm}/defconfig (96%)
rename boards/xtensa/esp32/esp32-ethernet-kit/configs/{mcuboot_agent => mcuboot_update_agent}/defconfig (94%)
rename boards/xtensa/esp32/esp32-wrover-kit/configs/{mcuboot_confirm => mcuboot_slot_confirm}/defconfig (96%)
rename boards/xtensa/esp32/esp32-wrover-kit/configs/{mcuboot_agent => mcuboot_update_agent}/defconfig (94%)
[incubator-nuttx] 03/04: boards/arm/samv7: Fix mcuboot configs
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 2965345e1420479880f52925ef4f1ee02fe1b962
Author: Gerson Fernando Budke <ge...@ossystems.com.br>
AuthorDate: Sun Feb 27 09:07:10 2022 -0300
boards/arm/samv7: Fix mcuboot configs
MCUboot apps were moved to examples directory. This fix configs due to
recent changes.
Signed-off-by: Gerson Fernando Budke <ge...@ossystems.com.br>
---
boards/arm/samv7/same70-qmtech/README.txt | 5 ++---
.../{mcuboot-confirm => mcuboot-slot-confirm}/defconfig | 3 +--
boards/arm/samv7/same70-xplained/README.txt | 5 ++---
.../{mcuboot-confirm => mcuboot-slot-confirm}/defconfig | 3 +--
boards/arm/samv7/samv71-xult/README.txt | 15 +++++++--------
.../configs/{mcuboot-nsh => mcuboot-swap-test}/defconfig | 3 +--
6 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/boards/arm/samv7/same70-qmtech/README.txt b/boards/arm/samv7/same70-qmtech/README.txt
index 3ffefb3..cebc752 100644
--- a/boards/arm/samv7/same70-qmtech/README.txt
+++ b/boards/arm/samv7/same70-qmtech/README.txt
@@ -797,7 +797,7 @@ Configuration sub-directories
CONFIG_SAMV7_FORMAT_MCUBOOT=y
CONFIG_INIT_ENTRYPOINT="mcuboot_loader_main"
- mcuboot-confirm:
+ mcuboot-slot-confirm:
This configuration exercises the MCUboot compatible application slot
confirm example.
@@ -811,8 +811,7 @@ Configuration sub-directories
CONFIG_BOARD_LATE_INITIALIZE=y
- CONFIG_BOOT_MCUBOOT=y
- CONFIG_MCUBOOT_SLOT_CONFIRM_EXAMPLE=y
+ CONFIG_EXAMPLES_MCUBOOT_SLOT_CONFIRM=y
CONFIG_SAMV7_FORMAT_MCUBOOT=y
CONFIG_INIT_ENTRYPOINT="mcuboot_confirm_main"
diff --git a/boards/arm/samv7/same70-qmtech/configs/mcuboot-confirm/defconfig b/boards/arm/samv7/same70-qmtech/configs/mcuboot-slot-confirm/defconfig
similarity index 96%
rename from boards/arm/samv7/same70-qmtech/configs/mcuboot-confirm/defconfig
rename to boards/arm/samv7/same70-qmtech/configs/mcuboot-slot-confirm/defconfig
index bf2d8a7..4fe7e2a 100644
--- a/boards/arm/samv7/same70-qmtech/configs/mcuboot-confirm/defconfig
+++ b/boards/arm/samv7/same70-qmtech/configs/mcuboot-slot-confirm/defconfig
@@ -26,14 +26,13 @@ CONFIG_ARMV7M_ICACHE=y
CONFIG_ARMV7M_LAZYFPU=y
CONFIG_BOARD_LATE_INITIALIZE=y
CONFIG_BOARD_LOOPSPERMSEC=51262
-CONFIG_BOOT_MCUBOOT=y
CONFIG_BUILTIN=y
+CONFIG_EXAMPLES_MCUBOOT_SLOT_CONFIRM=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
CONFIG_INIT_ENTRYPOINT="mcuboot_confirm_main"
-CONFIG_MCUBOOT_SLOT_CONFIRM_EXAMPLE=y
CONFIG_MMCSD_MULTIBLOCK_LIMIT=1
CONFIG_MMCSD_SDIO=y
CONFIG_NSH_ARCHINIT=y
diff --git a/boards/arm/samv7/same70-xplained/README.txt b/boards/arm/samv7/same70-xplained/README.txt
index 803ab37..8111050 100644
--- a/boards/arm/samv7/same70-xplained/README.txt
+++ b/boards/arm/samv7/same70-xplained/README.txt
@@ -1719,7 +1719,7 @@ Configuration sub-directories
CONFIG_SAMV7_FORMAT_MCUBOOT=y
CONFIG_INIT_ENTRYPOINT="mcuboot_loader_main"
- mcuboot-confirm:
+ mcuboot-slot-confirm:
This configuration exercises the MCUboot compatible application slot
confirm example.
@@ -1733,8 +1733,7 @@ Configuration sub-directories
CONFIG_BOARD_LATE_INITIALIZE=y
- CONFIG_BOOT_MCUBOOT=y
- CONFIG_MCUBOOT_SLOT_CONFIRM_EXAMPLE=y
+ CONFIG_EXAMPLES_MCUBOOT_SLOT_CONFIRM=y
CONFIG_SAMV7_FORMAT_MCUBOOT=y
CONFIG_INIT_ENTRYPOINT="mcuboot_confirm_main"
diff --git a/boards/arm/samv7/same70-xplained/configs/mcuboot-confirm/defconfig b/boards/arm/samv7/same70-xplained/configs/mcuboot-slot-confirm/defconfig
similarity index 97%
rename from boards/arm/samv7/same70-xplained/configs/mcuboot-confirm/defconfig
rename to boards/arm/samv7/same70-xplained/configs/mcuboot-slot-confirm/defconfig
index f84923a..12cc258 100644
--- a/boards/arm/samv7/same70-xplained/configs/mcuboot-confirm/defconfig
+++ b/boards/arm/samv7/same70-xplained/configs/mcuboot-slot-confirm/defconfig
@@ -35,15 +35,14 @@ CONFIG_AT24XX_EXTSIZE=160
CONFIG_AT24XX_SIZE=2
CONFIG_BOARD_LATE_INITIALIZE=y
CONFIG_BOARD_LOOPSPERMSEC=51262
-CONFIG_BOOT_MCUBOOT=y
CONFIG_BUILTIN=y
+CONFIG_EXAMPLES_MCUBOOT_SLOT_CONFIRM=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
CONFIG_I2CTOOL_MAXBUS=0
CONFIG_INIT_ENTRYPOINT="mcuboot_confirm_main"
-CONFIG_MCUBOOT_SLOT_CONFIRM_EXAMPLE=y
CONFIG_MMCSD_MULTIBLOCK_LIMIT=1
CONFIG_MMCSD_SDIO=y
CONFIG_MTD_AT24XX=y
diff --git a/boards/arm/samv7/samv71-xult/README.txt b/boards/arm/samv7/samv71-xult/README.txt
index 99d759e..8146766 100644
--- a/boards/arm/samv7/samv71-xult/README.txt
+++ b/boards/arm/samv7/samv71-xult/README.txt
@@ -2600,8 +2600,8 @@ Configuration sub-directories
-c 'atsamv gpnvm set 1' \
-c 'reset run' -c shutdown
- mcuboot-nsh:
- This configuration exercises the MCUboot compatible application slot
+ mcuboot-swap-test:
+ This configuration exercises the MCUboot compatible application swap image
example. The application is NuttX nsh with some special commands.
Generate signed binaries for MCUboot compatible application:
@@ -2609,12 +2609,12 @@ Configuration sub-directories
./apps/boot/mcuboot/mcuboot/scripts/imgtool.py sign \
--key apps/boot/mcuboot/mcuboot/root-rsa-2048.pem --align 8 \
--version 1.0.0 --header-size 0x200 --pad-header --slot-size 0xe0000 \
- nuttx/nuttx.bin mcuboot_nuttx.app.nsh.confirmed-v1.bin
+ nuttx/nuttx.bin mcuboot_nuttx.app.swap.test.confirm-v1.bin
./apps/boot/mcuboot/mcuboot/scripts/imgtool.py sign \
--key apps/boot/mcuboot/mcuboot/root-rsa-2048.pem --align 8 \
--version 2.0.0 --header-size 0x200 --pad-header --slot-size 0xe0000 \
- nuttx/nuttx.bin mcuboot_nuttx.app.nsh.confirmed-v2.bin
+ nuttx/nuttx.bin mcuboot_nuttx.app.swap.test.confirm-v2.bin
Flash application version 1.0.0 at MCUboot Slot-0:
@@ -2625,7 +2625,7 @@ Configuration sub-directories
-c 'reset_config srst_only' \
-c init -c targets \
-c 'reset halt' \
- -c 'program mcuboot_nuttx.app.nsh.confirmed-v1.bin 0x420000' \
+ -c 'program mcuboot_nuttx.app.swap.test.confirm-v1.bin 0x420000' \
-c 'reset halt' \
-c 'atsamv gpnvm set 1' \
-c 'reset run' -c shutdown
@@ -2639,15 +2639,14 @@ Configuration sub-directories
-c 'reset_config srst_only' \
-c init -c targets \
-c 'reset halt' \
- -c 'program mcuboot_nuttx.app.nsh.confirmed-v2.bin 0x500000' \
+ -c 'program mcuboot_nuttx.app.swap.test.confirm-v2.bin 0x500000' \
-c 'reset halt' \
-c 'atsamv gpnvm set 1' \
-c 'reset run' -c shutdown
Relevant configuration settings:
- CONFIG_BOOT_MCUBOOT=y
- CONFIG_MCUBOOT_SLOT_CONFIRM_EXAMPLE=y
+ CONFIG_EXAMPLES_MCUBOOT_SWAP_TEST=y
CONFIG_SAMV7_FORMAT_MCUBOOT=y
CONFIG_INIT_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/samv7/samv71-xult/configs/mcuboot-nsh/defconfig b/boards/arm/samv7/samv71-xult/configs/mcuboot-swap-test/defconfig
similarity index 96%
rename from boards/arm/samv7/samv71-xult/configs/mcuboot-nsh/defconfig
rename to boards/arm/samv7/samv71-xult/configs/mcuboot-swap-test/defconfig
index 9371e40..8052152 100644
--- a/boards/arm/samv7/samv71-xult/configs/mcuboot-nsh/defconfig
+++ b/boards/arm/samv7/samv71-xult/configs/mcuboot-swap-test/defconfig
@@ -29,11 +29,10 @@ CONFIG_ARMV7M_LAZYFPU=y
CONFIG_BOARDCTL_RESET=y
CONFIG_BOARD_LATE_INITIALIZE=y
CONFIG_BOARD_LOOPSPERMSEC=51262
-CONFIG_BOOT_MCUBOOT=y
CONFIG_BUILTIN=y
+CONFIG_EXAMPLES_MCUBOOT_SWAP_TEST=y
CONFIG_FS_PROCFS=y
CONFIG_INIT_ENTRYPOINT="nsh_main"
-CONFIG_MCUBOOT_SLOT_CONFIRM_EXAMPLE=y
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512
[incubator-nuttx] 02/04: boards/xtensa/esp32: Fix mcuboot configs
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 2d906bb28fbd8793982f230032999473936d9db5
Author: Gerson Fernando Budke <ge...@ossystems.com.br>
AuthorDate: Sun Feb 27 09:28:57 2022 -0300
boards/xtensa/esp32: Fix mcuboot configs
MCUboot apps were moved to examples directory. This fix configs due to
recent changes.
Signed-off-by: Gerson Fernando Budke <ge...@ossystems.com.br>
---
.../configs/{mcuboot_confirm => mcuboot_slot_confirm}/defconfig | 3 +--
.../configs/{mcuboot_agent => mcuboot_update_agent}/defconfig | 5 ++---
.../configs/{mcuboot_confirm => mcuboot_slot_confirm}/defconfig | 3 +--
.../configs/{mcuboot_agent => mcuboot_update_agent}/defconfig | 5 ++---
.../configs/{mcuboot_confirm => mcuboot_slot_confirm}/defconfig | 3 +--
.../configs/{mcuboot_agent => mcuboot_update_agent}/defconfig | 5 ++---
6 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_confirm/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_slot_confirm/defconfig
similarity index 96%
rename from boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_confirm/defconfig
rename to boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_slot_confirm/defconfig
index 6ce4311..35893fa 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_confirm/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_slot_confirm/defconfig
@@ -20,12 +20,12 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH_XTENSA=y
CONFIG_BOARDCTL_RESET=y
CONFIG_BOARD_LOOPSPERMSEC=16717
-CONFIG_BOOT_MCUBOOT=y
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_EXPERIMENTAL=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
@@ -33,7 +33,6 @@ CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IDLETHREAD_STACKSIZE=3072
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
-CONFIG_MCUBOOT_SLOT_CONFIRM_EXAMPLE=y
CONFIG_MM_REGIONS=3
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_agent/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_update_agent/defconfig
similarity index 94%
rename from boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_agent/defconfig
rename to boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_update_agent/defconfig
index 44a2650..c2f1daa 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_agent/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_update_agent/defconfig
@@ -20,7 +20,6 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH_XTENSA=y
CONFIG_BOARDCTL_RESET=y
CONFIG_BOARD_LOOPSPERMSEC=16717
-CONFIG_BOOT_MCUBOOT=y
CONFIG_BUILTIN=y
CONFIG_DEBUG_ASSERTIONS=y
CONFIG_DEBUG_ERROR=y
@@ -35,6 +34,8 @@ CONFIG_ESP32_APP_FORMAT_MCUBOOT=y
CONFIG_ESP32_SPIFLASH=y
CONFIG_ESP32_UART0=y
CONFIG_ESP32_WIRELESS=y
+CONFIG_EXAMPLES_MCUBOOT_UPDATE_AGENT=y
+CONFIG_EXAMPLES_MCUBOOT_UPDATE_AGENT_DL_BUFFER_SIZE=4096
CONFIG_EXPERIMENTAL=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
@@ -44,8 +45,6 @@ CONFIG_IDLETHREAD_STACKSIZE=3072
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBC_FLOATINGPOINT=y
-CONFIG_MCUBOOT_UPDATE_AGENT_EXAMPLE=y
-CONFIG_MCUBOOT_UPDATE_AGENT_EXAMPLE_DL_BUFFER_SIZE=4096
CONFIG_MM_REGIONS=3
CONFIG_NAME_MAX=48
CONFIG_NETDB_DNSCLIENT=y
diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_confirm/defconfig b/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_slot_confirm/defconfig
similarity index 96%
rename from boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_confirm/defconfig
rename to boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_slot_confirm/defconfig
index 4e41506..6689951 100644
--- a/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_confirm/defconfig
+++ b/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_slot_confirm/defconfig
@@ -19,12 +19,12 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH_XTENSA=y
CONFIG_BOARDCTL_RESET=y
CONFIG_BOARD_LOOPSPERMSEC=16717
-CONFIG_BOOT_MCUBOOT=y
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_EXPERIMENTAL=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
@@ -32,7 +32,6 @@ CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IDLETHREAD_STACKSIZE=3072
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
-CONFIG_MCUBOOT_SLOT_CONFIRM_EXAMPLE=y
CONFIG_MM_REGIONS=3
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_agent/defconfig b/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_update_agent/defconfig
similarity index 94%
rename from boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_agent/defconfig
rename to boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_update_agent/defconfig
index 6aa6989..f15aa3e 100644
--- a/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_agent/defconfig
+++ b/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_update_agent/defconfig
@@ -19,7 +19,6 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH_XTENSA=y
CONFIG_BOARDCTL_RESET=y
CONFIG_BOARD_LOOPSPERMSEC=16717
-CONFIG_BOOT_MCUBOOT=y
CONFIG_BUILTIN=y
CONFIG_DEBUG_ASSERTIONS=y
CONFIG_DEBUG_ERROR=y
@@ -34,6 +33,8 @@ CONFIG_ESP32_APP_FORMAT_MCUBOOT=y
CONFIG_ESP32_SPIFLASH=y
CONFIG_ESP32_UART0=y
CONFIG_ESP32_WIRELESS=y
+CONFIG_EXAMPLES_MCUBOOT_UPDATE_AGENT=y
+CONFIG_EXAMPLES_MCUBOOT_UPDATE_AGENT_DL_BUFFER_SIZE=4096
CONFIG_EXPERIMENTAL=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
@@ -42,8 +43,6 @@ CONFIG_IDLETHREAD_STACKSIZE=3072
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBC_FLOATINGPOINT=y
-CONFIG_MCUBOOT_UPDATE_AGENT_EXAMPLE=y
-CONFIG_MCUBOOT_UPDATE_AGENT_EXAMPLE_DL_BUFFER_SIZE=4096
CONFIG_MM_REGIONS=3
CONFIG_NAME_MAX=48
CONFIG_NETDB_DNSCLIENT=y
diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_confirm/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_slot_confirm/defconfig
similarity index 96%
rename from boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_confirm/defconfig
rename to boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_slot_confirm/defconfig
index 23b0a36..fe502d7 100644
--- a/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_confirm/defconfig
+++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_slot_confirm/defconfig
@@ -20,12 +20,12 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH_XTENSA=y
CONFIG_BOARDCTL_RESET=y
CONFIG_BOARD_LOOPSPERMSEC=16717
-CONFIG_BOOT_MCUBOOT=y
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_EXPERIMENTAL=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
@@ -33,7 +33,6 @@ CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IDLETHREAD_STACKSIZE=3072
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
-CONFIG_MCUBOOT_SLOT_CONFIRM_EXAMPLE=y
CONFIG_MM_REGIONS=3
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_agent/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_update_agent/defconfig
similarity index 94%
rename from boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_agent/defconfig
rename to boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_update_agent/defconfig
index 4cd880b..b09ed27 100644
--- a/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_agent/defconfig
+++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_update_agent/defconfig
@@ -20,7 +20,6 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH_XTENSA=y
CONFIG_BOARDCTL_RESET=y
CONFIG_BOARD_LOOPSPERMSEC=16717
-CONFIG_BOOT_MCUBOOT=y
CONFIG_BUILTIN=y
CONFIG_DEBUG_ASSERTIONS=y
CONFIG_DEBUG_ERROR=y
@@ -35,6 +34,8 @@ CONFIG_ESP32_APP_FORMAT_MCUBOOT=y
CONFIG_ESP32_SPIFLASH=y
CONFIG_ESP32_UART0=y
CONFIG_ESP32_WIRELESS=y
+CONFIG_EXAMPLES_MCUBOOT_UPDATE_AGENT=y
+CONFIG_EXAMPLES_MCUBOOT_UPDATE_AGENT_DL_BUFFER_SIZE=4096
CONFIG_EXPERIMENTAL=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
@@ -43,8 +44,6 @@ CONFIG_IDLETHREAD_STACKSIZE=3072
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBC_FLOATINGPOINT=y
-CONFIG_MCUBOOT_UPDATE_AGENT_EXAMPLE=y
-CONFIG_MCUBOOT_UPDATE_AGENT_EXAMPLE_DL_BUFFER_SIZE=4096
CONFIG_MM_REGIONS=3
CONFIG_NAME_MAX=48
CONFIG_NETDB_DNSCLIENT=y
[incubator-nuttx] 01/04: boards/risc-v/esp32c3: Fix mcuboot configs
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 4caa8b19e9ebf32e4c7772bd9e44afc2b1b8b23e
Author: Gerson Fernando Budke <ge...@ossystems.com.br>
AuthorDate: Sun Feb 27 09:19:47 2022 -0300
boards/risc-v/esp32c3: Fix mcuboot configs
MCUboot apps were moved to examples directory. This fix configs due to
recent changes.
Signed-off-by: Gerson Fernando Budke <ge...@ossystems.com.br>
---
.../configs/{mcuboot_confirm => mcuboot_slot_confirm}/defconfig | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/mcuboot_confirm/defconfig b/boards/risc-v/esp32c3/esp32c3-devkit/configs/mcuboot_slot_confirm/defconfig
similarity index 96%
rename from boards/risc-v/esp32c3/esp32c3-devkit/configs/mcuboot_confirm/defconfig
rename to boards/risc-v/esp32c3/esp32c3-devkit/configs/mcuboot_slot_confirm/defconfig
index 6123b69..3cb7dbd 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/mcuboot_confirm/defconfig
+++ b/boards/risc-v/esp32c3/esp32c3-devkit/configs/mcuboot_slot_confirm/defconfig
@@ -19,12 +19,12 @@ CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARDCTL_RESET=y
CONFIG_BOARD_LOOPSPERMSEC=15000
-CONFIG_BOOT_MCUBOOT=y
CONFIG_BUILTIN=y
CONFIG_DEV_ZERO=y
CONFIG_ESP32C3_APP_FORMAT_MCUBOOT=y
CONFIG_ESP32C3_ESPTOOL_TARGET_SECONDARY=y
CONFIG_ESP32C3_SPIFLASH=y
+CONFIG_EXAMPLES_MCUBOOT_SLOT_CONFIRM=y
CONFIG_EXPERIMENTAL=y
CONFIG_FS_PROCFS=y
CONFIG_FS_SMARTFS=y
@@ -33,7 +33,6 @@ CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBC_PERROR_STDOUT=y
CONFIG_LIBC_STRERROR=y
-CONFIG_MCUBOOT_SLOT_CONFIRM_EXAMPLE=y
CONFIG_MTD_SMART=y
CONFIG_NAME_MAX=48
CONFIG_NSH_ARCHINIT=y
[incubator-nuttx] 04/04: boards/arm/samv7/samv71-xult: Add mcuboot update example configs
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 6740ec3feed49aaf8a7dc0ba22996a62bec9e990
Author: Gerson Fernando Budke <ge...@ossystems.com.br>
AuthorDate: Sun Feb 27 09:43:08 2022 -0300
boards/arm/samv7/samv71-xult: Add mcuboot update example configs
Add MCUboot Update Agent and Slot Confirm configurations. It uses
ethernet with dhcp client to perform download of new image into
internal flash memory.
Signed-off-by: Gerson Fernando Budke <ge...@ossystems.com.br>
---
boards/arm/samv7/samv71-xult/README.txt | 96 +++++++++++++++++
.../configs/mcuboot-slot-confirm/defconfig | 62 +++++++++++
.../configs/mcuboot-update-agent/defconfig | 118 +++++++++++++++++++++
3 files changed, 276 insertions(+)
diff --git a/boards/arm/samv7/samv71-xult/README.txt b/boards/arm/samv7/samv71-xult/README.txt
index 8146766..1b9183e 100644
--- a/boards/arm/samv7/samv71-xult/README.txt
+++ b/boards/arm/samv7/samv71-xult/README.txt
@@ -2650,3 +2650,99 @@ Configuration sub-directories
CONFIG_SAMV7_FORMAT_MCUBOOT=y
CONFIG_INIT_ENTRYPOINT="nsh_main"
+
+ mcuboot-agent:
+ This configuration exercises the MCUboot firmware upgrade example. The
+ application is NuttX nsh with some special commands.
+
+ Generate signed binaries for MCUboot compatible application:
+
+ ./apps/boot/mcuboot/mcuboot/scripts/imgtool.py sign \
+ --key apps/boot/mcuboot/mcuboot/root-rsa-2048.pem --align 8 \
+ --version 1.0.0 --header-size 0x200 --pad-header --slot-size 0xe0000 \
+ --confirm nuttx/nuttx.bin mcuboot_nuttx.update.agent.bin
+
+ Flash agent application at MCUboot Slot-0:
+
+ openocd -f interface/cmsis-dap.cfg \
+ -c 'transport select swd' \
+ -c 'set CHIPNAME atsamv71q21' \
+ -f target/atsamv.cfg \
+ -c 'reset_config srst_only' \
+ -c init -c targets \
+ -c 'reset halt' \
+ -c 'program mcuboot_nuttx.update.agent.bin 0x420000' \
+ -c 'reset halt' \
+ -c 'atsamv gpnvm set 1' \
+ -c 'reset run' -c shutdown
+
+ The board is ready to perform an upgrade. However, this example requires
+ use an image to be used as new application. You can use the Confirm example,
+ which will be used in the download process.
+
+ See mcuboot-confirm for more information.
+
+ Relevant configuration settings:
+
+ CONFIG_EXAMPLES_MCUBOOT_UPDATE_AGENT=y
+
+ CONFIG_SAMV7_FORMAT_MCUBOOT=y
+ CONFIG_INIT_ENTRYPOINT="nsh_main"
+
+ mcuboot-confirm:
+
+ ./apps/boot/mcuboot/mcuboot/scripts/imgtool.py sign \
+ --key apps/boot/mcuboot/mcuboot/root-rsa-2048.pem --align 8 \
+ --version 2.0.0 --header-size 0x200 --pad-header --slot-size 0xe0000 \
+ nuttx/nuttx.bin mcuboot_nuttx.slot.confirm.bin
+
+ The mcuboot_nuttx.app.confirm.bin would be used at http server in your
+ network to be downloaded by Agent at MCUboot Slot-1.
+
+ Using Python to create a http server at your NuttX workspace:
+
+ sudo python -m http.server 8080 &
+
+ Test download:
+
+ wget <your PC IP>:8080/mcuboot_nuttx.slot.confirm.bin -O test.bin
+
+ Check MD5:
+
+ md5sum mcuboot_nuttx.slot.confirm.bin test.bin
+ 958b523f1049696aba73354615868b7f mcuboot_nuttx.slot.confirm.bin test.bin
+ 958b523f1049696aba73354615868b7f test.bin
+ rm test.bin
+
+ The OTA config uses DHCP client to get local ip address. This way your board
+ will have automatically access to your network. Let's check board.
+
+ ping <your PC IP>
+ PING xxx.xxx.xxx.xxx 56 bytes of data
+ 56 bytes from xxx.xxx.xxx.xxx: icmp_seq=0 time=0 ms
+ 56 bytes from xxx.xxx.xxx.xxx: icmp_seq=1 time=0 ms
+ ...
+ 56 bytes from xxx.xxx.xxx.xxx: icmp_seq=9 time=0 ms
+ 10 packets transmitted, 10 received, 0% packet loss, time 10100 ms
+
+ nsh> mcuboot_agent http://xxx.xxx.xxx.xxx:8080/mcuboot_nuttx.slot.confirm.bin
+ MCUboot Update Agen192.168.10.104 - - [16/Dec/2021 19:29:08]
+ "GET /mcuboot_nuttx.slot.confirm.bin HTTP/1.0" 200 -t example
+ Downloading from http://xxx.xxx.xxx.xxx:8080/signedv2.bin
+ Firmware Update size: 194464 bytes
+ Received: 512 of 194464 bytes [0%]
+ Received: 1024 of 194464 bytes [0%]
+ ...
+ Received: 194048 of 194464 bytes [99%]
+ Received: 194468 of 194468 bytes [100%]
+ Application Image successfully downloaded!
+ Requested update for next boot. Restarting...
+ *** Booting MCUboot build 7c890f4b075aed73e4c825ccf875b2fb9ebf2ded ***
+ Application Image successfully confirmed!
+
+ Relevant configuration settings:
+
+ CONFIG_EXAMPLES_MCUBOOT_SLOT_CONFIRM=y
+
+ CONFIG_SAMV7_FORMAT_MCUBOOT=y
+ CONFIG_INIT_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/samv7/samv71-xult/configs/mcuboot-slot-confirm/defconfig b/boards/arm/samv7/samv71-xult/configs/mcuboot-slot-confirm/defconfig
new file mode 100644
index 0000000..91665a2
--- /dev/null
+++ b/boards/arm/samv7/samv71-xult/configs/mcuboot-slot-confirm/defconfig
@@ -0,0 +1,62 @@
+#
+# 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_SAMV7_UART0 is not set
+# CONFIG_SAMV7_UART2 is not set
+# CONFIG_SAMV7_UART4 is not set
+CONFIG_ARCH="arm"
+CONFIG_ARCH_BOARD="samv71-xult"
+CONFIG_ARCH_BOARD_COMMON=y
+CONFIG_ARCH_BOARD_SAMV71_XULT=y
+CONFIG_ARCH_BUTTONS=y
+CONFIG_ARCH_CHIP="samv7"
+CONFIG_ARCH_CHIP_SAMV71=y
+CONFIG_ARCH_CHIP_SAMV71Q21=y
+CONFIG_ARCH_CHIP_SAMV71Q=y
+CONFIG_ARCH_CHIP_SAMV7=y
+CONFIG_ARCH_CHIP_SAMV7_MEM_FLASH=0x200000
+CONFIG_ARCH_CHIP_SAMV7_MEM_RAM=0x60000
+CONFIG_ARCH_INTERRUPTSTACK=2048
+CONFIG_ARCH_IRQBUTTONS=y
+CONFIG_ARCH_STACKDUMP=y
+CONFIG_ARMV7M_DCACHE=y
+CONFIG_ARMV7M_ICACHE=y
+CONFIG_ARMV7M_LAZYFPU=y
+CONFIG_BOARDCTL_RESET=y
+CONFIG_BOARD_LATE_INITIALIZE=y
+CONFIG_BOARD_LOOPSPERMSEC=51262
+CONFIG_BUILTIN=y
+CONFIG_EXAMPLES_MCUBOOT_SLOT_CONFIRM=y
+CONFIG_FS_PROCFS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_NSH_ARCHINIT=y
+CONFIG_NSH_BUILTIN_APPS=y
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_READLINE=y
+CONFIG_PREALLOC_TIMERS=4
+CONFIG_PTABLE_PARTITION=y
+CONFIG_RAM_SIZE=393216
+CONFIG_RAM_START=0x20400000
+CONFIG_RAW_BINARY=y
+CONFIG_RR_INTERVAL=200
+CONFIG_SAMV7_FORMAT_MCUBOOT=y
+CONFIG_SAMV7_GPIOA_IRQ=y
+CONFIG_SAMV7_GPIOB_IRQ=y
+CONFIG_SAMV7_GPIOD_IRQ=y
+CONFIG_SAMV7_GPIO_IRQ=y
+CONFIG_SAMV7_SYSTEMRESET=y
+CONFIG_SAMV7_USART1=y
+CONFIG_SAMV7_XDMAC=y
+CONFIG_SCHED_HPWORK=y
+CONFIG_SCHED_WAITPID=y
+CONFIG_START_DAY=10
+CONFIG_START_MONTH=3
+CONFIG_START_YEAR=2014
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_RAMTEST=y
+CONFIG_USART1_SERIAL_CONSOLE=y
diff --git a/boards/arm/samv7/samv71-xult/configs/mcuboot-update-agent/defconfig b/boards/arm/samv7/samv71-xult/configs/mcuboot-update-agent/defconfig
new file mode 100644
index 0000000..dc290f0
--- /dev/null
+++ b/boards/arm/samv7/samv71-xult/configs/mcuboot-update-agent/defconfig
@@ -0,0 +1,118 @@
+#
+# 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_MMCSD_MMCSUPPORT is not set
+# CONFIG_MMCSD_SPI is not set
+# CONFIG_SAMV7_UART0 is not set
+# CONFIG_SAMV7_UART2 is not set
+# CONFIG_SAMV7_UART4 is not set
+CONFIG_ARCH="arm"
+CONFIG_ARCH_BOARD="samv71-xult"
+CONFIG_ARCH_BOARD_COMMON=y
+CONFIG_ARCH_BOARD_SAMV71_XULT=y
+CONFIG_ARCH_BUTTONS=y
+CONFIG_ARCH_CHIP="samv7"
+CONFIG_ARCH_CHIP_SAMV71=y
+CONFIG_ARCH_CHIP_SAMV71Q21=y
+CONFIG_ARCH_CHIP_SAMV71Q=y
+CONFIG_ARCH_CHIP_SAMV7=y
+CONFIG_ARCH_CHIP_SAMV7_MEM_FLASH=0x200000
+CONFIG_ARCH_CHIP_SAMV7_MEM_RAM=0x60000
+CONFIG_ARCH_INTERRUPTSTACK=2048
+CONFIG_ARCH_IRQBUTTONS=y
+CONFIG_ARCH_STACKDUMP=y
+CONFIG_ARMV7M_DCACHE=y
+CONFIG_ARMV7M_ICACHE=y
+CONFIG_ARMV7M_LAZYFPU=y
+CONFIG_AT24XX_ADDR=0x57
+CONFIG_AT24XX_EXTENDED=y
+CONFIG_AT24XX_EXTSIZE=160
+CONFIG_AT24XX_SIZE=2
+CONFIG_BOARDCTL_RESET=y
+CONFIG_BOARD_LOOPSPERMSEC=51262
+CONFIG_BUILTIN=y
+CONFIG_DEBUG_CUSTOMOPT=y
+CONFIG_ETH0_PHY_KSZ8061=y
+CONFIG_EXAMPLES_MCUBOOT_UPDATE_AGENT=y
+CONFIG_EXAMPLES_MCUBOOT_UPDATE_AGENT_DL_BUFFER_SIZE=4096
+CONFIG_FAT_LCNAMES=y
+CONFIG_FAT_LFN=y
+CONFIG_FS_FAT=y
+CONFIG_FS_PROCFS=y
+CONFIG_I2CTOOL_MAXBUS=0
+CONFIG_LIBC_HOSTNAME="SAMV71-XULT"
+CONFIG_MMCSD_SDIO=y
+CONFIG_MTD_AT24XX=y
+CONFIG_MTD_AT25=y
+CONFIG_MTD_CONFIG=y
+CONFIG_NET=y
+CONFIG_NETDB_DNSCLIENT=y
+CONFIG_NETDEV_PHY_IOCTL=y
+CONFIG_NETDEV_STATISTICS=y
+CONFIG_NETDOWN_NOTIFIER=y
+CONFIG_NETINIT_DHCPC=y
+CONFIG_NETINIT_DNS=y
+CONFIG_NETINIT_MONITOR=y
+CONFIG_NETINIT_THREAD=y
+CONFIG_NETLINK_ROUTE=y
+CONFIG_NETUTILS_DHCPC=y
+CONFIG_NETUTILS_TELNETD=y
+CONFIG_NETUTILS_TFTPC=y
+CONFIG_NETUTILS_WEBCLIENT=y
+CONFIG_NET_ARP_SEND=y
+CONFIG_NET_BROADCAST=y
+CONFIG_NET_ICMP=y
+CONFIG_NET_ICMP_SOCKET=y
+CONFIG_NET_NETLINK=y
+CONFIG_NET_ROUTE=y
+CONFIG_NET_STATISTICS=y
+CONFIG_NET_TCP=y
+CONFIG_NET_TCPBACKLOG=y
+CONFIG_NET_TCP_KEEPALIVE=y
+CONFIG_NET_TCP_WRITE_BUFFERS=y
+CONFIG_NET_UDP=y
+CONFIG_NSH_ARCHINIT=y
+CONFIG_NSH_BUILTIN_APPS=y
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_READLINE=y
+CONFIG_PREALLOC_TIMERS=4
+CONFIG_RAM_SIZE=393216
+CONFIG_RAM_START=0x20400000
+CONFIG_RAW_BINARY=y
+CONFIG_READLINE_CMD_HISTORY=y
+CONFIG_READLINE_TABCOMPLETION=y
+CONFIG_RR_INTERVAL=200
+CONFIG_SAMV7_EMAC0=y
+CONFIG_SAMV7_EMAC0_PHYSR=30
+CONFIG_SAMV7_EMAC0_PHYSR_100FD=0x6
+CONFIG_SAMV7_EMAC0_PHYSR_100HD=0x2
+CONFIG_SAMV7_EMAC0_PHYSR_10FD=0x5
+CONFIG_SAMV7_EMAC0_PHYSR_10HD=0x1
+CONFIG_SAMV7_EMAC0_PHYSR_ALTCONFIG=y
+CONFIG_SAMV7_EMAC0_PHYSR_ALTMODE=0x7
+CONFIG_SAMV7_EMAC0_RMII=y
+CONFIG_SAMV7_FORMAT_MCUBOOT=y
+CONFIG_SAMV7_GPIOA_IRQ=y
+CONFIG_SAMV7_GPIOB_IRQ=y
+CONFIG_SAMV7_GPIOD_IRQ=y
+CONFIG_SAMV7_GPIO_IRQ=y
+CONFIG_SAMV7_HSMCI0=y
+CONFIG_SAMV7_SYSTEMRESET=y
+CONFIG_SAMV7_TWIHS0=y
+CONFIG_SAMV7_USART1=y
+CONFIG_SAMV7_XDMAC=y
+CONFIG_SCHED_HPWORK=y
+CONFIG_SCHED_WAITPID=y
+CONFIG_SDIO_BLOCKSETUP=y
+CONFIG_START_DAY=10
+CONFIG_START_MONTH=3
+CONFIG_START_YEAR=2014
+CONFIG_SYSTEM_I2CTOOL=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_PING=y
+CONFIG_USART1_SERIAL_CONSOLE=y