bump Zephyr and s/esp32/esp32_devkitc_wroom/

File contents changes (with an exception of links to Zephyr 3.4.0 documentation of esp32 board): $ sed -i 's/esp32/esp32_devkitc_wroom/g' $(git ls-files) File names changes: $ for file in $(git ls-files | grep -e esp32.conf -e esp32.overlay); do \ git mv $file ${file/esp32/esp32_devkitc_wroom} \ done Since overlay configuration in mcuboot was not yet updated, provide overlay file using sysbuild infrastructure. Copy also default mcuboot's prj.conf file, as that is needed by sysbuild (... yes, it is a workaround for a workaround). Those configuration files will be removed once mcuboot will be fixed and upmerged in Zephyr. Signed-off-by: Marcin Niestroj <[email protected]>
golioth · Aug 3, 2023 · 789dbcf · 789dbcf
1 parent 09a29b8
commit 789dbcf
Show file tree

Hide file tree

Showing 56 changed files with 105 additions and 50 deletions.
diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
@@ -45,7 +45,7 @@ jobs:
           zephyr/scripts/twister
           --no-clean
           -e goliothd
-          -p esp32
+          -p esp32_devkitc_wroom
           -p nrf52840dk_nrf52840
           -p qemu_x86
           -o reports/non_goliothd
@@ -56,7 +56,7 @@ jobs:
           zephyr/scripts/twister
           --no-clean
           -t goliothd -b
-          -p esp32
+          -p esp32_devkitc_wroom
           -p nrf52840dk_nrf52840
           -p qemu_x86
           -o reports/goliothd

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -178,7 +178,7 @@ twister:
       --force-color
       --no-clean
       -e goliothd
-      -p esp32
+      -p esp32_devkitc_wroom
       -p nrf52840dk_nrf52840
       -p qemu_x86
       -o reports/non_goliothd
@@ -189,7 +189,7 @@ twister:
       --force-color
       --no-clean
       -t goliothd -b
-      -p esp32
+      -p esp32_devkitc_wroom
       -p nrf52840dk_nrf52840
       -p qemu_x86
       -o reports/goliothd

diff --git a/patches/west-zephyr/zephyr/0002-twister-support-attach_serial_after_flash-in-hardwar.patch b/patches/west-zephyr/zephyr/0002-twister-support-attach_serial_after_flash-in-hardwar.patch
@@ -4,18 +4,18 @@ Date: Wed, 14 Sep 2022 19:41:17 +0200
 Subject: [PATCH] twister: support 'attach_serial_after_flash' in hardware map
 
 So far twister attached to serial automatically before flashing device.
-This does not work with platforms and runners (e.g. 'esp32' board with
-'esp32' runner) that require the same serial port for flashing as it is
-used by twister. In such case flashing operation fails due to serial device
-being occupied by twister.
+This does not work with platforms and runners (e.g. 'esp32_devkitc_wroom'
+board with 'esp32' runner) that require the same serial port for flashing
+as it is used by twister. In such case flashing operation fails due to
+serial device being occupied by twister.
 
 Introduce 'attach_serial_after_flash' boolean property in hardware map,
 which is 'false' by default. When setting it to 'true' in hardware map,
 twister will attach to serial after successful flash operation.
 
-This allows to successfully test esp32 with hello_world:
+This allows to successfully test esp32_devkitc_wroom with hello_world:
 
-  $ scripts/twister -p esp32 -T samples/hello_world --device-testing \
+  $ scripts/twister -p esp32_devkitc_wroom -T samples/hello_world --device-testing \
     --hardware-map map.yaml
 
 where map.yaml contains:

diff --git a/samples/certificate_provisioning/README.rst b/samples/certificate_provisioning/README.rst
@@ -31,7 +31,7 @@ Configure the following Kconfig options based on your WiFi AP credentials:
 - GOLIOTH_SAMPLE_WIFI_PSK   - WiFi PSK
 
 by adding these lines to configuration file (e.g. ``prj.conf`` or
-``board/esp32.conf``):
+``board/esp32_devkitc_wroom.conf``):
 
 .. code-block:: cfg
 
