diff --git a/.github/disabled_workflows/test_mimxrt1060.yml b/.github/disabled_workflows/test_mimxrt1060.yml index 6d8810ee..b57dff1a 100644 --- a/.github/disabled_workflows/test_mimxrt1060.yml +++ b/.github/disabled_workflows/test_mimxrt1060.yml @@ -12,10 +12,10 @@ jobs: runs-on: ubuntu-latest container: - image: zephyrprojectrtos/ci:v0.23.3 + image: zephyrprojectrtos/ci:v0.24.2 env: - ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.14.2 + ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.15.0 steps: - uses: actions/checkout@v2 diff --git a/.github/disabled_workflows/test_nrf9160dk.yml b/.github/disabled_workflows/test_nrf9160dk.yml index 9680a238..88acaf6f 100644 --- a/.github/disabled_workflows/test_nrf9160dk.yml +++ b/.github/disabled_workflows/test_nrf9160dk.yml @@ -17,10 +17,10 @@ jobs: runs-on: ubuntu-latest container: - image: zephyrprojectrtos/ci:v0.23.3 + image: zephyrprojectrtos/ci:v0.24.2 env: - ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.14.2 + ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.15.0 steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index 0dad7550..81c6f840 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -12,10 +12,10 @@ jobs: runs-on: ubuntu-latest container: - image: zephyrprojectrtos/ci:v0.23.3 + image: zephyrprojectrtos/ci:v0.24.2 env: - ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.14.2 + ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.15.0 steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/checkpatch.yml b/.github/workflows/checkpatch.yml index 60aae903..214fdcef 100644 --- a/.github/workflows/checkpatch.yml +++ b/.github/workflows/checkpatch.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest container: - image: zephyrprojectrtos/ci:v0.23.3 + image: zephyrprojectrtos/ci:v0.24.2 steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/test_nrf52840dk.yml b/.github/workflows/test_nrf52840dk.yml index 6869f77e..173107fb 100644 --- a/.github/workflows/test_nrf52840dk.yml +++ b/.github/workflows/test_nrf52840dk.yml @@ -12,10 +12,10 @@ jobs: runs-on: ubuntu-latest container: - image: zephyrprojectrtos/ci:v0.23.3 + image: zephyrprojectrtos/ci:v0.24.2 env: - ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.14.2 + ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.15.0 steps: - uses: actions/checkout@v2 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4c9e2b75..98571613 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: zephyrprojectrtos/ci:v0.23.3 +image: zephyrprojectrtos/ci:v0.24.2 variables: WEST_MANIFEST: west-zephyr.yml @@ -139,7 +139,7 @@ twister: twister-esp: extends: .twister script: - - west espressif update + - west blobs fetch hal_espressif - > zephyr/scripts/twister -p esp32 @@ -148,6 +148,7 @@ twister-esp: twister-ncs: extends: .twister + image: zephyrprojectrtos/ci:v0.23.3 variables: WEST_MANIFEST: west-ncs.yml script: diff --git a/samples/common/Kconfig b/samples/common/Kconfig index 6081c981..8f11aedb 100644 --- a/samples/common/Kconfig +++ b/samples/common/Kconfig @@ -51,7 +51,7 @@ config GOLIOTH_SAMPLE_WIFI_SETTINGS Load WiFi SSID and PSK from settings subsystem, from 'wifi/ssid' and 'wifi/psk' entries. -if (GOLIOTH_SAMPLE_WIFI && !GOLIOTH_SAMPLE_WIFI_SETTINGS) || WIFI_ESP32 +if GOLIOTH_SAMPLE_WIFI && !GOLIOTH_SAMPLE_WIFI_SETTINGS config GOLIOTH_SAMPLE_WIFI_SSID string "WiFi SSID" @@ -64,6 +64,6 @@ config GOLIOTH_SAMPLE_WIFI_PSK WiFi PSK used when connecting to WiFi AP. Leave empty if connecting to unsecure (open) AP. -endif # (GOLIOTH_SAMPLE_WIFI && !GOLIOTH_SAMPLE_WIFI_SETTINGS) || WIFI_ESP32 +endif # GOLIOTH_SAMPLE_WIFI && !GOLIOTH_SAMPLE_WIFI_SETTINGS endif # GOLIOTH_SAMPLES_COMMON diff --git a/samples/dfu/Kconfig b/samples/dfu/Kconfig index 7d1ab117..57c36276 100644 --- a/samples/dfu/Kconfig +++ b/samples/dfu/Kconfig @@ -3,16 +3,6 @@ mainmenu "Golioth application options" -if WIFI_ESP32 - -config ESP32_WIFI_SSID - default GOLIOTH_SAMPLE_WIFI_SSID - -config ESP32_WIFI_PASSWORD - default GOLIOTH_SAMPLE_WIFI_PSK - -endif # WIFI_ESP32 - if DNS_RESOLVER config DNS_SERVER_IP_ADDRESSES diff --git a/samples/dfu/README.rst b/samples/dfu/README.rst index 5632fe46..8989b872 100644 --- a/samples/dfu/README.rst +++ b/samples/dfu/README.rst @@ -147,8 +147,8 @@ by adding these lines to configuration file (e.g. ``prj.conf`` or .. code-block:: cfg - CONFIG_ESP32_WIFI_SSID="my-wifi" - CONFIG_ESP32_WIFI_PSK="my-psk" + CONFIG_GOLIOTH_SAMPLE_WIFI_SSID="my-wifi" + CONFIG_GOLIOTH_SAMPLE_WIFI_PSK="my-psk" On your host computer open a terminal window, locate the source code of this sample application (i.e., ``samples/dfu``) and type: diff --git a/samples/dfu/boards/esp32.conf b/samples/dfu/boards/esp32.conf index 98b4cff5..2c706822 100644 --- a/samples/dfu/boards/esp32.conf +++ b/samples/dfu/boards/esp32.conf @@ -1,20 +1,18 @@ CONFIG_WIFI=y -CONFIG_WIFI_ESP32=y CONFIG_HEAP_MEM_POOL_SIZE=98304 CONFIG_NET_L2_ETHERNET=y CONFIG_NET_DHCPV4=y -CONFIG_NET_CONFIG_LOG_LEVEL_DBG=y -CONFIG_NET_CONFIG_SETTINGS=y -CONFIG_NET_CONFIG_NEED_IPV4=y - CONFIG_MBEDTLS_ENTROPY_ENABLED=y CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED=y CONFIG_MBEDTLS_ECP_ALL_ENABLED=y -CONFIG_ESP32_WIFI_STA_AUTO=y +CONFIG_ESP32_WIFI_STA_AUTO_DHCPV4=y + +CONFIG_NET_L2_WIFI_SHELL=y +CONFIG_GOLIOTH_SAMPLE_WIFI=y # Do not sign image by default, as that rebuild and overwrites signed image # after it was signed manually (which is what README.rst tells to do). diff --git a/samples/dfu/boards/esp32.overlay b/samples/dfu/boards/esp32.overlay new file mode 100644 index 00000000..d342be13 --- /dev/null +++ b/samples/dfu/boards/esp32.overlay @@ -0,0 +1,3 @@ +&wifi { + status = "okay"; +}; diff --git a/samples/hello/Kconfig b/samples/hello/Kconfig index aa50eb5f..b1c93204 100644 --- a/samples/hello/Kconfig +++ b/samples/hello/Kconfig @@ -3,16 +3,6 @@ mainmenu "Golioth application options" -if WIFI_ESP32 - -config ESP32_WIFI_SSID - default GOLIOTH_SAMPLE_WIFI_SSID - -config ESP32_WIFI_PASSWORD - default GOLIOTH_SAMPLE_WIFI_PSK - -endif # WIFI_ESP32 - if DNS_RESOLVER config DNS_SERVER_IP_ADDRESSES diff --git a/samples/hello/boards/esp32.conf b/samples/hello/boards/esp32.conf index fe29fcaf..5287d71f 100644 --- a/samples/hello/boards/esp32.conf +++ b/samples/hello/boards/esp32.conf @@ -1,17 +1,15 @@ CONFIG_WIFI=y -CONFIG_WIFI_ESP32=y CONFIG_HEAP_MEM_POOL_SIZE=98304 CONFIG_NET_L2_ETHERNET=y CONFIG_NET_DHCPV4=y -CONFIG_NET_CONFIG_LOG_LEVEL_DBG=y -CONFIG_NET_CONFIG_SETTINGS=y -CONFIG_NET_CONFIG_NEED_IPV4=y - CONFIG_MBEDTLS_ENTROPY_ENABLED=y CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED=y CONFIG_MBEDTLS_ECP_ALL_ENABLED=y -CONFIG_ESP32_WIFI_STA_AUTO=y +CONFIG_ESP32_WIFI_STA_AUTO_DHCPV4=y + +CONFIG_NET_L2_WIFI_SHELL=y +CONFIG_GOLIOTH_SAMPLE_WIFI=y diff --git a/samples/hello_sporadic/Kconfig b/samples/hello_sporadic/Kconfig index 671a2c4c..f8af5f7c 100644 --- a/samples/hello_sporadic/Kconfig +++ b/samples/hello_sporadic/Kconfig @@ -3,14 +3,4 @@ mainmenu "Golioth application options" -if WIFI_ESP32 - -config ESP32_WIFI_SSID - default GOLIOTH_SAMPLE_WIFI_SSID - -config ESP32_WIFI_PASSWORD - default GOLIOTH_SAMPLE_WIFI_PSK - -endif # WIFI_ESP32 - source "Kconfig.zephyr" diff --git a/samples/hello_sporadic/boards/esp32.conf b/samples/hello_sporadic/boards/esp32.conf index fe29fcaf..5287d71f 100644 --- a/samples/hello_sporadic/boards/esp32.conf +++ b/samples/hello_sporadic/boards/esp32.conf @@ -1,17 +1,15 @@ CONFIG_WIFI=y -CONFIG_WIFI_ESP32=y CONFIG_HEAP_MEM_POOL_SIZE=98304 CONFIG_NET_L2_ETHERNET=y CONFIG_NET_DHCPV4=y -CONFIG_NET_CONFIG_LOG_LEVEL_DBG=y -CONFIG_NET_CONFIG_SETTINGS=y -CONFIG_NET_CONFIG_NEED_IPV4=y - CONFIG_MBEDTLS_ENTROPY_ENABLED=y CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED=y CONFIG_MBEDTLS_ECP_ALL_ENABLED=y -CONFIG_ESP32_WIFI_STA_AUTO=y +CONFIG_ESP32_WIFI_STA_AUTO_DHCPV4=y + +CONFIG_NET_L2_WIFI_SHELL=y +CONFIG_GOLIOTH_SAMPLE_WIFI=y diff --git a/samples/hello_sporadic/boards/esp32.overlay b/samples/hello_sporadic/boards/esp32.overlay new file mode 100644 index 00000000..d342be13 --- /dev/null +++ b/samples/hello_sporadic/boards/esp32.overlay @@ -0,0 +1,3 @@ +&wifi { + status = "okay"; +}; diff --git a/samples/lightdb/get/Kconfig b/samples/lightdb/get/Kconfig index aa50eb5f..b1c93204 100644 --- a/samples/lightdb/get/Kconfig +++ b/samples/lightdb/get/Kconfig @@ -3,16 +3,6 @@ mainmenu "Golioth application options" -if WIFI_ESP32 - -config ESP32_WIFI_SSID - default GOLIOTH_SAMPLE_WIFI_SSID - -config ESP32_WIFI_PASSWORD - default GOLIOTH_SAMPLE_WIFI_PSK - -endif # WIFI_ESP32 - if DNS_RESOLVER config DNS_SERVER_IP_ADDRESSES diff --git a/samples/lightdb/get/boards/esp32.conf b/samples/lightdb/get/boards/esp32.conf index fe29fcaf..5287d71f 100644 --- a/samples/lightdb/get/boards/esp32.conf +++ b/samples/lightdb/get/boards/esp32.conf @@ -1,17 +1,15 @@ CONFIG_WIFI=y -CONFIG_WIFI_ESP32=y CONFIG_HEAP_MEM_POOL_SIZE=98304 CONFIG_NET_L2_ETHERNET=y CONFIG_NET_DHCPV4=y -CONFIG_NET_CONFIG_LOG_LEVEL_DBG=y -CONFIG_NET_CONFIG_SETTINGS=y -CONFIG_NET_CONFIG_NEED_IPV4=y - CONFIG_MBEDTLS_ENTROPY_ENABLED=y CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED=y CONFIG_MBEDTLS_ECP_ALL_ENABLED=y -CONFIG_ESP32_WIFI_STA_AUTO=y +CONFIG_ESP32_WIFI_STA_AUTO_DHCPV4=y + +CONFIG_NET_L2_WIFI_SHELL=y +CONFIG_GOLIOTH_SAMPLE_WIFI=y diff --git a/samples/lightdb/get/boards/esp32.overlay b/samples/lightdb/get/boards/esp32.overlay new file mode 100644 index 00000000..d342be13 --- /dev/null +++ b/samples/lightdb/get/boards/esp32.overlay @@ -0,0 +1,3 @@ +&wifi { + status = "okay"; +}; diff --git a/samples/lightdb/observe/Kconfig b/samples/lightdb/observe/Kconfig index aa50eb5f..b1c93204 100644 --- a/samples/lightdb/observe/Kconfig +++ b/samples/lightdb/observe/Kconfig @@ -3,16 +3,6 @@ mainmenu "Golioth application options" -if WIFI_ESP32 - -config ESP32_WIFI_SSID - default GOLIOTH_SAMPLE_WIFI_SSID - -config ESP32_WIFI_PASSWORD - default GOLIOTH_SAMPLE_WIFI_PSK - -endif # WIFI_ESP32 - if DNS_RESOLVER config DNS_SERVER_IP_ADDRESSES diff --git a/samples/lightdb/observe/boards/esp32.conf b/samples/lightdb/observe/boards/esp32.conf index fe29fcaf..5287d71f 100644 --- a/samples/lightdb/observe/boards/esp32.conf +++ b/samples/lightdb/observe/boards/esp32.conf @@ -1,17 +1,15 @@ CONFIG_WIFI=y -CONFIG_WIFI_ESP32=y CONFIG_HEAP_MEM_POOL_SIZE=98304 CONFIG_NET_L2_ETHERNET=y CONFIG_NET_DHCPV4=y -CONFIG_NET_CONFIG_LOG_LEVEL_DBG=y -CONFIG_NET_CONFIG_SETTINGS=y -CONFIG_NET_CONFIG_NEED_IPV4=y - CONFIG_MBEDTLS_ENTROPY_ENABLED=y CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED=y CONFIG_MBEDTLS_ECP_ALL_ENABLED=y -CONFIG_ESP32_WIFI_STA_AUTO=y +CONFIG_ESP32_WIFI_STA_AUTO_DHCPV4=y + +CONFIG_NET_L2_WIFI_SHELL=y +CONFIG_GOLIOTH_SAMPLE_WIFI=y diff --git a/samples/lightdb/observe/boards/esp32.overlay b/samples/lightdb/observe/boards/esp32.overlay new file mode 100644 index 00000000..d342be13 --- /dev/null +++ b/samples/lightdb/observe/boards/esp32.overlay @@ -0,0 +1,3 @@ +&wifi { + status = "okay"; +}; diff --git a/samples/lightdb/set/Kconfig b/samples/lightdb/set/Kconfig index aa50eb5f..b1c93204 100644 --- a/samples/lightdb/set/Kconfig +++ b/samples/lightdb/set/Kconfig @@ -3,16 +3,6 @@ mainmenu "Golioth application options" -if WIFI_ESP32 - -config ESP32_WIFI_SSID - default GOLIOTH_SAMPLE_WIFI_SSID - -config ESP32_WIFI_PASSWORD - default GOLIOTH_SAMPLE_WIFI_PSK - -endif # WIFI_ESP32 - if DNS_RESOLVER config DNS_SERVER_IP_ADDRESSES diff --git a/samples/lightdb/set/boards/esp32.conf b/samples/lightdb/set/boards/esp32.conf index fe29fcaf..5287d71f 100644 --- a/samples/lightdb/set/boards/esp32.conf +++ b/samples/lightdb/set/boards/esp32.conf @@ -1,17 +1,15 @@ CONFIG_WIFI=y -CONFIG_WIFI_ESP32=y CONFIG_HEAP_MEM_POOL_SIZE=98304 CONFIG_NET_L2_ETHERNET=y CONFIG_NET_DHCPV4=y -CONFIG_NET_CONFIG_LOG_LEVEL_DBG=y -CONFIG_NET_CONFIG_SETTINGS=y -CONFIG_NET_CONFIG_NEED_IPV4=y - CONFIG_MBEDTLS_ENTROPY_ENABLED=y CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED=y CONFIG_MBEDTLS_ECP_ALL_ENABLED=y -CONFIG_ESP32_WIFI_STA_AUTO=y +CONFIG_ESP32_WIFI_STA_AUTO_DHCPV4=y + +CONFIG_NET_L2_WIFI_SHELL=y +CONFIG_GOLIOTH_SAMPLE_WIFI=y diff --git a/samples/lightdb/set/boards/esp32.overlay b/samples/lightdb/set/boards/esp32.overlay new file mode 100644 index 00000000..d342be13 --- /dev/null +++ b/samples/lightdb/set/boards/esp32.overlay @@ -0,0 +1,3 @@ +&wifi { + status = "okay"; +}; diff --git a/samples/lightdb_led/Kconfig b/samples/lightdb_led/Kconfig index aa50eb5f..b1c93204 100644 --- a/samples/lightdb_led/Kconfig +++ b/samples/lightdb_led/Kconfig @@ -3,16 +3,6 @@ mainmenu "Golioth application options" -if WIFI_ESP32 - -config ESP32_WIFI_SSID - default GOLIOTH_SAMPLE_WIFI_SSID - -config ESP32_WIFI_PASSWORD - default GOLIOTH_SAMPLE_WIFI_PSK - -endif # WIFI_ESP32 - if DNS_RESOLVER config DNS_SERVER_IP_ADDRESSES diff --git a/samples/lightdb_led/boards/esp32.conf b/samples/lightdb_led/boards/esp32.conf index fe29fcaf..5287d71f 100644 --- a/samples/lightdb_led/boards/esp32.conf +++ b/samples/lightdb_led/boards/esp32.conf @@ -1,17 +1,15 @@ CONFIG_WIFI=y -CONFIG_WIFI_ESP32=y CONFIG_HEAP_MEM_POOL_SIZE=98304 CONFIG_NET_L2_ETHERNET=y CONFIG_NET_DHCPV4=y -CONFIG_NET_CONFIG_LOG_LEVEL_DBG=y -CONFIG_NET_CONFIG_SETTINGS=y -CONFIG_NET_CONFIG_NEED_IPV4=y - CONFIG_MBEDTLS_ENTROPY_ENABLED=y CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED=y CONFIG_MBEDTLS_ECP_ALL_ENABLED=y -CONFIG_ESP32_WIFI_STA_AUTO=y +CONFIG_ESP32_WIFI_STA_AUTO_DHCPV4=y + +CONFIG_NET_L2_WIFI_SHELL=y +CONFIG_GOLIOTH_SAMPLE_WIFI=y diff --git a/samples/lightdb_led/boards/esp32.overlay b/samples/lightdb_led/boards/esp32.overlay new file mode 100644 index 00000000..d342be13 --- /dev/null +++ b/samples/lightdb_led/boards/esp32.overlay @@ -0,0 +1,3 @@ +&wifi { + status = "okay"; +}; diff --git a/samples/lightdb_stream/Kconfig b/samples/lightdb_stream/Kconfig index aa50eb5f..b1c93204 100644 --- a/samples/lightdb_stream/Kconfig +++ b/samples/lightdb_stream/Kconfig @@ -3,16 +3,6 @@ mainmenu "Golioth application options" -if WIFI_ESP32 - -config ESP32_WIFI_SSID - default GOLIOTH_SAMPLE_WIFI_SSID - -config ESP32_WIFI_PASSWORD - default GOLIOTH_SAMPLE_WIFI_PSK - -endif # WIFI_ESP32 - if DNS_RESOLVER config DNS_SERVER_IP_ADDRESSES diff --git a/samples/lightdb_stream/boards/esp32.conf b/samples/lightdb_stream/boards/esp32.conf index fe29fcaf..5287d71f 100644 --- a/samples/lightdb_stream/boards/esp32.conf +++ b/samples/lightdb_stream/boards/esp32.conf @@ -1,17 +1,15 @@ CONFIG_WIFI=y -CONFIG_WIFI_ESP32=y CONFIG_HEAP_MEM_POOL_SIZE=98304 CONFIG_NET_L2_ETHERNET=y CONFIG_NET_DHCPV4=y -CONFIG_NET_CONFIG_LOG_LEVEL_DBG=y -CONFIG_NET_CONFIG_SETTINGS=y -CONFIG_NET_CONFIG_NEED_IPV4=y - CONFIG_MBEDTLS_ENTROPY_ENABLED=y CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED=y CONFIG_MBEDTLS_ECP_ALL_ENABLED=y -CONFIG_ESP32_WIFI_STA_AUTO=y +CONFIG_ESP32_WIFI_STA_AUTO_DHCPV4=y + +CONFIG_NET_L2_WIFI_SHELL=y +CONFIG_GOLIOTH_SAMPLE_WIFI=y diff --git a/samples/lightdb_stream/boards/esp32.overlay b/samples/lightdb_stream/boards/esp32.overlay new file mode 100644 index 00000000..d342be13 --- /dev/null +++ b/samples/lightdb_stream/boards/esp32.overlay @@ -0,0 +1,3 @@ +&wifi { + status = "okay"; +}; diff --git a/samples/logging/Kconfig b/samples/logging/Kconfig index aa50eb5f..b1c93204 100644 --- a/samples/logging/Kconfig +++ b/samples/logging/Kconfig @@ -3,16 +3,6 @@ mainmenu "Golioth application options" -if WIFI_ESP32 - -config ESP32_WIFI_SSID - default GOLIOTH_SAMPLE_WIFI_SSID - -config ESP32_WIFI_PASSWORD - default GOLIOTH_SAMPLE_WIFI_PSK - -endif # WIFI_ESP32 - if DNS_RESOLVER config DNS_SERVER_IP_ADDRESSES diff --git a/samples/logging/boards/esp32.conf b/samples/logging/boards/esp32.conf index fe29fcaf..5287d71f 100644 --- a/samples/logging/boards/esp32.conf +++ b/samples/logging/boards/esp32.conf @@ -1,17 +1,15 @@ CONFIG_WIFI=y -CONFIG_WIFI_ESP32=y CONFIG_HEAP_MEM_POOL_SIZE=98304 CONFIG_NET_L2_ETHERNET=y CONFIG_NET_DHCPV4=y -CONFIG_NET_CONFIG_LOG_LEVEL_DBG=y -CONFIG_NET_CONFIG_SETTINGS=y -CONFIG_NET_CONFIG_NEED_IPV4=y - CONFIG_MBEDTLS_ENTROPY_ENABLED=y CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED=y CONFIG_MBEDTLS_ECP_ALL_ENABLED=y -CONFIG_ESP32_WIFI_STA_AUTO=y +CONFIG_ESP32_WIFI_STA_AUTO_DHCPV4=y + +CONFIG_NET_L2_WIFI_SHELL=y +CONFIG_GOLIOTH_SAMPLE_WIFI=y diff --git a/samples/logging/boards/esp32.overlay b/samples/logging/boards/esp32.overlay new file mode 100644 index 00000000..d342be13 --- /dev/null +++ b/samples/logging/boards/esp32.overlay @@ -0,0 +1,3 @@ +&wifi { + status = "okay"; +}; diff --git a/samples/rpc/Kconfig b/samples/rpc/Kconfig index aa50eb5f..b1c93204 100644 --- a/samples/rpc/Kconfig +++ b/samples/rpc/Kconfig @@ -3,16 +3,6 @@ mainmenu "Golioth application options" -if WIFI_ESP32 - -config ESP32_WIFI_SSID - default GOLIOTH_SAMPLE_WIFI_SSID - -config ESP32_WIFI_PASSWORD - default GOLIOTH_SAMPLE_WIFI_PSK - -endif # WIFI_ESP32 - if DNS_RESOLVER config DNS_SERVER_IP_ADDRESSES diff --git a/samples/rpc/boards/esp32.conf b/samples/rpc/boards/esp32.conf index fe29fcaf..5287d71f 100644 --- a/samples/rpc/boards/esp32.conf +++ b/samples/rpc/boards/esp32.conf @@ -1,17 +1,15 @@ CONFIG_WIFI=y -CONFIG_WIFI_ESP32=y CONFIG_HEAP_MEM_POOL_SIZE=98304 CONFIG_NET_L2_ETHERNET=y CONFIG_NET_DHCPV4=y -CONFIG_NET_CONFIG_LOG_LEVEL_DBG=y -CONFIG_NET_CONFIG_SETTINGS=y -CONFIG_NET_CONFIG_NEED_IPV4=y - CONFIG_MBEDTLS_ENTROPY_ENABLED=y CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED=y CONFIG_MBEDTLS_ECP_ALL_ENABLED=y -CONFIG_ESP32_WIFI_STA_AUTO=y +CONFIG_ESP32_WIFI_STA_AUTO_DHCPV4=y + +CONFIG_NET_L2_WIFI_SHELL=y +CONFIG_GOLIOTH_SAMPLE_WIFI=y diff --git a/samples/rpc/boards/esp32.overlay b/samples/rpc/boards/esp32.overlay new file mode 100644 index 00000000..d342be13 --- /dev/null +++ b/samples/rpc/boards/esp32.overlay @@ -0,0 +1,3 @@ +&wifi { + status = "okay"; +}; diff --git a/samples/settings/Kconfig b/samples/settings/Kconfig index aa50eb5f..b1c93204 100644 --- a/samples/settings/Kconfig +++ b/samples/settings/Kconfig @@ -3,16 +3,6 @@ mainmenu "Golioth application options" -if WIFI_ESP32 - -config ESP32_WIFI_SSID - default GOLIOTH_SAMPLE_WIFI_SSID - -config ESP32_WIFI_PASSWORD - default GOLIOTH_SAMPLE_WIFI_PSK - -endif # WIFI_ESP32 - if DNS_RESOLVER config DNS_SERVER_IP_ADDRESSES diff --git a/samples/settings/boards/esp32.conf b/samples/settings/boards/esp32.conf index fe29fcaf..5287d71f 100644 --- a/samples/settings/boards/esp32.conf +++ b/samples/settings/boards/esp32.conf @@ -1,17 +1,15 @@ CONFIG_WIFI=y -CONFIG_WIFI_ESP32=y CONFIG_HEAP_MEM_POOL_SIZE=98304 CONFIG_NET_L2_ETHERNET=y CONFIG_NET_DHCPV4=y -CONFIG_NET_CONFIG_LOG_LEVEL_DBG=y -CONFIG_NET_CONFIG_SETTINGS=y -CONFIG_NET_CONFIG_NEED_IPV4=y - CONFIG_MBEDTLS_ENTROPY_ENABLED=y CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED=y CONFIG_MBEDTLS_ECP_ALL_ENABLED=y -CONFIG_ESP32_WIFI_STA_AUTO=y +CONFIG_ESP32_WIFI_STA_AUTO_DHCPV4=y + +CONFIG_NET_L2_WIFI_SHELL=y +CONFIG_GOLIOTH_SAMPLE_WIFI=y diff --git a/samples/settings/boards/esp32.overlay b/samples/settings/boards/esp32.overlay new file mode 100644 index 00000000..d342be13 --- /dev/null +++ b/samples/settings/boards/esp32.overlay @@ -0,0 +1,3 @@ +&wifi { + status = "okay"; +}; diff --git a/west-zephyr.yml b/west-zephyr.yml index 73697e1a..5d7c81ec 100644 --- a/west-zephyr.yml +++ b/west-zephyr.yml @@ -1,7 +1,7 @@ manifest: projects: - name: zephyr - revision: 096fc3b82644c41a2b0a17854009cdb64ad7563c + revision: e1cb0845b49b6a4100c9e5558d37667b92f0d000 # post 3.2.0-rc2 url: https://github.com/zephyrproject-rtos/zephyr west-commands: scripts/west-commands.yml import: