Skip to content

Commit 6568f8c

Browse files
igrrigrr
committed
Merge branch 'feature/update-qemu-to-esp_develop_9.0.0_20240606_v5.3' into 'release/v5.3'
feat(tools): update qemu version to esp_develop_9.0.0_20240606 (v5.3) See merge request espressif/esp-idf!31526
2 parents 55069a7 + acb201e commit 6568f8c

File tree

3 files changed

+76
-46
lines changed

3 files changed

+76
-46
lines changed

‎components/esp_eth/src/openeth/esp_openeth.h‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -8,17 +8,12 @@
88
#include "sdkconfig.h"
99
#include "soc/interrupts.h"
1010

11-
#if CONFIG_IDF_TARGET_ESP32C3
12-
13-
/**
14-
* @brief Since ESP32-C3 target in QEMU doesn't support Wifi, reuse its interrupt source for ethernet
11+
/*
12+
* For targets which don't have an ethernet MAC and the associated interrupt source,
13+
* we can reuse the Wifi interrupt source for ethernet, since QEMU doesn't emulate Wifi (yet).
14+
* We also map the EMAC registers to an unused address range.
1515
*/
16+
#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3
1617
#define ETS_ETH_MAC_INTR_SOURCE ETS_WIFI_MAC_INTR_SOURCE
17-
18-
19-
/**
20-
* @brief Use an empty I/O range for the ethernet registers
21-
*/
2218
#define DR_REG_EMAC_BASE 0x600CD000
23-
24-
#endif // CONFIG_IDF_TARGET_ESP32C3
19+
#endif

‎tools/idf_py_actions/qemu_ext.py‎

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
1+
# SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
22
# SPDX-License-Identifier: Apache-2.0
33
import atexit
44
import binascii
@@ -10,7 +10,9 @@
1010
import sys
1111
import time
1212
from dataclasses import dataclass
13-
from typing import Any, Dict, List
13+
from typing import Any
14+
from typing import Dict
15+
from typing import List
1416

1517
from click.core import Context
1618

@@ -90,6 +92,39 @@ class QemuTarget:
9092
'00000000000000000000000000000000000000000000000000000000000000000000000000000000'
9193
'00000000000000000000000000000000000000000000000000000000000000000000000000000000'
9294
'000000000000000000000000000000000000000000000000')),
95+
'esp32s3': QemuTarget(
96+
'esp32s3',
97+
'qemu-system-xtensa',
98+
'qemu-xtensa',
99+
'-M esp32s3',
100+
# Chip revision 0.3
101+
binascii.unhexlify(
102+
'00000000000000000000000000000000000000000000000000000000000000000000000000000c00'
103+
'00000000000000000000000000000000000000000000000000000000000000000000000000000000'
104+
'00000000000000000000000000000000000000000000000000000000000000000000000000000000'
105+
'00000000000000000000000000000000000000000000000000000000000000000000000000000000'
106+
'00000000000000000000000000000000000000000000000000000000000000000000000000000000'
107+
'00000000000000000000000000000000000000000000000000000000000000000000000000000000'
108+
'00000000000000000000000000000000000000000000000000000000000000000000000000000000'
109+
'00000000000000000000000000000000000000000000000000000000000000000000000000000000'
110+
'00000000000000000000000000000000000000000000000000000000000000000000000000000000'
111+
'00000000000000000000000000000000000000000000000000000000000000000000000000000000'
112+
'00000000000000000000000000000000000000000000000000000000000000000000000000000000'
113+
'00000000000000000000000000000000000000000000000000000000000000000000000000000000'
114+
'00000000000000000000000000000000000000000000000000000000000000000000000000000000'
115+
'00000000000000000000000000000000000000000000000000000000000000000000000000000000'
116+
'00000000000000000000000000000000000000000000000000000000000000000000000000000000'
117+
'00000000000000000000000000000000000000000000000000000000000000000000000000000000'
118+
'00000000000000000000000000000000000000000000000000000000000000000000000000000000'
119+
'00000000000000000000000000000000000000000000000000000000000000000000000000000000'
120+
'00000000000000000000000000000000000000000000000000000000000000000000000000000000'
121+
'00000000000000000000000000000000000000000000000000000000000000000000000000000000'
122+
'00000000000000000000000000000000000000000000000000000000000000000000000000000000'
123+
'00000000000000000000000000000000000000000000000000000000000000000000000000000000'
124+
'00000000000000000000000000000000000000000000000000000000000000000000000000000000'
125+
'00000000000000000000000000000000000000000000000000000000000000000000000000000000'
126+
'00000000000000000000000000000000000000000000000000000000000000000000000000000000'
127+
'000000000000000000000000000000000000000000000000')),
93128
}
94129

