Improve Winbond naming and correct board settings

adafruit · Mar 23, 2021 · 36edc4b · 36edc4b
1 parent 67c039d
commit 36edc4b
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 10 deletions.
diff --git a/data/nvm.toml b/data/nvm.toml
diff --git a/ports/raspberrypi/boards/adafruit_itsybitsy_rp2040/mpconfigboard.mk b/ports/raspberrypi/boards/adafruit_itsybitsy_rp2040/mpconfigboard.mk
@@ -6,4 +6,4 @@ USB_MANUFACTURER = "Adafruit"
 CHIP_VARIANT = RP2040
 CHIP_FAMILY = rp2
 
-EXTERNAL_FLASH_DEVICES = "W25Q64JV_IQ"
+EXTERNAL_FLASH_DEVICES = "W25Q64JVxQ"
diff --git a/ports/raspberrypi/boards/adafruit_qtpy_rp2040/mpconfigboard.mk b/ports/raspberrypi/boards/adafruit_qtpy_rp2040/mpconfigboard.mk
@@ -6,4 +6,4 @@ USB_MANUFACTURER = "Adafruit"
 CHIP_VARIANT = RP2040
 CHIP_FAMILY = rp2
 
-EXTERNAL_FLASH_DEVICES = "W25Q64JV_IQ"
+EXTERNAL_FLASH_DEVICES = "W25Q64JVxQ"
diff --git a/ports/raspberrypi/boards/pimoroni_keybow2040/mpconfigboard.mk b/ports/raspberrypi/boards/pimoroni_keybow2040/mpconfigboard.mk
@@ -6,6 +6,6 @@ USB_MANUFACTURER = "Pimoroni"
 CHIP_VARIANT = RP2040
 CHIP_FAMILY = rp2
 
-EXTERNAL_FLASH_DEVICES = "W25Q16JV_IQ"
+EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ"
 
 CIRCUITPY__EVE = 1
diff --git a/ports/raspberrypi/boards/pimoroni_picosystem/mpconfigboard.mk b/ports/raspberrypi/boards/pimoroni_picosystem/mpconfigboard.mk
@@ -6,6 +6,6 @@ USB_MANUFACTURER = "Pimoroni"
 CHIP_VARIANT = RP2040
 CHIP_FAMILY = rp2
 
-EXTERNAL_FLASH_DEVICES = "W25Q128JV_IQ"
+EXTERNAL_FLASH_DEVICES = "W25Q128JVxQ"
 
 CIRCUITPY__EVE = 1
diff --git a/ports/raspberrypi/boards/pimoroni_tiny2040/mpconfigboard.mk b/ports/raspberrypi/boards/pimoroni_tiny2040/mpconfigboard.mk
@@ -6,6 +6,6 @@ USB_MANUFACTURER = "Pimoroni"
 CHIP_VARIANT = RP2040
 CHIP_FAMILY = rp2
 
-EXTERNAL_FLASH_DEVICES = "W25Q64JV_IQ"
+EXTERNAL_FLASH_DEVICES = "W25Q64JVxQ"
 
 CIRCUITPY__EVE = 1
diff --git a/ports/raspberrypi/boards/raspberry_pi_pico/mpconfigboard.mk b/ports/raspberrypi/boards/raspberry_pi_pico/mpconfigboard.mk
@@ -6,6 +6,6 @@ USB_MANUFACTURER = "Raspberry Pi"
 CHIP_VARIANT = RP2040
 CHIP_FAMILY = rp2
 
-EXTERNAL_FLASH_DEVICES = "W25Q16JV_IQ"
+EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ"
 
 CIRCUITPY__EVE = 1
diff --git a/ports/raspberrypi/boards/sparkfun_pro_micro_rp2040/mpconfigboard.mk b/ports/raspberrypi/boards/sparkfun_pro_micro_rp2040/mpconfigboard.mk
@@ -6,4 +6,4 @@ USB_MANUFACTURER = "SparkFun"
 CHIP_VARIANT = RP2040
 CHIP_FAMILY = rp2
 
-EXTERNAL_FLASH_DEVICES = "W25Q128JV_IM"
+EXTERNAL_FLASH_DEVICES = "W25Q128JVxM"
diff --git a/ports/raspberrypi/boards/sparkfun_thing_plus_rp2040/mpconfigboard.mk b/ports/raspberrypi/boards/sparkfun_thing_plus_rp2040/mpconfigboard.mk
@@ -6,4 +6,4 @@ USB_MANUFACTURER = "SparkFun"
 CHIP_VARIANT = RP2040
 CHIP_FAMILY = rp2
 
-EXTERNAL_FLASH_DEVICES = "W25Q128JV_IM"
+EXTERNAL_FLASH_DEVICES = "W25Q128JVxM"
diff --git a/ports/raspberrypi/gen_stage2.py b/ports/raspberrypi/gen_stage2.py
@@ -36,7 +36,7 @@ def all_match(nvms, key, default=None):
                 return None
         return shared_value
 
-    quad_enable_status_byte = all_match(flashes["nvm"], "quad_enable_status_byte", 0)
+    quad_enable_status_byte = all_match(flashes["nvm"], "quad_enable_status_byte", None)
     quad_enable_bit_mask = all_match(flashes["nvm"], "quad_enable_bit_mask")
     continuous_status_write = all_have(flashes["nvm"], "01_continuous_status_write")
     split_status_write = all_have(flashes["nvm"], "write_status_register_split")
+3 −3		flash/macronix/MX25R1635F.toml
+1 −0		flash/winbond/W25Q128JVxM.toml
+0 −0		flash/winbond/W25Q128JVxQ.toml
+0 −0		flash/winbond/W25Q16JVxM.toml
+0 −0		flash/winbond/W25Q16JVxQ.toml
+0 −0		flash/winbond/W25Q32JVxM.toml
+0 −0		flash/winbond/W25Q32JVxQ.toml
+0 −0		flash/winbond/W25Q64JVxM.toml
+0 −0		flash/winbond/W25Q64JVxQ.toml