Skip to content
This repository was archived by the owner on Aug 9, 2022. It is now read-only.

Commit b7009fe

Browse files
committed
Xtensa bump & SVD regeneration
1 parent 47406ba commit b7009fe

File tree

3 files changed

+27
-13
lines changed

3 files changed

+27
-13
lines changed

Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "esp32"
3-
version = "0.10.0"
3+
version = "0.11.0"
44
authors = ["Scott Mabin <[email protected]>", "Arjan Mels <[email protected]>"]
55
edition = "2018"
66
readme = "README.md"
@@ -21,11 +21,11 @@ include = [
2121
license = "MIT OR Apache-2.0"
2222

2323
[dependencies]
24-
bare-metal = "0.2"
24+
bare-metal = "1.0"
2525
vcell = "0.1"
26-
xtensa-lx = "0.3.0"
27-
xtensa-lx-rt = { version = "0.5.0", optional = true }
26+
xtensa-lx = "0.4.0"
27+
xtensa-lx-rt = { version = "0.7.0", optional = true }
2828

2929
[features]
30-
default=[]
31-
rt=["xtensa-lx-rt"]
30+
default=["xtensa-lx/lx6"]
31+
rt=["xtensa-lx-rt/lx6"]

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ fmt:
2525

2626
build:
2727
cargo clean
28-
cargo xbuild --target xtensa-esp32-none-elf
28+
cargo +esp-dev build --target xtensa-esp32-none-elf -Zbuild-std=core

svd/esp32.svd

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="1.0" xsi:noNamespaceSchemaLocation="CMSIS-SVD_Schema_1.0.xsd">
1+
<device xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="1.0" xs:noNamespaceSchemaLocation="CMSIS-SVD_Schema_1.0.xsd">
22
<name>esp32</name>
33
<version>1.0</version>
44
<cpu>
@@ -1480,7 +1480,7 @@
14801480
<dimIncrement>0x4</dimIncrement>
14811481
<dimIndex>0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15</dimIndex>
14821482
<name>W%s</name>
1483-
<description>SPI_W0</description>
1483+
<description>SPI_W%s</description>
14841484
<addressOffset>0x80</addressOffset>
14851485
<size>32</size>
14861486
<resetValue>0x00000000</resetValue>
@@ -9070,7 +9070,7 @@
90709070
<dimIncrement>0x4</dimIncrement>
90719071
<dimIndex>0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39</dimIndex>
90729072
<name>PIN%s</name>
9073-
<description>GPIO_PIN0</description>
9073+
<description>GPIO_PIN%s</description>
90749074
<addressOffset>0x88</addressOffset>
90759075
<size>32</size>
90769076
<resetValue>0x00000000</resetValue>
@@ -9150,7 +9150,7 @@
91509150
<dimIncrement>0x4</dimIncrement>
91519151
<dimIndex>0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255</dimIndex>
91529152
<name>FUNC%s_IN_SEL_CFG</name>
9153-
<description>GPIO_FUNC0_IN_SEL_CFG</description>
9153+
<description>GPIO_FUNC%s_IN_SEL_CFG</description>
91549154
<addressOffset>0x130</addressOffset>
91559155
<size>32</size>
91569156
<resetValue>0x00000000</resetValue>
@@ -9177,7 +9177,7 @@
91779177
<dimIncrement>0x4</dimIncrement>
91789178
<dimIndex>0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39</dimIndex>
91799179
<name>FUNC%s_OUT_SEL_CFG</name>
9180-
<description>GPIO_FUNC0_OUT_SEL_CFG</description>
9180+
<description>GPIO_FUNC%s_OUT_SEL_CFG</description>
91819181
<addressOffset>0x530</addressOffset>
91829182
<size>32</size>
91839183
<resetValue>0x00000000</resetValue>
@@ -20770,7 +20770,7 @@
2077020770
<dimIncrement>0x4</dimIncrement>
2077120771
<dimIndex>0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17</dimIndex>
2077220772
<name>PIN%s</name>
20773-
<description>RTC_GPIO_PIN0</description>
20773+
<description>RTC_GPIO_PIN%s</description>
2077420774
<addressOffset>0x28</addressOffset>
2077520775
<size>32</size>
2077620776
<resetValue>0x00000000</resetValue>
@@ -42029,6 +42029,20 @@
4202942029
<name>UART0</name>
4203042030
<baseAddress>0x3ff40000</baseAddress>
4203142031
</peripheral>
42032+
<peripheral>
42033+
<name>RNG</name>
42034+
<description>True Random Number Generator</description>
42035+
<baseAddress>1073172804</baseAddress>
42036+
<registers>
42037+
<register>
42038+
<name>RNG_DATA</name>
42039+
<description>Random Number Data</description>
42040+
<addressOffset>0</addressOffset>
42041+
<size>32</size>
42042+
<access>read-only</access>
42043+
</register>
42044+
</registers>
42045+
</peripheral>
4203242046
<peripheral>
4203342047
<name>XTENSA_INTERNAL</name>
4203442048
<baseAddress>0</baseAddress>

0 commit comments

Comments
 (0)