Skip to content

Commit 51fedff

Browse files
el-hanel-han
committed
make memory size base 10 instead of hexadecimal
1 parent 88bfc6c commit 51fedff

File tree

7 files changed

+25
-25
lines changed

7 files changed

+25
-25
lines changed

‎devices/nrf/nrf52810.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
<vector position="25" name="SWI5"/>
3232
<vector position="28" name="PWM0"/>
3333
<vector position="29" name="PDM"/>
34-
<memory name="flash" access="rx" start="0x00000000" size="0x30000"/>
35-
<memory name="code_ram" access="rwx" start="0x800000" size="0x6000"/>
36-
<memory name="ram" access="rwx" start="0x20000000" size="0x6000"/>
34+
<memory name="flash" access="rx" start="0x00000000" size="196608"/>
35+
<memory name="code_ram" access="rwx" start="0x800000" size="24576"/>
36+
<memory name="ram" access="rwx" start="0x20000000" size="24576"/>
3737
</driver>
3838
<driver name="aar" type="nrf52"/>
3939
<driver name="bprot" type="nrf52"/>

‎devices/nrf/nrf52811.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
<vector position="25" name="SWI5"/>
3232
<vector position="28" name="PWM0"/>
3333
<vector position="29" name="PDM"/>
34-
<memory name="flash" access="rx" start="0x00000000" size="0x30000"/>
35-
<memory name="code_ram" access="rwx" start="0x800000" size="0x6000"/>
36-
<memory name="ram" access="rwx" start="0x20000000" size="0x6000"/>
34+
<memory name="flash" access="rx" start="0x00000000" size="196608"/>
35+
<memory name="code_ram" access="rwx" start="0x800000" size="24576"/>
36+
<memory name="ram" access="rwx" start="0x20000000" size="24576"/>
3737
</driver>
3838
<driver name="aar" type="nrf52"/>
3939
<driver name="bprot" type="nrf52"/>

‎devices/nrf/nrf52820.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
<vector position="25" name="SWI5_EGU5"/>
3131
<vector position="26" name="TIMER3"/>
3232
<vector position="39" name="USBD"/>
33-
<memory name="flash" access="rx" start="0x00000000" size="0x40000"/>
34-
<memory name="code_ram" access="rwx" start="0x800000" size="0x8000"/>
35-
<memory name="ram" access="rwx" start="0x20000000" size="0x8000"/>
33+
<memory name="flash" access="rx" start="0x00000000" size="262144"/>
34+
<memory name="code_ram" access="rwx" start="0x800000" size="32768"/>
35+
<memory name="ram" access="rwx" start="0x20000000" size="32768"/>
3636
</driver>
3737
<driver name="aar" type="nrf52"/>
3838
<driver name="acl" type="nrf52"/>

‎devices/nrf/nrf52832.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@
4141
<vector position="36" name="RTC2"/>
4242
<vector position="37" name="I2S"/>
4343
<vector position="38" name="FPU"/>
44-
<memory device-function="ab" name="flash" access="rx" start="0x00000000" size="0x40000"/>
45-
<memory device-function="aa" name="flash" access="rx" start="0x00000000" size="0x80000"/>
46-
<memory device-function="ab" name="code_ram" access="rwx" start="0x800000" size="0x8000"/>
47-
<memory device-function="aa" name="code_ram" access="rwx" start="0x800000" size="0x10000"/>
48-
<memory device-function="ab" name="ram" access="rwx" start="0x20000000" size="0x8000"/>
49-
<memory device-function="aa" name="ram" access="rwx" start="0x20000000" size="0x10000"/>
44+
<memory device-function="ab" name="flash" access="rx" start="0x00000000" size="262144"/>
45+
<memory device-function="aa" name="flash" access="rx" start="0x00000000" size="524288"/>
46+
<memory device-function="ab" name="code_ram" access="rwx" start="0x800000" size="32768"/>
47+
<memory device-function="aa" name="code_ram" access="rwx" start="0x800000" size="65536"/>
48+
<memory device-function="ab" name="ram" access="rwx" start="0x20000000" size="32768"/>
49+
<memory device-function="aa" name="ram" access="rwx" start="0x20000000" size="65536"/>
5050
</driver>
5151
<driver name="aar" type="nrf52"/>
5252
<driver name="bprot" type="nrf52"/>

‎devices/nrf/nrf52833.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@
4545
<vector position="40" name="UARTE1"/>
4646
<vector position="45" name="PWM3"/>
4747
<vector position="47" name="SPIM3"/>
48-
<memory name="flash" access="rx" start="0x00000000" size="0x80000"/>
49-
<memory name="code_ram" access="rwx" start="0x800000" size="0x20000"/>
50-
<memory name="ram" access="rwx" start="0x20000000" size="0x20000"/>
48+
<memory name="flash" access="rx" start="0x00000000" size="524288"/>
49+
<memory name="code_ram" access="rwx" start="0x800000" size="131072"/>
50+
<memory name="ram" access="rwx" start="0x20000000" size="131072"/>
5151
</driver>
5252
<driver name="aar" type="nrf52"/>
5353
<driver name="acl" type="nrf52"/>

‎devices/nrf/nrf52840.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@
4747
<vector position="42" name="CRYPTOCELL"/>
4848
<vector position="45" name="PWM3"/>
4949
<vector position="47" name="SPIM3"/>
50-
<memory name="flash" access="rx" start="0x00000000" size="0x100000"/>
51-
<memory name="code_ram" access="rwx" start="0x800000" size="0x40000"/>
52-
<memory name="extflash" access="rx" start="0x12000000" size="0x8000000"/>
53-
<memory name="ram" access="rwx" start="0x20000000" size="0x40000"/>
50+
<memory name="flash" access="rx" start="0x00000000" size="1048576"/>
51+
<memory name="code_ram" access="rwx" start="0x800000" size="262144"/>
52+
<memory name="extflash" access="rx" start="0x12000000" size="134217728"/>
53+
<memory name="ram" access="rwx" start="0x20000000" size="262144"/>
5454
</driver>
5555
<driver name="aar" type="nrf52"/>
5656
<driver name="acl" type="nrf52"/>

‎tools/generator/dfg/nrf/nrf_device_tree.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def _properties_from_file(ld_filename):
6767
memories.append({
6868
"name": match.group("name").lower(),
6969
"access": match.group("access").lower(),
70-
"size": match.group("size").lower(),
70+
"size": str(int(match.group("size").lower(), 16)),
7171
"start": match.group("start").lower()})
7272

7373
p["memories"] = memories
@@ -170,13 +170,13 @@ def driverOrder(e):
170170
core_child = tree.addChild('driver')
171171
core_child.setAttributes('name', 'core', 'type', p['core'])
172172
core_child.addSortKey(lambda e: (int(e['position']), e['name']) if e.name == 'vector' else (-1, ""))
173-
core_child.addSortKey(lambda e: (e['name'], int(e['size'], 16)) if e.name == 'memory' else ("", -1))
173+
core_child.addSortKey(lambda e: (e['name'], int(e['size'])) if e.name == 'memory' else ("", -1))
174174

175175
for section in p["memories"]:
176176
memory_section = core_child.addChild("memory")
177177
memory_section.setAttributes(["name", "access", "start", "size"], section)
178178
# sort the node children by start address and size
179-
core_child.addSortKey(lambda e: (int(e["start"], 16), int(e["size"], 16)) if e.name == "memory" else (-1, -1))
179+
core_child.addSortKey(lambda e: (int(e["start"], 16), int(e["size"])) if e.name == "memory" else (-1, -1))
180180

181181
# for memory in ['flash', 'ram', 'lpram', 'eeprom']:
182182
# if memory not in p: continue;

0 commit comments

Comments
 (0)