@@ -43,7 +43,7 @@ sample application (i.e. ``samples/certificate_provisioning``) and type:
 
 .. code-block:: console
 
-   $ west build -b esp32 samples/certificate_provisioning
+   $ west build -b esp32_devkitc_wroom samples/certificate_provisioning
    $ west flash
 
 See `ESP32`_ for details on how to use ESP32 board.

diff --git a/...ertificate_provisioning/boards/esp32.conf → ...visioning/boards/esp32_devkitc_wroom.conf b/...ertificate_provisioning/boards/esp32.conf → ...visioning/boards/esp32_devkitc_wroom.conf
diff --git a/...ificate_provisioning/boards/esp32.overlay → ...ioning/boards/esp32_devkitc_wroom.overlay b/...ificate_provisioning/boards/esp32.overlay → ...ioning/boards/esp32_devkitc_wroom.overlay
diff --git a/samples/certificate_provisioning/sample.yaml b/samples/certificate_provisioning/sample.yaml
@@ -7,6 +7,6 @@ tests:
   sample.golioth.certificate_provisioning:
     build_only: true
     platform_allow: >
-      esp32
+      esp32_devkitc_wroom
       nrf9160dk_nrf9160_ns
       qemu_x86
diff --git a/samples/dfu/boards/esp32.conf → samples/dfu/boards/esp32_devkitc_wroom.conf b/samples/dfu/boards/esp32.conf → samples/dfu/boards/esp32_devkitc_wroom.conf
diff --git a/samples/dfu/boards/esp32.overlay → ...es/dfu/boards/esp32_devkitc_wroom.overlay b/samples/dfu/boards/esp32.overlay → ...es/dfu/boards/esp32_devkitc_wroom.overlay
diff --git a/samples/dfu/sample.yaml b/samples/dfu/sample.yaml
@@ -13,7 +13,7 @@ tests:
   sample.golioth.dfu.sysbuild:
     sysbuild: true
     platform_allow: >
-      esp32
+      esp32_devkitc_wroom
       mimxrt1060_evkb
       nrf52840dk_nrf52840
     extra_args:

diff --git a/samples/dfu/sysbuild/mcuboot/boards/esp32_devkitc_wroom.conf b/samples/dfu/sysbuild/mcuboot/boards/esp32_devkitc_wroom.conf
@@ -0,0 +1,17 @@
+# SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_BOOT_MAX_IMG_SECTORS=512
+CONFIG_BOOT_UPGRADE_ONLY=y
+CONFIG_BOOT_VALIDATE_SLOT0=n
+CONFIG_BOOT_SIGNATURE_TYPE_NONE=y
+CONFIG_BOOT_BANNER=n
+
+CONFIG_UART_CONSOLE=n
+CONFIG_CONSOLE=n
+
+CONFIG_MCUBOOT_LOG_LEVEL_OFF=y
+CONFIG_LOG_DEFAULT_LEVEL=0
+CONFIG_DEBUG=n
+
+CONFIG_HEAP_MEM_POOL_SIZE=4096
diff --git a/samples/dfu/sysbuild/mcuboot/prj.conf b/samples/dfu/sysbuild/mcuboot/prj.conf
@@ -0,0 +1,38 @@
+CONFIG_DEBUG=y
+CONFIG_PM=n
+
+CONFIG_MAIN_STACK_SIZE=10240
+CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h"
+
+CONFIG_BOOT_SWAP_SAVE_ENCTLV=n
+CONFIG_BOOT_ENCRYPT_RSA=n
+CONFIG_BOOT_ENCRYPT_EC256=n
+CONFIG_BOOT_ENCRYPT_X25519=n
+
+CONFIG_BOOT_UPGRADE_ONLY=n
+CONFIG_BOOT_BOOTSTRAP=n
+
+### mbedTLS has its own heap
+# CONFIG_HEAP_MEM_POOL_SIZE is not set
+
+### We never want Zephyr's copy of tinycrypt.  If tinycrypt is needed,
+### MCUboot has its own copy in tree.
+# CONFIG_TINYCRYPT is not set
+# CONFIG_TINYCRYPT_ECC_DSA is not set
+# CONFIG_TINYCRYPT_SHA256 is not set
+
+CONFIG_FLASH=y
+
+### Various Zephyr boards enable features that we don't want.
+# CONFIG_BT is not set
+# CONFIG_BT_CTLR is not set
+# CONFIG_I2C is not set
+
+CONFIG_LOG=y
+CONFIG_LOG_MODE_MINIMAL=y # former CONFIG_MODE_MINIMAL
+### Ensure Zephyr logging changes don't use more resources
+CONFIG_LOG_DEFAULT_LEVEL=0
+### Use info log level by default
+CONFIG_MCUBOOT_LOG_LEVEL_INF=y
+### Decrease footprint by ~4 KB in comparison to CBPRINTF_COMPLETE=y
+CONFIG_CBPRINTF_NANO=y
diff --git a/samples/hello/README.rst b/samples/hello/README.rst
@@ -79,7 +79,7 @@ Configure the following Kconfig options based on your WiFi AP credentials:
 - GOLIOTH_SAMPLE_WIFI_PSK   - WiFi PSK
 
 by adding these lines to configuration file (e.g. ``prj.conf`` or
-``board/esp32.conf``):
+``board/esp32_devkitc_wroom.conf``):
 
 .. code-block:: cfg
 
