diff --git a/scripts/requirements-actions.in b/scripts/requirements-actions.in index 0fbced12c514..06975a26f2e7 100644 --- a/scripts/requirements-actions.in +++ b/scripts/requirements-actions.in @@ -29,6 +29,7 @@ python-magic-bin; sys_platform == "win32" python-magic; sys_platform != "win32" pyyaml reuse +rich_click ruff==0.11.11 setuptools>=70.2.0 spdx-tools diff --git a/scripts/requirements-actions.txt b/scripts/requirements-actions.txt index 7588db2575f9..34a6cf6e1f68 100644 --- a/scripts/requirements-actions.txt +++ b/scripts/requirements-actions.txt @@ -1,5 +1,5 @@ # This file was autogenerated by uv via the following command: -# uv pip compile --universal --python-version 3.10 --generate-hashes requirements-actions.in --output-file requirements-actions.txt +# uv pip compile --universal --python-version 3.13 --generate-hashes requirements-actions.in --output-file requirements-actions.txt anytree==2.13.0 \ --hash=sha256:4cbcf10df36b1f1cba131b7e487ff3edafc9d6e932a3c70071b5b768bab901ff \ --hash=sha256:c9d3aa6825fdd06af7ebb05b4ef291d2db63e62bb1f9b7d9b71354be9d362714 @@ -251,6 +251,7 @@ click==8.1.3 \ # via # gitlint-core # reuse + # rich-click # spdx-tools colorama==0.4.6 \ --hash=sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44 \ @@ -331,9 +332,7 @@ elasticsearch==8.18.1 \ exceptiongroup==1.3.0 \ --hash=sha256:4d111e6e0c13d0644cad6ddaa7ed0261a0b36971f6d23e7ec9b4b9097da78a10 \ --hash=sha256:b241f5885f560bc56a59ee63ca4c6a8bfa46ae4ad651af316d4e81817bb9fd88 - # via - # -r requirements-actions.in - # pytest + # via -r requirements-actions.in filelock==3.18.0 \ --hash=sha256:adbc88eabb99d2fec8c9c1b229b171f18afa655400173ddc653d5d01501fb9f2 \ --hash=sha256:c401f4f8377c4464e6db25fff06205fd89bdd83b65eb0488ed1b160f780e21de @@ -459,10 +458,6 @@ intelhex==2.3.0 \ --hash=sha256:87cc5225657524ec6361354be928adfd56bcf2a3dcc646c40f8f094c39c07db4 \ --hash=sha256:892b7361a719f4945237da8ccf754e9513db32f5628852785aea108dcd250093 # via -r requirements-actions.in -isodate==0.7.2 ; python_full_version < '3.11' \ - --hash=sha256:28009937d8031054830160fce6d409ed342816b543597cece116d966c6d99e15 \ - --hash=sha256:4cd1aa0f43ca76f4a6c6c0292a85f40b35ec2e43e315b59f06e6d32171a953e6 - # via rdflib isort==6.0.1 \ --hash=sha256:1cb5df28dfbc742e490c5e41bad6da41b805b0a8be7bc93cd0fb2a8a890ac450 \ --hash=sha256:2dc5d7f65c9678d94c88dfc29161a320eec67328bc97aad576874cb4be1e9615 @@ -585,6 +580,10 @@ lxml==6.0.0 \ # via # -r requirements-actions.in # gcovr +markdown-it-py==3.0.0 \ + --hash=sha256:355216845c60bd96232cd8d8c40e8f9765cc86f46880e43a8fd22dc1a1a8cab1 \ + --hash=sha256:e3f60a94fa066dc52ec76661e37c851cb232d92f9886b15cb560aaada2df8feb + # via rich markupsafe==3.0.2 \ --hash=sha256:0bff5e0ae4ef2e1ae4fdf2dfd5b76c75e5c2fa4132d05fc1b0dabcd20c7e28c4 \ --hash=sha256:0f4ca02bea9a23221c0182836703cbf8930c5e9454bacce27e767509fa286a30 \ @@ -652,6 +651,10 @@ mccabe==0.7.0 \ --hash=sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325 \ --hash=sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e # via pylint +mdurl==0.1.2 \ + --hash=sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8 \ + --hash=sha256:bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba + # via markdown-it-py mock==5.2.0 \ --hash=sha256:4e460e818629b4b173f32d08bf30d3af8123afbb8e04bb5707a1fd4799e503f0 \ --hash=sha256:7ba87f72ca0e915175596069dbbcc7c75af7b5e9b9bc107ad6349ede0819982f @@ -835,6 +838,7 @@ pygments==2.19.2 \ # via # gcovr # pytest + # rich pyjwt==2.10.1 \ --hash=sha256:3cc5772eb20009233caf06e9d8a0577824723b44e6648ee0a2aedb6cf9381953 \ --hash=sha256:dcdd193e30abefd5debf142f9adfcdd2b58004e644f25406ffaebd50bd98dacb @@ -1070,6 +1074,14 @@ reuse==5.0.2 \ --hash=sha256:7a680f00324e87a72061677a892d8cbabfddf7adcf7a5376aeeed2d78995bbbb \ --hash=sha256:878016ae5dd29c10bad4606d6676c12a268c12aa9fcfea66403598e16eed085c # via -r requirements-actions.in +rich==14.0.0 \ + --hash=sha256:1c9491e1951aac09caffd42f448ee3d04e58923ffe14993f6e83068dc395d7e0 \ + --hash=sha256:82f1bc23a6a21ebca4ae0c45af9bdbc492ed20231dcb63f297d6d1021a9d5725 + # via rich-click +rich-click==1.8.9 \ + --hash=sha256:c3fa81ed8a671a10de65a9e20abf642cfdac6fdb882db1ef465ee33919fbcfe2 \ + --hash=sha256:fd98c0ab9ddc1cf9c0b7463f68daf28b4d0033a74214ceb02f761b3ff2af3136 + # via -r requirements-actions.in rsa==4.7.2 \ --hash=sha256:78f9a9bf4e7be0c5ded4583326e7461e3a3c5aae24073648b4bdfa797d78c9d2 \ --hash=sha256:9d689e6ca1b3038bc82bf8d23e944b6b6037bc02301a574935b2dd946e0353b9 @@ -1214,13 +1226,7 @@ tomli==2.2.1 \ --hash=sha256:e85e99945e688e32d5a35c1ff38ed0b3f41f43fad8df0bdf79f72b2ba7bc5272 \ --hash=sha256:ece47d672db52ac607a3d9599a9d48dcb2f2f735c6c2d1f34130085bb12b112a \ --hash=sha256:f4039b9cbc3048b2416cc57ab3bda989a6fcf9b36cf8937f01a6e731b64f80d7 - # via - # -r requirements-actions.in - # mypy - # pylint - # pyproject-api - # pytest - # tox + # via -r requirements-actions.in tomlkit==0.13.3 \ --hash=sha256:430cf247ee57df2b94ee3fbe588e71d362a941ebb545dec29b53961d61add2a1 \ --hash=sha256:c89c649d79ee40629a9fda55f8ace8c6a1b42deb912b2a8fd8d942ddadb606b0 @@ -1235,13 +1241,11 @@ typing-extensions==4.14.0 \ --hash=sha256:8676b788e32f02ab42d9e7c61324048ae4c6d844a399eebace3d4979d75ceef4 \ --hash=sha256:a1514509136dd0b477638fc68d6a91497af5076466ad0fa6c338e44e359944af # via - # astroid # elasticsearch - # exceptiongroup # mypy # pygithub # python-can - # tox + # rich-click unidiff==0.7.5 \ --hash=sha256:2e5f0162052248946b9f0970a40e9e124236bf86c82b70821143a6fc1dea2574 \ --hash=sha256:c93bf2265cc1ba2a520e415ab05da587370bc2a3ae9e0414329f54f0c2fc09e8 diff --git a/scripts/requirements-extras.txt b/scripts/requirements-extras.txt index 772f59b0ddc4..b72acd2087d6 100644 --- a/scripts/requirements-extras.txt +++ b/scripts/requirements-extras.txt @@ -26,3 +26,6 @@ PyGithub # used to generate devicetree dependency graphs graphviz + +# used by Espressif esptool +rich_click diff --git a/soc/espressif/common/CMakeLists.txt b/soc/espressif/common/CMakeLists.txt index 3f0638e0c9d0..1daeac09541b 100644 --- a/soc/espressif/common/CMakeLists.txt +++ b/soc/espressif/common/CMakeLists.txt @@ -20,8 +20,8 @@ message("-- Espressif HAL path: ${ESP_IDF_PATH}") if((CONFIG_ESP_SIMPLE_BOOT OR CONFIG_MCUBOOT) AND NOT CONFIG_SOC_ESP32C6_LPCORE) if(CONFIG_BUILD_OUTPUT_BIN) - set(ESPTOOL_PY ${ESP_IDF_PATH}/tools/esptool_py/esptool.py) - message("-- Use the esptool.py: ${ESPTOOL_PY}") + set(ESPTOOL_PY ${ESP_IDF_PATH}/tools/esptool_py) + message("-- Use the esptool from: ${ESPTOOL_PY}") set(ELF2IMAGE_ARG "") if(NOT CONFIG_MCUBOOT) @@ -29,11 +29,11 @@ if((CONFIG_ESP_SIMPLE_BOOT OR CONFIG_MCUBOOT) AND NOT CONFIG_SOC_ESP32C6_LPCORE) endif() set_property(GLOBAL APPEND PROPERTY extra_post_build_commands - COMMAND ${PYTHON_EXECUTABLE} ${ESPTOOL_PY} + COMMAND PYTHONPATH=${ESPTOOL_PY} ${PYTHON_EXECUTABLE} -m esptool ARGS --chip ${CONFIG_SOC} elf2image ${ELF2IMAGE_ARG} - --flash_mode dio - --flash_freq ${CONFIG_ESPTOOLPY_FLASHFREQ} - --flash_size ${esptoolpy_flashsize}MB + --flash-mode dio + --flash-freq ${CONFIG_ESPTOOLPY_FLASHFREQ} + --flash-size ${esptoolpy_flashsize}MB -o ${CMAKE_BINARY_DIR}/zephyr/${KERNEL_BIN_NAME} ${CMAKE_BINARY_DIR}/zephyr/${KERNEL_ELF_NAME}) endif() diff --git a/west.yml b/west.yml index 91d959de4fba..44f710541889 100644 --- a/west.yml +++ b/west.yml @@ -169,7 +169,7 @@ manifest: groups: - hal - name: hal_espressif - revision: 3339ff2f85edb3edb1188873d3dcd25d9a544ee8 + revision: pull/461/head path: modules/hal/espressif west-commands: west/west-commands.yml groups: