Skip to content

Commit 84828f0

Browse files
earlephilhowerearlephilhower
authored
Fix Pio MHZ for RP2350, fix RP2350 generic menus (#2366)
* Fix Pio MHZ for RP2350, fix RP2350 generic menus * Clean up platform.txt IPV4 default Was never used, but should at least exist for sanity's sake Fixes #2365
1 parent b242876 commit 84828f0

10 files changed

+109
-49
lines changed

‎boards.txt

Lines changed: 72 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
menu.BoardModel=Model
66
menu.flash=Flash Size
77
menu.psram=PSRAM Size
8+
menu.psramcs=PSRAM CS
9+
menu.psramfreq=PSRAM Speed
810
menu.freq=CPU Speed
911
menu.opt=Optimize
1012
menu.rtti=RTTI
@@ -15460,14 +15462,6 @@ challenger_2350_wifi6_ble5.menu.freq.275=275 MHz (Overclock)
1546015462
challenger_2350_wifi6_ble5.menu.freq.275.build.f_cpu=275000000L
1546115463
challenger_2350_wifi6_ble5.menu.freq.300=300 MHz (Overclock)
1546215464
challenger_2350_wifi6_ble5.menu.freq.300.build.f_cpu=300000000L
15463-
challenger_2350_wifi6_ble5.menu.psram.8mb=8MByte PSRAM
15464-
challenger_2350_wifi6_ble5.menu.psram.8mb.build.psram_length=0x800000
15465-
challenger_2350_wifi6_ble5.menu.psram.0mb=0MByte PSRAM
15466-
challenger_2350_wifi6_ble5.menu.psram.0mb.build.psram_length=0x000000
15467-
challenger_2350_wifi6_ble5.menu.psram.2mb=2MByte PSRAM
15468-
challenger_2350_wifi6_ble5.menu.psram.2mb.build.psram_length=0x200000
15469-
challenger_2350_wifi6_ble5.menu.psram.4mb=4MByte PSRAM
15470-
challenger_2350_wifi6_ble5.menu.psram.4mb.build.psram_length=0x400000
1547115465
challenger_2350_wifi6_ble5.menu.opt.Small=Small (-Os) (standard)
1547215466
challenger_2350_wifi6_ble5.menu.opt.Small.build.flags.optimize=-Os
1547315467
challenger_2350_wifi6_ble5.menu.opt.Optimize=Optimize (-O)
@@ -15739,14 +15733,6 @@ challenger_2350_bconnect.menu.freq.275=275 MHz (Overclock)
1573915733
challenger_2350_bconnect.menu.freq.275.build.f_cpu=275000000L
1574015734
challenger_2350_bconnect.menu.freq.300=300 MHz (Overclock)
1574115735
challenger_2350_bconnect.menu.freq.300.build.f_cpu=300000000L
15742-
challenger_2350_bconnect.menu.psram.8mb=8MByte PSRAM
15743-
challenger_2350_bconnect.menu.psram.8mb.build.psram_length=0x800000
15744-
challenger_2350_bconnect.menu.psram.0mb=0MByte PSRAM
15745-
challenger_2350_bconnect.menu.psram.0mb.build.psram_length=0x000000
15746-
challenger_2350_bconnect.menu.psram.2mb=2MByte PSRAM
15747-
challenger_2350_bconnect.menu.psram.2mb.build.psram_length=0x200000
15748-
challenger_2350_bconnect.menu.psram.4mb=4MByte PSRAM
15749-
challenger_2350_bconnect.menu.psram.4mb.build.psram_length=0x400000
1575015736
challenger_2350_bconnect.menu.opt.Small=Small (-Os) (standard)
1575115737
challenger_2350_bconnect.menu.opt.Small.build.flags.optimize=-Os
1575215738
challenger_2350_bconnect.menu.opt.Optimize=Optimize (-O)
@@ -22135,14 +22121,6 @@ sparkfun_promicrorp2350.menu.freq.275=275 MHz (Overclock)
2213522121
sparkfun_promicrorp2350.menu.freq.275.build.f_cpu=275000000L
2213622122
sparkfun_promicrorp2350.menu.freq.300=300 MHz (Overclock)
2213722123
sparkfun_promicrorp2350.menu.freq.300.build.f_cpu=300000000L
22138-
sparkfun_promicrorp2350.menu.psram.8mb=8MByte PSRAM
22139-
sparkfun_promicrorp2350.menu.psram.8mb.build.psram_length=0x800000
22140-
sparkfun_promicrorp2350.menu.psram.0mb=0MByte PSRAM
22141-
sparkfun_promicrorp2350.menu.psram.0mb.build.psram_length=0x000000
22142-
sparkfun_promicrorp2350.menu.psram.2mb=2MByte PSRAM
22143-
sparkfun_promicrorp2350.menu.psram.2mb.build.psram_length=0x200000
22144-
sparkfun_promicrorp2350.menu.psram.4mb=4MByte PSRAM
22145-
sparkfun_promicrorp2350.menu.psram.4mb.build.psram_length=0x400000
2214622124
sparkfun_promicrorp2350.menu.opt.Small=Small (-Os) (standard)
2214722125
sparkfun_promicrorp2350.menu.opt.Small.build.flags.optimize=-Os
2214822126
sparkfun_promicrorp2350.menu.opt.Optimize=Optimize (-O)
@@ -26993,7 +26971,6 @@ generic_rp2350.build.ldscript=memmap_default.ld
2699326971
generic_rp2350.build.boot2=boot2_generic_03h_4_padded_checksum
2699426972
generic_rp2350.build.usb_manufacturer="Generic"
2699526973
generic_rp2350.build.usb_product="RP2350"
26996-
generic_rp2350.build.psram_length=0x800000
2699726974
generic_rp2350.menu.flash.16777216_0=16MB (no FS)
2699826975
generic_rp2350.menu.flash.16777216_0.upload.maximum_size=16769024
2699926976
generic_rp2350.menu.flash.16777216_0.build.flash_total=16777216
@@ -27162,14 +27139,82 @@ generic_rp2350.menu.freq.275=275 MHz (Overclock)
2716227139
generic_rp2350.menu.freq.275.build.f_cpu=275000000L
2716327140
generic_rp2350.menu.freq.300=300 MHz (Overclock)
2716427141
generic_rp2350.menu.freq.300.build.f_cpu=300000000L
27165-
generic_rp2350.menu.psram.8mb=8MByte PSRAM
27166-
generic_rp2350.menu.psram.8mb.build.psram_length=0x800000
2716727142
generic_rp2350.menu.psram.0mb=0MByte PSRAM
2716827143
generic_rp2350.menu.psram.0mb.build.psram_length=0x000000
2716927144
generic_rp2350.menu.psram.2mb=2MByte PSRAM
2717027145
generic_rp2350.menu.psram.2mb.build.psram_length=0x200000
2717127146
generic_rp2350.menu.psram.4mb=4MByte PSRAM
2717227147
generic_rp2350.menu.psram.4mb.build.psram_length=0x400000
27148+
generic_rp2350.menu.psram.8mb=8MByte PSRAM
27149+
generic_rp2350.menu.psram.8mb.build.psram_length=0x800000
27150+
generic_rp2350.menu.psramcs.GPIO0=GPIO 0
27151+
generic_rp2350.menu.psramcs.GPIO0.build.psram_cs=-DRP2350_PSRAM_CS=0
27152+
generic_rp2350.menu.psramcs.GPIO1=GPIO 1
27153+
generic_rp2350.menu.psramcs.GPIO1.build.psram_cs=-DRP2350_PSRAM_CS=1
27154+
generic_rp2350.menu.psramcs.GPIO2=GPIO 2
27155+
generic_rp2350.menu.psramcs.GPIO2.build.psram_cs=-DRP2350_PSRAM_CS=2
27156+
generic_rp2350.menu.psramcs.GPIO3=GPIO 3
27157+
generic_rp2350.menu.psramcs.GPIO3.build.psram_cs=-DRP2350_PSRAM_CS=3
27158+
generic_rp2350.menu.psramcs.GPIO4=GPIO 4
27159+
generic_rp2350.menu.psramcs.GPIO4.build.psram_cs=-DRP2350_PSRAM_CS=4
27160+
generic_rp2350.menu.psramcs.GPIO5=GPIO 5
27161+
generic_rp2350.menu.psramcs.GPIO5.build.psram_cs=-DRP2350_PSRAM_CS=5
27162+
generic_rp2350.menu.psramcs.GPIO6=GPIO 6
27163+
generic_rp2350.menu.psramcs.GPIO6.build.psram_cs=-DRP2350_PSRAM_CS=6
27164+
generic_rp2350.menu.psramcs.GPIO7=GPIO 7
27165+
generic_rp2350.menu.psramcs.GPIO7.build.psram_cs=-DRP2350_PSRAM_CS=7
27166+
generic_rp2350.menu.psramcs.GPIO8=GPIO 8
27167+
generic_rp2350.menu.psramcs.GPIO8.build.psram_cs=-DRP2350_PSRAM_CS=8
27168+
generic_rp2350.menu.psramcs.GPIO9=GPIO 9
27169+
generic_rp2350.menu.psramcs.GPIO9.build.psram_cs=-DRP2350_PSRAM_CS=9
27170+
generic_rp2350.menu.psramcs.GPIO10=GPIO 10
27171+
generic_rp2350.menu.psramcs.GPIO10.build.psram_cs=-DRP2350_PSRAM_CS=10
27172+
generic_rp2350.menu.psramcs.GPIO11=GPIO 11
27173+
generic_rp2350.menu.psramcs.GPIO11.build.psram_cs=-DRP2350_PSRAM_CS=11
27174+
generic_rp2350.menu.psramcs.GPIO12=GPIO 12
27175+
generic_rp2350.menu.psramcs.GPIO12.build.psram_cs=-DRP2350_PSRAM_CS=12
27176+
generic_rp2350.menu.psramcs.GPIO13=GPIO 13
27177+
generic_rp2350.menu.psramcs.GPIO13.build.psram_cs=-DRP2350_PSRAM_CS=13
27178+
generic_rp2350.menu.psramcs.GPIO14=GPIO 14
27179+
generic_rp2350.menu.psramcs.GPIO14.build.psram_cs=-DRP2350_PSRAM_CS=14
27180+
generic_rp2350.menu.psramcs.GPIO15=GPIO 15
27181+
generic_rp2350.menu.psramcs.GPIO15.build.psram_cs=-DRP2350_PSRAM_CS=15
27182+
generic_rp2350.menu.psramcs.GPIO16=GPIO 16
27183+
generic_rp2350.menu.psramcs.GPIO16.build.psram_cs=-DRP2350_PSRAM_CS=16
27184+
generic_rp2350.menu.psramcs.GPIO17=GPIO 17
27185+
generic_rp2350.menu.psramcs.GPIO17.build.psram_cs=-DRP2350_PSRAM_CS=17
27186+
generic_rp2350.menu.psramcs.GPIO18=GPIO 18
27187+
generic_rp2350.menu.psramcs.GPIO18.build.psram_cs=-DRP2350_PSRAM_CS=18
27188+
generic_rp2350.menu.psramcs.GPIO19=GPIO 19
27189+
generic_rp2350.menu.psramcs.GPIO19.build.psram_cs=-DRP2350_PSRAM_CS=19
27190+
generic_rp2350.menu.psramcs.GPIO20=GPIO 20
27191+
generic_rp2350.menu.psramcs.GPIO20.build.psram_cs=-DRP2350_PSRAM_CS=20
27192+
generic_rp2350.menu.psramcs.GPIO21=GPIO 21
27193+
generic_rp2350.menu.psramcs.GPIO21.build.psram_cs=-DRP2350_PSRAM_CS=21
27194+
generic_rp2350.menu.psramcs.GPIO22=GPIO 22
27195+
generic_rp2350.menu.psramcs.GPIO22.build.psram_cs=-DRP2350_PSRAM_CS=22
27196+
generic_rp2350.menu.psramcs.GPIO23=GPIO 23
27197+
generic_rp2350.menu.psramcs.GPIO23.build.psram_cs=-DRP2350_PSRAM_CS=23
27198+
generic_rp2350.menu.psramcs.GPIO24=GPIO 24
27199+
generic_rp2350.menu.psramcs.GPIO24.build.psram_cs=-DRP2350_PSRAM_CS=24
27200+
generic_rp2350.menu.psramcs.GPIO25=GPIO 25
27201+
generic_rp2350.menu.psramcs.GPIO25.build.psram_cs=-DRP2350_PSRAM_CS=25
27202+
generic_rp2350.menu.psramcs.GPIO26=GPIO 26
27203+
generic_rp2350.menu.psramcs.GPIO26.build.psram_cs=-DRP2350_PSRAM_CS=26
27204+
generic_rp2350.menu.psramcs.GPIO27=GPIO 27
27205+
generic_rp2350.menu.psramcs.GPIO27.build.psram_cs=-DRP2350_PSRAM_CS=27
27206+
generic_rp2350.menu.psramcs.GPIO28=GPIO 28
27207+
generic_rp2350.menu.psramcs.GPIO28.build.psram_cs=-DRP2350_PSRAM_CS=28
27208+
generic_rp2350.menu.psramcs.GPIO29=GPIO 29
27209+
generic_rp2350.menu.psramcs.GPIO29.build.psram_cs=-DRP2350_PSRAM_CS=29
27210+
generic_rp2350.menu.psramcs.GPIO30=GPIO 30
27211+
generic_rp2350.menu.psramcs.GPIO30.build.psram_cs=-DRP2350_PSRAM_CS=30
27212+
generic_rp2350.menu.psramcs.GPIO31=GPIO 31
27213+
generic_rp2350.menu.psramcs.GPIO31.build.psram_cs=-DRP2350_PSRAM_CS=31
27214+
generic_rp2350.menu.psramfreq.freq109=109 MHz
27215+
generic_rp2350.menu.psramfreq.freq109.build.psram_freq=-DRP2350_PSRAM_MAX_SCK_HZ=109000000
27216+
generic_rp2350.menu.psramfreq.freq133=133 MHz
27217+
generic_rp2350.menu.psramfreq.freq133.build.psram_freq=-DRP2350_PSRAM_MAX_SCK_HZ=133000000
2717327218
generic_rp2350.menu.opt.Small=Small (-Os) (standard)
2717427219
generic_rp2350.menu.opt.Small.build.flags.optimize=-Os
2717527220
generic_rp2350.menu.opt.Optimize=Optimize (-O)

‎platform.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ compiler.warning_flags.more=-Wall -Werror=return-type -Wno-ignored-qualifiers -W
4949
compiler.warning_flags.all=-Wall -Wextra -Werror=return-type -Wno-ignored-qualifiers -Wno-psabi -Wno-unused-parameter -Wno-missing-field-initializers
5050

5151
compiler.netdefines={build.libpicowdefs} -DLWIP_IGMP=1 -DLWIP_CHECKSUM_CTRL_PER_NETIF=1
52-
compiler.defines={build.led} {build.usbstack_flags} {build.usbpid} {build.usbvid} {build.usbpwr} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}' {compiler.netdefines} -DARDUINO_VARIANT="{build.variant}" -DPICO_FLASH_SIZE_BYTES={build.flash_total} "@{runtime.platform.path}/lib/{build.chip}/platform_def.txt"
52+
compiler.psramdefines={build.psram_cs} {build.psram_freq}
53+
compiler.defines={build.led} {build.usbstack_flags} {build.usbpid} {build.usbvid} {build.usbpwr} {compiler.psramdefines} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}' {compiler.netdefines} -DARDUINO_VARIANT="{build.variant}" -DPICO_FLASH_SIZE_BYTES={build.flash_total} "@{runtime.platform.path}/lib/{build.chip}/platform_def.txt"
5354
compiler.includes="-iprefix{runtime.platform.path}/" "@{runtime.platform.path}/lib/{build.chip}/platform_inc.txt" "@{runtime.platform.path}/lib/core_inc.txt" "-I{runtime.platform.path}/include"
5455
compiler.flags={build.toolchainopts} -ffunction-sections -fdata-sections {build.flags.exceptions} {build.flags.stackprotect} {build.picodebugflags}
5556
compiler.wrap="@{runtime.platform.path}/lib/{build.chip}/platform_wrap.txt" "@{runtime.platform.path}/lib/core_wrap.txt"
@@ -91,6 +92,8 @@ compiler.elf2hex.extra_flags=
9192
build.flash_total=
9293
build.flash_length=
9394
build.psram_length=0
95+
build.psram_cs=
96+
build.psram_freq=
9497
build.eeprom_start=
9598
build.flags.optimize=-Os
9699
build.flags.rtti=-fno-rtti
@@ -101,7 +104,7 @@ build.flags.libstdcpp=-lstdc++
101104
build.flags.exceptions=-fno-exceptions
102105
build.flags.stackprotect=
103106
build.libpico=libpico.a
104-
build.libpicow=libpipv4.a
107+
build.libpicow=libipv4.a
105108
build.boot2=boot2_generic_03h_4_padded_checksum
106109
build.libpicowdefs=-DLWIP_IPV6=0 -DLWIP_IPV4=1
107110
build.wificc=-DWIFICC=CYW43_COUNTRY_WORLDWIDE