@@ -91,7 +91,7 @@ sample application (i.e., ``samples/hello``) and type:
 
 .. code-block:: console
 
-   $ west build -b esp32 samples/hello
+   $ west build -b esp32_devkitc_wroom samples/hello
    $ west flash
 
 See `ESP32`_ for details on how to use ESP32 board.

diff --git a/samples/hello/boards/esp32.conf → ...les/hello/boards/esp32_devkitc_wroom.conf b/samples/hello/boards/esp32.conf → ...les/hello/boards/esp32_devkitc_wroom.conf
diff --git a/samples/hello/boards/esp32.overlay → .../hello/boards/esp32_devkitc_wroom.overlay b/samples/hello/boards/esp32.overlay → .../hello/boards/esp32_devkitc_wroom.overlay
diff --git a/samples/hello/sample.yaml b/samples/hello/sample.yaml
@@ -11,13 +11,13 @@ common:
 tests:
   sample.golioth.hello.psk.fast.default:
     platform_allow: >
-      esp32
+      esp32_devkitc_wroom
       mimxrt1060_evkb
       nrf52840dk_nrf52840
       qemu_x86
   sample.golioth.hello.psk.fast.gcm:
     platform_allow: >
-      esp32
+      esp32_devkitc_wroom
       mimxrt1060_evkb
       nrf52840dk_nrf52840
       qemu_x86
@@ -27,7 +27,7 @@ tests:
       - CONFIG_MBEDTLS_CIPHER_MODE_CBC_ENABLED=n
   sample.golioth.hello.psk.fast.ccm:
     platform_allow: >
-      esp32
+      esp32_devkitc_wroom
       mimxrt1060_evkb
       nrf52840dk_nrf52840
       qemu_x86
@@ -37,7 +37,7 @@ tests:
       - CONFIG_MBEDTLS_CIPHER_MODE_CBC_ENABLED=n
   sample.golioth.hello.psk.fast.cbc:
     platform_allow: >
-      esp32
+      esp32_devkitc_wroom
       mimxrt1060_evkb
       nrf52840dk_nrf52840
       qemu_x86
@@ -47,7 +47,7 @@ tests:
       - CONFIG_MBEDTLS_CIPHER_MODE_CBC_ENABLED=y
   sample.golioth.hello.psk.fast.ccm_8:
     platform_allow: >
-      esp32
+      esp32_devkitc_wroom
       mimxrt1060_evkb
       nrf52840dk_nrf52840
       qemu_x86

