summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeffrey Bailey <wb.jeffrey@gmail.com>2020-08-20 22:08:12 (GMT)
committerDaniel Thompson <daniel@redfelineninja.org.uk>2020-09-27 13:26:29 (GMT)
commitf924bb64142fc0771c705971dd43452ec3778342 (patch)
tree482e8322dad5367b30fc5667bba33d8a5f21c78c
parent7075f5689eacbf586324495b1fda3cc1baf03173 (diff)
boards: Remove flash wake up commands
Wake from deep power down is now handled in the driver. Remove attempt to wake the board files. Signed-off-by: Jeffrey Bailey <wb.jeffrey@gmail.com> [daniel@redfelineninja.org.uk: Update commit message, simplify slightly, extended to all boards with spinor flash and update gitmodules to bring in the flash driver updates.] Signed-off-by: Daniel Thompson <daniel@redfelineninja.org.uk>
-rw-r--r--wasp/boards/k9/watch.py.in9
-rw-r--r--wasp/boards/p8/watch.py.in9
-rw-r--r--wasp/boards/pinetime/watch.py.in8
m---------wasp/drivers/flash0
4 files changed, 3 insertions, 23 deletions
diff --git a/wasp/boards/k9/watch.py.in b/wasp/boards/k9/watch.py.in
index da9d9a2..78dff3c 100644
--- a/wasp/boards/k9/watch.py.in
+++ b/wasp/boards/k9/watch.py.in
@@ -106,16 +106,9 @@ try:
boot_msg("Init motor")
vibrator = Vibrator(Pin('MOTOR', Pin.OUT, value=0), active_low=True)
- # Release flash from deep power-down
- boot_msg("Wake SPINOR")
- nor_cs = Pin('NOR_CS', Pin.OUT, value=1)
- nor_cs(0)
- spi.write('\xAB')
- nor_cs(1)
-
# Mount the filesystem
boot_msg("Init SPINOR")
- flash = FLASH(spi, (nor_cs,))
+ flash = FLASH(spi, (Pin('NOR_CS', Pin.OUT, value=1),))
try:
boot_msg("Mount FS")
os.mount(flash, '/flash')
diff --git a/wasp/boards/p8/watch.py.in b/wasp/boards/p8/watch.py.in
index 1e52ccb..358bfae 100644
--- a/wasp/boards/p8/watch.py.in
+++ b/wasp/boards/p8/watch.py.in
@@ -94,16 +94,9 @@ try:
_callback)
vibrator = Vibrator(Pin('MOTOR', Pin.OUT, value=0), active_low=True)
- # Release flash from deep power-down
- boot_msg("Wake SPINOR")
- nor_cs = Pin('NOR_CS', Pin.OUT, value=1)
- nor_cs(0)
- spi.write('\xAB')
- nor_cs(1)
-
# Mount the filesystem
boot_msg("Init SPINOR")
- flash = FLASH(spi, (nor_cs,))
+ flash = FLASH(spi, (Pin('NOR_CS', Pin.OUT, value=1),))
try:
boot_msg("Mount FS")
os.mount(flash, '/flash')
diff --git a/wasp/boards/pinetime/watch.py.in b/wasp/boards/pinetime/watch.py.in
index 2e8813f..f156779 100644
--- a/wasp/boards/pinetime/watch.py.in
+++ b/wasp/boards/pinetime/watch.py.in
@@ -96,15 +96,9 @@ try:
_callback)
vibrator = Vibrator(Pin('MOTOR', Pin.OUT, value=0), active_low=True)
- # Release flash from deep power-down
- boot_msg("Wake SPINOR")
- nor_cs = Pin('NOR_CS', Pin.OUT, value=1)
- nor_cs(0)
- spi.write('\xAB')
- nor_cs(1)
-
# Mount the filesystem
boot_msg("Init SPINOR")
+ nor_cs = Pin('NOR_CS', Pin.OUT, value=1)
flash = FLASH(spi, (nor_cs,))
try:
boot_msg("Mount FS")
diff --git a/wasp/drivers/flash b/wasp/drivers/flash
-Subproject 8105da265b5c1779a1a4e93392c348f58c149ca
+Subproject bc498ac0a8306e32327aa4e66d78c567856f3cf