‎tools/json/challenger_2350_bconnect.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"core": "earlephilhower",
1111
"cpu": "cortex-m33",
1212
"extra_flags": "-D ARDUINO_CHALLENGER_2350_BCONNECT_RP2350 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=500",
13-
"f_cpu": "133000000L",
13+
"f_cpu": "150000000L",
1414
"hwids": [
1515
[
1616
"0x2E8A",

‎tools/json/challenger_2350_wifi6_ble5.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"core": "earlephilhower",
1111
"cpu": "cortex-m33",
1212
"extra_flags": "-D ARDUINO_CHALLENGER_2350_WIFI_BLE_RP2350 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=500 -DWIFIESPAT2",
13-
"f_cpu": "133000000L",
13+
"f_cpu": "150000000L",
1414
"hwids": [
1515
[
1616
"0x2E8A",

‎tools/json/generic_rp2350.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"core": "earlephilhower",
1111
"cpu": "cortex-m33",
1212
"extra_flags": "-D ARDUINO_GENERIC_RP2350 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
13-
"f_cpu": "133000000L",
13+
"f_cpu": "150000000L",
1414
"hwids": [
1515
[
1616
"0x2E8A",

‎tools/json/rpipico2.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"core": "earlephilhower",
1111
"cpu": "cortex-m33",
1212
"extra_flags": "-D ARDUINO_RASPBERRY_PI_PICO_2 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
13-
"f_cpu": "133000000L",
13+
"f_cpu": "150000000L",
1414
"hwids": [
1515
[
1616
"0x2E8A",

‎tools/json/solderparty_rp2350_stamp.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"core": "earlephilhower",
1111
"cpu": "cortex-m33",
1212
"extra_flags": "-D ARDUINO_SOLDERPARTY_RP2350_STAMP -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=500",
13-
"f_cpu": "133000000L",
13+
"f_cpu": "150000000L",
1414
"hwids": [
1515
[
1616
"0x2E8A",

‎tools/json/solderparty_rp2350_stamp_xl.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"core": "earlephilhower",
1111
"cpu": "cortex-m33",
1212
"extra_flags": "-D ARDUINO_SOLDERPARTY_RP2350_STAMP_XL -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=500",
13-
"f_cpu": "133000000L",
13+
"f_cpu": "150000000L",
1414
"hwids": [
1515
[
1616
"0x2E8A",

‎tools/json/sparkfun_promicrorp2350.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"core": "earlephilhower",
1111
"cpu": "cortex-m33",
1212
"extra_flags": "-D ARDUINO_SPARKFUN_PROMICRO_RP2350 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
13-
"f_cpu": "133000000L",
13+
"f_cpu": "150000000L",
1414
"hwids": [
1515
[
1616
"0x2E8A",

‎tools/makeboards.py

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,20 @@ def BuildFreq(name, defmhz):
4848
print("%s.menu.freq.%s=%s MHz%s" % (name, f, f, warn))
4949
print("%s.menu.freq.%s.build.f_cpu=%dL" % (name, f, f * 1000000))
5050

51-
def BuildPSRAM(name, psramsize):
52-
out = 0
53-
if psramsize != 0:
54-
for s in [ psramsize, 0, 2, 4, 8]:
55-
if (out == 1) and (s == psramsize):
56-
continue
57-
print("%s.menu.psram.%dmb=%dMByte PSRAM" % (name, s, s))
58-
print("%s.menu.psram.%dmb.build.psram_length=0x%d00000" % (name, s, s))
59-
out = 1
51+
def BuildPSRAM(name):
52+
for s in [ 0, 2, 4, 8]:
53+
print("%s.menu.psram.%dmb=%dMByte PSRAM" % (name, s, s))
54+
print("%s.menu.psram.%dmb.build.psram_length=0x%d00000" % (name, s, s))
55+
56+
def BuildPSRAMCS(name):
57+
for s in range(0, 32):
58+
print("%s.menu.psramcs.GPIO%d=GPIO %d" % (name, s, s))
59+
print("%s.menu.psramcs.GPIO%d.build.psram_cs=-DRP2350_PSRAM_CS=%d" % (name, s, s))
60+
61+
def BuildPSRAMFreq(name):
62+
for s in [ 109, 133 ]:
63+
print("%s.menu.psramfreq.freq%d=%d MHz" % (name, s, s))
64+
print("%s.menu.psramfreq.freq%d.build.psram_freq=-DRP2350_PSRAM_MAX_SCK_HZ=%d" % (name, s, s * 1000000))
6065

6166
def BuildOptimize(name):
6267
for l in [ ("Small", "Small", "-Os", " (standard)"), ("Optimize", "Optimize", "-O", ""), ("Optimize2", "Optimize More", "-O2", ""),
@@ -237,7 +242,7 @@ def BuildHeader(name, chip, chaintuple, chipoptions, vendor_name, product_name,
237242
print("%s.build.boot2=%s" % (name, boot2))
238243
print('%s.build.usb_manufacturer="%s"' % (name, vendor_name))
239244
print('%s.build.usb_product="%s"' % (name, product_name))
240-
if (chip == "rp2350") and (name != "generic"):
245+
if (chip == "rp2350") and (name != "generic_rp2350"):
241246
print("%s.build.psram_length=0x%d00000" % (name, psramsize))
242247
if extra != None:
243248
m_extra = ''
@@ -255,6 +260,8 @@ def BuildGlobalMenuList():
255260
print("menu.BoardModel=Model")
256261
print("menu.flash=Flash Size")
257262
print("menu.psram=PSRAM Size")
263+
print("menu.psramcs=PSRAM CS")
264+
print("menu.psramfreq=PSRAM Speed")
258265
print("menu.freq=CPU Speed")
259266
print("menu.opt=Optimize")
260267
print("menu.rtti=RTTI")
@@ -300,8 +307,10 @@ def MakeBoard(name, chip, vendor_name, product_name, vid, pid, pwr, boarddefine,
300307
BuildFlashMenu(name, chip, flashsizemb * 1024 * 1024, fssizelist)
301308
if chip == "rp2350":
302309
BuildFreq(name, 150)
303-
if name != "generic":
304-
BuildPSRAM(name, psramsize)
310+
if name == "generic_rp2350":
311+
BuildPSRAM(name)
312+
BuildPSRAMCS(name)
313+
BuildPSRAMFreq(name)
305314
else:
306315
BuildFreq(name, 133)
307316
BuildOptimize(name)
@@ -342,10 +351,12 @@ def MakeBoardJSON(name, chip, vendor_name, product_name, vid, pid, pwr, boarddef
342351
cpu = "cortex-m0plus"
343352
ramsize = 256
344353
jlink = "RP2040_M0_0"
354+
fcpu = "133000000L"
345355
elif chip == "rp2350":
346356
cpu = "cortex-m33"
347357
ramsize = 512
348358
jlink = "RP2350_0"
359+
fcpu = "150000000L"
349360
json = """{
350361
"build": {
351362
"arduino": {
@@ -358,7 +369,7 @@ def MakeBoardJSON(name, chip, vendor_name, product_name, vid, pid, pwr, boarddef
358369
"core": "earlephilhower",
359370
"cpu": "CPU",
360371
"extra_flags": "-D ARDUINO_BOARDDEFINE -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=USBPWR EXTRA_INFO",
361-
"f_cpu": "133000000L",
372+
"f_cpu": "FCPU",
362373
"hwids": [
363374
[
364375
"0x2E8A",
@@ -406,6 +417,7 @@ def MakeBoardJSON(name, chip, vendor_name, product_name, vid, pid, pwr, boarddef
406417
.replace('BOARDDEFINE', boarddefine)\
407418
.replace('BOOT2', boot2)\
408419
.replace('MCUCHIP', chip)\
420+
.replace('FCPU', fcpu)\
409421
.replace('CPU', cpu)\
410422
.replace('JLINK', jlink)\
411423
.replace('VID', vid.upper().replace("X", "x"))\

0 commit comments

Comments
 (0)