From 3c6436cda12075e130671b31307c2dbeac210d06 Mon Sep 17 00:00:00 2001 From: "Taylor.An" Date: Wed, 14 Dec 2022 09:14:00 +0900 Subject: [PATCH] Modified W6100-EVB-Pico USB_PID is 0x1046. --- boards.txt | 14 +++++++------- tools/json/wiznet_6100_evb_pico.json | 4 ++-- tools/makeboards.py | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/boards.txt b/boards.txt index 27c95780b..c569957e4 100644 --- a/boards.txt +++ b/boards.txt @@ -16849,8 +16849,8 @@ wiznet_5500_evb_picopicodebug.menu.ipstack.ipv4ipv6.build.lwipdefs=-DLWIP_IPV6=1 # ----------------------------------- wiznet_6100_evb_pico.name=WIZnet W6100-EVB-Pico wiznet_6100_evb_pico.vid.0=0x2e8a -wiznet_6100_evb_pico.pid.0=0x1029 -wiznet_6100_evb_pico.build.usbpid=-DSERIALUSB_PID=0x1029 +wiznet_6100_evb_pico.pid.0=0x1046 +wiznet_6100_evb_pico.build.usbpid=-DSERIALUSB_PID=0x1046 wiznet_6100_evb_pico.build.usbpwr=-DUSBD_MAX_POWER_MA=250 wiznet_6100_evb_pico.build.board=WIZNET_6100_EVB_PICO wiznet_6100_evb_pico.build.mcu=cortex-m0plus @@ -16869,7 +16869,7 @@ wiznet_6100_evb_pico.build.ldscript=memmap_default.ld wiznet_6100_evb_pico.build.ram_length=256k wiznet_6100_evb_pico.build.boot2=boot2_w25q080_2_padded_checksum wiznet_6100_evb_pico.build.vid=0x2e8a -wiznet_6100_evb_pico.build.pid=0x1029 +wiznet_6100_evb_pico.build.pid=0x1046 wiznet_6100_evb_pico.build.usb_manufacturer="WIZnet" wiznet_6100_evb_pico.build.usb_product="W6100-EVB-Pico" wiznet_6100_evb_pico.menu.flash.2097152_0=2MB (no FS) @@ -16997,7 +16997,7 @@ wiznet_6100_evb_pico.menu.ipstack.ipv4ipv6.build.lwipdefs=-DLWIP_IPV6=1 -DLWIP_I wiznet_6100_evb_picopicoprobe.name=WIZnet W6100-EVB-Pico (Picoprobe) wiznet_6100_evb_picopicoprobe.vid.0=0x2e8a wiznet_6100_evb_picopicoprobe.pid.0=0x0004 -wiznet_6100_evb_picopicoprobe.build.usbpid=-DSERIALUSB_PID=0x1029 +wiznet_6100_evb_picopicoprobe.build.usbpid=-DSERIALUSB_PID=0x1046 wiznet_6100_evb_picopicoprobe.build.usbpwr=-DUSBD_MAX_POWER_MA=250 wiznet_6100_evb_picopicoprobe.build.board=WIZNET_6100_EVB_PICO wiznet_6100_evb_picopicoprobe.build.mcu=cortex-m0plus @@ -17016,7 +17016,7 @@ wiznet_6100_evb_picopicoprobe.build.ldscript=memmap_default.ld wiznet_6100_evb_picopicoprobe.build.ram_length=256k wiznet_6100_evb_picopicoprobe.build.boot2=boot2_w25q080_2_padded_checksum wiznet_6100_evb_picopicoprobe.build.vid=0x2e8a -wiznet_6100_evb_picopicoprobe.build.pid=0x1029 +wiznet_6100_evb_picopicoprobe.build.pid=0x1046 wiznet_6100_evb_picopicoprobe.build.usb_manufacturer="WIZnet" wiznet_6100_evb_picopicoprobe.build.usb_product="W6100-EVB-Pico (Picoprobe)" wiznet_6100_evb_picopicoprobe.menu.flash.2097152_0=2MB (no FS) @@ -17144,7 +17144,7 @@ wiznet_6100_evb_picopicoprobe.menu.ipstack.ipv4ipv6.build.lwipdefs=-DLWIP_IPV6=1 wiznet_6100_evb_picopicodebug.name=WIZnet W6100-EVB-Pico (pico-debug) wiznet_6100_evb_picopicodebug.vid.0=0x1209 wiznet_6100_evb_picopicodebug.pid.0=0x2488 -wiznet_6100_evb_picopicodebug.build.usbpid=-DSERIALUSB_PID=0x1029 +wiznet_6100_evb_picopicodebug.build.usbpid=-DSERIALUSB_PID=0x1046 wiznet_6100_evb_picopicodebug.build.usbpwr=-DUSBD_MAX_POWER_MA=250 wiznet_6100_evb_picopicodebug.build.board=WIZNET_6100_EVB_PICO wiznet_6100_evb_picopicodebug.build.mcu=cortex-m0plus @@ -17163,7 +17163,7 @@ wiznet_6100_evb_picopicodebug.build.ldscript=memmap_default.ld wiznet_6100_evb_picopicodebug.build.ram_length=240k wiznet_6100_evb_picopicodebug.build.boot2=boot2_w25q080_2_padded_checksum wiznet_6100_evb_picopicodebug.build.vid=0x2e8a -wiznet_6100_evb_picopicodebug.build.pid=0x1029 +wiznet_6100_evb_picopicodebug.build.pid=0x1046 wiznet_6100_evb_picopicodebug.build.usb_manufacturer="WIZnet" wiznet_6100_evb_picopicodebug.build.usb_product="W6100-EVB-Pico (pico-debug)" wiznet_6100_evb_picopicodebug.menu.flash.2097152_0=2MB (no FS) diff --git a/tools/json/wiznet_6100_evb_pico.json b/tools/json/wiznet_6100_evb_pico.json index bc5bba434..18f3998c4 100644 --- a/tools/json/wiznet_6100_evb_pico.json +++ b/tools/json/wiznet_6100_evb_pico.json @@ -4,7 +4,7 @@ "earlephilhower": { "boot2_source": "boot2_w25q080_2_padded_checksum.S", "usb_vid": "0x2E8A", - "usb_pid": "0x1029" + "usb_pid": "0x1046" } }, "core": "earlephilhower", @@ -18,7 +18,7 @@ ], [ "0x2E8A", - "0x1029" + "0x1046" ] ], "mcu": "rp2040", diff --git a/tools/makeboards.py b/tools/makeboards.py index 81fda83e8..6f4f2349e 100755 --- a/tools/makeboards.py +++ b/tools/makeboards.py @@ -339,7 +339,7 @@ def MakeBoardJSON(name, vendor_name, product_name, vid, pid, pwr, boarddefine, f MakeBoard("wiznet_5100s_evb_pico", "WIZnet", "W5100S-EVB-Pico", "0x2e8a", "0x1027", 250, "WIZNET_5100S_EVB_PICO", 2, "boot2_w25q080_2_padded_checksum") MakeBoard("wiznet_wizfi360_evb_pico", "WIZnet", "WizFi360-EVB-Pico", "0x2e8a", "0x1028", 250, "WIZNET_WIZFI360_EVB_PICO", 2, "boot2_w25q080_2_padded_checksum") MakeBoard("wiznet_5500_evb_pico", "WIZnet", "W5500-EVB-Pico", "0x2e8a", "0x1029", 250, "WIZNET_5500_EVB_PICO", 2, "boot2_w25q080_2_padded_checksum") -MakeBoard("wiznet_6100_evb_pico", "WIZnet", "W6100-EVB-Pico", "0x2e8a", "0x1029", 250, "WIZNET_6100_EVB_PICO", 2, "boot2_w25q080_2_padded_checksum") +MakeBoard("wiznet_6100_evb_pico", "WIZnet", "W6100-EVB-Pico", "0x2e8a", "0x1046", 250, "WIZNET_6100_EVB_PICO", 2, "boot2_w25q080_2_padded_checksum") # Generic MakeBoard("generic", "Generic", "RP2040", "0x2e8a", "0xf00a", 250, "GENERIC_RP2040", 16, "boot2_generic_03h_4_padded_checksum")