95130

‎tools/tools.json‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -896,31 +896,31 @@
896896
"versions": [
897897
{
898898
"linux-amd64": {
899-
"sha256": "e7c72ef5705ad1444d391711088c8717fc89f42e9bf6d1487f9c2a326b8cfa83",
900-
"size": 14714724,
901-
"url": "https://github.com/espressif/qemu/releases/download/esp-develop-8.2.0-20240122/qemu-xtensa-softmmu-esp_develop_8.2.0_20240122-x86_64-linux-gnu.tar.xz"
899+
"sha256": "071d117c44a6e9a1bc8664ab63b592d3e17ceb779119dcb46c59571a4a7a88c9",
900+
"size": 13611248,
901+
"url": "https://github.com/espressif/qemu/releases/download/esp-develop-9.0.0-20240606/qemu-xtensa-softmmu-esp_develop_9.0.0_20240606-x86_64-linux-gnu.tar.xz"
902902
},
903903
"linux-arm64": {
904-
"sha256": "77c83f2772f7d9b0c770722c2cebf3625d21d8eddbccfea6816f3d8f4982ea86",
905-
"size": 14239876,
906-
"url": "https://github.com/espressif/qemu/releases/download/esp-develop-8.2.0-20240122/qemu-xtensa-softmmu-esp_develop_8.2.0_20240122-aarch64-linux-gnu.tar.xz"
904+
"sha256": "43552f32b303a6820d0d9551903e54fc221aca98ccbd04e5cbccbca881548008",
905+
"size": 15247720,
906+
"url": "https://github.com/espressif/qemu/releases/download/esp-develop-9.0.0-20240606/qemu-xtensa-softmmu-esp_develop_9.0.0_20240606-aarch64-linux-gnu.tar.xz"
907907
},
908908
"macos": {
909-
"sha256": "897126a12aeac1cc7d8e9a50626cdf0bc4812fd4bceb77b07ff4a81b86deaaa4",
910-
"size": 3379992,
911-
"url": "https://github.com/espressif/qemu/releases/download/esp-develop-8.2.0-20240122/qemu-xtensa-softmmu-esp_develop_8.2.0_20240122-x86_64-apple-darwin.tar.xz"
909+
"sha256": "0096734280ce04f558cd9bd72f35db39667f80d44309a35565f2f8c02d1f9cc3",
910+
"size": 3707956,
911+
"url": "https://github.com/espressif/qemu/releases/download/esp-develop-9.0.0-20240606/qemu-xtensa-softmmu-esp_develop_9.0.0_20240606-x86_64-apple-darwin.tar.xz"
912912
},
913913
"macos-arm64": {
914-
"sha256": "9134f6dc653c6dd556a6c9c2d80b9eca0c437a8f625e994f9285aadf7b2e7d6f",
915-
"size": 3200756,
916-
"url": "https://github.com/espressif/qemu/releases/download/esp-develop-8.2.0-20240122/qemu-xtensa-softmmu-esp_develop_8.2.0_20240122-aarch64-apple-darwin.tar.xz"
914+
"sha256": "fb4ca6be7b1a4dbcf153879cf0582300f974371def0826c0c5b728f12812ad08",
915+
"size": 3456764,
916+
"url": "https://github.com/espressif/qemu/releases/download/esp-develop-9.0.0-20240606/qemu-xtensa-softmmu-esp_develop_9.0.0_20240606-aarch64-apple-darwin.tar.xz"
917917
},
918-
"name": "esp_develop_8.2.0_20240122",
918+
"name": "esp_develop_9.0.0_20240606",
919919
"status": "recommended",
920920
"win64": {
921-
"sha256": "fc49844b506697542558d3fcb2fe64171b3d28f47e59000ebe8e198d32091d45",
922-
"size": 32225200,
923-
"url": "https://github.com/espressif/qemu/releases/download/esp-develop-8.2.0-20240122/qemu-xtensa-softmmu-esp_develop_8.2.0_20240122-x86_64-w64-mingw32.tar.xz"
921+
"sha256": "281659f7a1d49761ac6f54d0aeb14366cb93c002f21948b847a0e15c0b8f5425",
922+
"size": 33957256,
923+
"url": "https://github.com/espressif/qemu/releases/download/esp-develop-9.0.0-20240606/qemu-xtensa-softmmu-esp_develop_9.0.0_20240606-x86_64-w64-mingw32.tar.xz"
924924
}
925925
}
926926
]
@@ -949,31 +949,31 @@
949949
"versions": [
950950
{
951951
"linux-amd64": {
952-
"sha256": "95ac86d7b53bf98b5ff19c33aa926189b849f5a0daf8f41e160bc86c5e31abd4",
953-
"size": 16275380,
954-
"url": "https://github.com/espressif/qemu/releases/download/esp-develop-8.2.0-20240122/qemu-riscv32-softmmu-esp_develop_8.2.0_20240122-x86_64-linux-gnu.tar.xz"
952+
"sha256": "47120e826cfec7180db8cb611a7a4aed2e9b2191c2a739194f8ce085e63cdd8d",
953+
"size": 14454468,
954+
"url": "https://github.com/espressif/qemu/releases/download/esp-develop-9.0.0-20240606/qemu-riscv32-softmmu-esp_develop_9.0.0_20240606-x86_64-linux-gnu.tar.xz"
955955
},
956956
"linux-arm64": {
957-
"sha256": "4089f7958f753779e5b4c93fe2469d62850a1f209b0bda8b75d55fe4a61ca39b",
958-
"size": 15796904,
959-
"url": "https://github.com/espressif/qemu/releases/download/esp-develop-8.2.0-20240122/qemu-riscv32-softmmu-esp_develop_8.2.0_20240122-aarch64-linux-gnu.tar.xz"
957+
"sha256": "3b6221a8b1881d2c9b9fa0b0bf8d7065c84153d2a54e429307bde9feae235c27",
958+
"size": 16542756,
959+
"url": "https://github.com/espressif/qemu/releases/download/esp-develop-9.0.0-20240606/qemu-riscv32-softmmu-esp_develop_9.0.0_20240606-aarch64-linux-gnu.tar.xz"
960960
},
961961
"macos": {
962-
"sha256": "e9cc3c1344f6bf1ffa3748a4c59d88f9005c2689cc0583458cea35409a73c923",
963-
"size": 3502440,
964-
"url": "https://github.com/espressif/qemu/releases/download/esp-develop-8.2.0-20240122/qemu-riscv32-softmmu-esp_develop_8.2.0_20240122-x86_64-apple-darwin.tar.xz"
962+
"sha256": "3afa55d5abea52ccf18d0bc41fe819d568bd4ee1582989b1ee9b1ee4a609a31e",
963+
"size": 3751096,
964+
"url": "https://github.com/espressif/qemu/releases/download/esp-develop-9.0.0-20240606/qemu-riscv32-softmmu-esp_develop_9.0.0_20240606-x86_64-apple-darwin.tar.xz"
965965
},
966966
"macos-arm64": {
967-
"sha256": "b3f23e294cf325f92e5e8948583cc985d55d5d2ba3d79c04c9d09f080b62954d",
968-
"size": 3219984,
969-
"url": "https://github.com/espressif/qemu/releases/download/esp-develop-8.2.0-20240122/qemu-riscv32-softmmu-esp_develop_8.2.0_20240122-aarch64-apple-darwin.tar.xz"
967+
"sha256": "69ba5154594fb2922d5490a49ea6b4925c024c6c37f875b42f9885f513e0bcdd",
968+
"size": 3409264,
969+
"url": "https://github.com/espressif/qemu/releases/download/esp-develop-9.0.0-20240606/qemu-riscv32-softmmu-esp_develop_9.0.0_20240606-aarch64-apple-darwin.tar.xz"
970970
},
971-
"name": "esp_develop_8.2.0_20240122",
971+
"name": "esp_develop_9.0.0_20240606",
972972
"status": "recommended",
973973
"win64": {
974-
"sha256": "36008768c7ce91927e73de5e4298625087c01208e6122d886e578d400fd93b5c",
975-
"size": 35229220,
976-
"url": "https://github.com/espressif/qemu/releases/download/esp-develop-8.2.0-20240122/qemu-riscv32-softmmu-esp_develop_8.2.0_20240122-x86_64-w64-mingw32.tar.xz"
974+
"sha256": "f49bb5c8f4d6e2cfbf7eeec21eb8ef190a57307778705bc689536ac13bde511c",
975+
"size": 36274632,
976+
"url": "https://github.com/espressif/qemu/releases/download/esp-develop-9.0.0-20240606/qemu-riscv32-softmmu-esp_develop_9.0.0_20240606-x86_64-w64-mingw32.tar.xz"
977977
}
978978
}
979979
]

0 commit comments

Comments
 (0)