diff --git a/samples/hello_sporadic/README.rst b/samples/hello_sporadic/README.rst
@@ -56,7 +56,7 @@ Configure the following Kconfig options based on your WiFi AP credentials:
 - GOLIOTH_SAMPLE_WIFI_PSK   - WiFi PSK
 
 by adding these lines to configuration file (e.g. ``prj.conf`` or
-``board/esp32.conf``):
+``board/esp32_devkitc_wroom.conf``):
 
 .. code-block:: cfg
 
@@ -68,7 +68,7 @@ sample application (i.e., ``samples/hello_sporadic``) and type:
 
 .. code-block:: console
 
-   $ west build -b esp32 samples/hello_sporadic
+   $ west build -b esp32_devkitc_wroom samples/hello_sporadic
    $ west flash
 
 See `ESP32`_ for details on how to use ESP32 board.

diff --git a/samples/hello_sporadic/boards/esp32.conf → ..._sporadic/boards/esp32_devkitc_wroom.conf b/samples/hello_sporadic/boards/esp32.conf → ..._sporadic/boards/esp32_devkitc_wroom.conf
diff --git a/samples/hello_sporadic/boards/esp32.overlay → ...oradic/boards/esp32_devkitc_wroom.overlay b/samples/hello_sporadic/boards/esp32.overlay → ...oradic/boards/esp32_devkitc_wroom.overlay
diff --git a/samples/hello_sporadic/sample.yaml b/samples/hello_sporadic/sample.yaml
@@ -4,7 +4,7 @@ sample:
 common:
   harness: net
   platform_allow: >
-    esp32
+    esp32_devkitc_wroom
     mimxrt1060_evkb
     nrf52840dk_nrf52840
     nrf9160dk_nrf9160_ns

diff --git a/samples/lightdb/delete/README.rst b/samples/lightdb/delete/README.rst
@@ -55,7 +55,7 @@ Configure the following Kconfig options based on your WiFi AP credentials:
 - GOLIOTH_SAMPLE_WIFI_PSK   - WiFi PSK
 
 by adding these lines to configuration file (e.g. ``prj.conf`` or
-``board/esp32.conf``):
+``board/esp32_devkitc_wroom.conf``):
 
 .. code-block:: cfg
 
@@ -67,7 +67,7 @@ sample application (i.e., ``samples/lightdb/delete``) and type:
 
 .. code-block:: console
 
-   $ west build -b esp32 samples/lightdb/delete
+   $ west build -b esp32_devkitc_wroom samples/lightdb/delete
    $ west flash
 
 See `ESP32`_ for details on how to use ESP32 board.

diff --git a/samples/lightdb/delete/boards/esp32.conf → ...db/delete/boards/esp32_devkitc_wroom.conf b/samples/lightdb/delete/boards/esp32.conf → ...db/delete/boards/esp32_devkitc_wroom.conf
diff --git a/samples/lightdb/delete/boards/esp32.overlay → ...delete/boards/esp32_devkitc_wroom.overlay b/samples/lightdb/delete/boards/esp32.overlay → ...delete/boards/esp32_devkitc_wroom.overlay
diff --git a/samples/lightdb/delete/sample.yaml b/samples/lightdb/delete/sample.yaml
@@ -8,7 +8,7 @@ common:
 tests:
   sample.golioth.lightdb_delete:
     platform_allow: >
-      esp32
+      esp32_devkitc_wroom
       mimxrt1060_evkb
       nrf52840dk_nrf52840
       nrf9160dk_nrf9160_ns

diff --git a/samples/lightdb/get/README.rst b/samples/lightdb/get/README.rst
@@ -55,7 +55,7 @@ Configure the following Kconfig options based on your WiFi AP credentials:
 - GOLIOTH_SAMPLE_WIFI_PSK   - WiFi PSK
 
 by adding these lines to configuration file (e.g. ``prj.conf`` or
-``board/esp32.conf``):
+``board/esp32_devkitc_wroom.conf``):
 
 .. code-block:: cfg
 
@@ -67,7 +67,7 @@ sample application (i.e., ``samples/lightdb/get``) and type:
 
 .. code-block:: console
 
-   $ west build -b esp32 samples/lightdb/get
+   $ west build -b esp32_devkitc_wroom samples/lightdb/get
    $ west flash
 
 See `ESP32`_ for details on how to use ESP32 board.

diff --git a/samples/lightdb/get/boards/esp32.conf → ...ghtdb/get/boards/esp32_devkitc_wroom.conf b/samples/lightdb/get/boards/esp32.conf → ...ghtdb/get/boards/esp32_devkitc_wroom.conf
diff --git a/samples/lightdb/get/boards/esp32.overlay → ...db/get/boards/esp32_devkitc_wroom.overlay b/samples/lightdb/get/boards/esp32.overlay → ...db/get/boards/esp32_devkitc_wroom.overlay
diff --git a/samples/lightdb/get/sample.yaml b/samples/lightdb/get/sample.yaml
@@ -8,7 +8,7 @@ common:
 tests:
   sample.golioth.lightdb_get:
     platform_allow: >
-      esp32
+      esp32_devkitc_wroom
       mimxrt1060_evkb
       nrf52840dk_nrf52840
       nrf9160dk_nrf9160_ns

diff --git a/samples/lightdb/observe/README.rst b/samples/lightdb/observe/README.rst
@@ -56,7 +56,7 @@ Configure the following Kconfig options based on your WiFi AP credentials:
 - GOLIOTH_SAMPLE_WIFI_PSK   - WiFi PSK
 
 by adding these lines to configuration file (e.g. ``prj.conf`` or
-``board/esp32.conf``):
+``board/esp32_devkitc_wroom.conf``):
 
 .. code-block:: cfg
 
@@ -68,7 +68,7 @@ sample application (i.e., ``samples/lightdb/observe``) and type:
 
 .. code-block:: console
 
-   $ west build -b esp32 samples/lightdb/observe
+   $ west build -b esp32_devkitc_wroom samples/lightdb/observe
    $ west flash
 
 See `ESP32`_ for details on how to use ESP32 board.

diff --git a/samples/lightdb/observe/boards/esp32.conf → ...b/observe/boards/esp32_devkitc_wroom.conf b/samples/lightdb/observe/boards/esp32.conf → ...b/observe/boards/esp32_devkitc_wroom.conf
diff --git a/samples/lightdb/observe/boards/esp32.overlay → ...bserve/boards/esp32_devkitc_wroom.overlay b/samples/lightdb/observe/boards/esp32.overlay → ...bserve/boards/esp32_devkitc_wroom.overlay
diff --git a/samples/lightdb/observe/sample.yaml b/samples/lightdb/observe/sample.yaml
@@ -8,7 +8,7 @@ common:
 tests:
   sample.golioth.lightdb_observe:
     platform_allow: >
-      esp32
+      esp32_devkitc_wroom
       mimxrt1060_evkb
       nrf52840dk_nrf52840
       nrf9160dk_nrf9160_ns

diff --git a/samples/lightdb/set/README.rst b/samples/lightdb/set/README.rst
@@ -56,7 +56,7 @@ Configure the following Kconfig options based on your WiFi AP credentials:
 - GOLIOTH_SAMPLE_WIFI_PSK   - WiFi PSK
 
 by adding these lines to configuration file (e.g. ``prj.conf`` or
-``board/esp32.conf``):
+``board/esp32_devkitc_wroom.conf``):
 
 .. code-block:: cfg
 
@@ -68,7 +68,7 @@ sample application (i.e., ``samples/lightdb/set``) and type:
 
 .. code-block:: console
 
-   $ west build -b esp32 samples/lightdb/set
+   $ west build -b esp32_devkitc_wroom samples/lightdb/set
    $ west flash
 
 See `ESP32`_ for details on how to use ESP32 board.

diff --git a/samples/lightdb/set/boards/esp32.conf → ...ghtdb/set/boards/esp32_devkitc_wroom.conf b/samples/lightdb/set/boards/esp32.conf → ...ghtdb/set/boards/esp32_devkitc_wroom.conf
diff --git a/samples/lightdb/set/boards/esp32.overlay → ...db/set/boards/esp32_devkitc_wroom.overlay b/samples/lightdb/set/boards/esp32.overlay → ...db/set/boards/esp32_devkitc_wroom.overlay
diff --git a/samples/lightdb/set/sample.yaml b/samples/lightdb/set/sample.yaml
@@ -8,7 +8,7 @@ common:
 tests:
   sample.golioth.lightdb_set:
     platform_allow: >
-      esp32
+      esp32_devkitc_wroom
       mimxrt1060_evkb
       nrf52840dk_nrf52840
       nrf9160dk_nrf9160_ns

diff --git a/samples/lightdb_led/README.rst b/samples/lightdb_led/README.rst
@@ -56,7 +56,7 @@ Configure the following Kconfig options based on your WiFi AP credentials:
 - GOLIOTH_SAMPLE_WIFI_PSK   - WiFi PSK
 
 by adding these lines to configuration file (e.g. ``prj.conf`` or
-``board/esp32.conf``):
+``board/esp32_devkitc_wroom.conf``):
 
 .. code-block:: cfg
 
@@ -68,7 +68,7 @@ sample application (i.e., ``samples/lightdb_led``) and type:
 
 .. code-block:: console
 
-   $ west build -b esp32 samples/lightdb_led
+   $ west build -b esp32_devkitc_wroom samples/lightdb_led
    $ west flash
 
 See `ESP32`_ for details on how to use ESP32 board.

diff --git a/samples/lightdb_led/boards/esp32.conf → ...ghtdb_led/boards/esp32_devkitc_wroom.conf b/samples/lightdb_led/boards/esp32.conf → ...ghtdb_led/boards/esp32_devkitc_wroom.conf
diff --git a/samples/lightdb_led/boards/esp32.overlay → ...db_led/boards/esp32_devkitc_wroom.overlay b/samples/lightdb_led/boards/esp32.overlay → ...db_led/boards/esp32_devkitc_wroom.overlay
diff --git a/samples/lightdb_led/sample.yaml b/samples/lightdb_led/sample.yaml
@@ -8,7 +8,7 @@ common:
 tests:
   sample.golioth.lightdb_led:
     platform_allow: >
-      esp32
+      esp32_devkitc_wroom
       mimxrt1060_evkb
       nrf52840dk_nrf52840
       nrf9160dk_nrf9160_ns

diff --git a/samples/lightdb_stream/README.rst b/samples/lightdb_stream/README.rst
@@ -58,7 +58,7 @@ Configure the following Kconfig options based on your WiFi AP credentials:
 - GOLIOTH_SAMPLE_WIFI_PSK   - WiFi PSK
 
 by adding these lines to configuration file (e.g. ``prj.conf`` or
-``board/esp32.conf``):
+``board/esp32_devkitc_wroom.conf``):
 
 .. code-block:: cfg
 
@@ -70,7 +70,7 @@ sample application (i.e., ``samples/lightdb_stream``) and type:
 
 .. code-block:: console
 
-   $ west build -b esp32 samples/lightdb_stream
+   $ west build -b esp32_devkitc_wroom samples/lightdb_stream
    $ west flash
 
 See `ESP32`_ for details on how to use ESP32 board.

diff --git a/samples/lightdb_stream/boards/esp32.conf → ...db_stream/boards/esp32_devkitc_wroom.conf b/samples/lightdb_stream/boards/esp32.conf → ...db_stream/boards/esp32_devkitc_wroom.conf
diff --git a/samples/lightdb_stream/boards/esp32.overlay → ...stream/boards/esp32_devkitc_wroom.overlay b/samples/lightdb_stream/boards/esp32.overlay → ...stream/boards/esp32_devkitc_wroom.overlay