Refactored SPI peripheral

fpga/zsbl/boot.c

@@ -135,45 +135,45 @@ int disk_read(BYTE * buf, LBA_t sector, UINT count) {
     /*   crc = crc16(crc, x); */
     /* } while (--n > 0); */
 
-    /* n = 512/8; */
-    /* do { */
-    /*   // Send 8 dummy bytes (fifo should be empty) */
-    /*   for (j = 0; j < 8; j++) { */
-    /*     spi_sendbyte(0xff); */
-    /*   } */
+    n = 512/8;
+    do {
+      // Send 8 dummy bytes (fifo should be empty)
+      for (j = 0; j < 8; j++) {
+        spi_sendbyte(0xff);
+      }
 
-    /*   // Reset counter. Process bytes AS THEY COME IN. */
-    /*   for (j = 0; j < 8; j++) { */
-    /*     while (!(read_reg(SPI_IP) & 2)) {} */
-    /*     uint8_t x = spi_readbyte(); */
-    /*     *p++ = x; */
-    /*     // crc = crc16(crc, x); */
-    /*     crc = ((crc << 8) ^ crctable[x ^ (crc >> 8)]) & 0xffff; */
-    /*   } */
-    /* } while(--n > 0); */
+      // Reset counter. Process bytes AS THEY COME IN.
+      for (j = 0; j < 8; j++) {
+        while (!(read_reg(SPI_IP) & 2)) {}
+        uint8_t x = spi_readbyte();
+        *p++ = x;
+        // crc = crc16(crc, x);
+        crc = ((crc << 8) ^ crctable[x ^ (crc >> 8)]) & 0xffff;
+      }
+    } while(--n > 0);
 
-    n = 512;
-    // Initially fill the transmit fifo
-    for (j = 0; j < 8; j++) {
-      spi_sendbyte(0xff);
-    }
+    /* n = 512; */
+    /* // Initially fill the transmit fifo */
+    /* for (j = 0; j < 8; j++) { */
+    /*   spi_sendbyte(0xff); */
+    /* } */
 
 
-    while (n > 0) {
-      // Wait for bytes to be received
-      while (!(read_reg(SPI_IP) & 2)) {}
-      // Read byte
-      uint8_t x = spi_readbyte();
-      // Send another dummy byte
-      if (n > 8) {
-        spi_sendbyte(0xff);
-      }
-      // Place received byte into memory
-      *p++ = x;
-      // Update CRC16 with fast table based method
-      crc = ((crc << 8) ^ crctable[x ^ (crc >> 8)]) & 0xffff;
-      n = n - 1;
-    }
+    /* while (n > 0) { */
+    /*   // Wait for bytes to be received */
+    /*   while (!(read_reg(SPI_IP) & 2)) {} */
+    /*   // Read byte */
+    /*   uint8_t x = spi_readbyte(); */
+    /*   // Send another dummy byte */
+    /*   if (n > 8) { */
+    /*     spi_sendbyte(0xff); */
+    /*   } */
+    /*   // Place received byte into memory */
+    /*   *p++ = x; */
+    /*   // Update CRC16 with fast table based method */
+    /*   crc = ((crc << 8) ^ crctable[x ^ (crc >> 8)]) & 0xffff; */
+    /*   n = n - 1; */
+    /* } */
 
     // Read CRC16 and check
     crc_exp = ((uint16_t)spi_dummy() << 8);

linux/sdcard/flash-sd.sh

@@ -1,4 +1,30 @@
 #!/bin/bash
+###########################################
+## flash-sd.sh
+##
+## Written: Jacob Pease [email protected]
+## Created: August 22, 2023
+##
+## Purpose: A script to flash an sd card with a bootable linux image.
+##
+## A component of the CORE-V-WALLY configurable RISC-V project.
+## https://github.com/openhwgroup/cvw
+##
+## Copyright (C) 2021-24 Harvey Mudd College & Oklahoma State University
+##
+## SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1
+##
+## Licensed under the Solderpad Hardware License v 2.1 (the “License”); you may not use this file
+## except in compliance with the License, or, at your option, the Apache License version 2.0. You
+## may obtain a copy of the License at
+##
+## https:##solderpad.org/licenses/SHL-2.1/
+##
+## Unless required by applicable law or agreed to in writing, any work distributed under the
+## License is distributed on an “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+## either express or implied. See the License for the specific language governing permissions
+## and limitations under the License.
+################################################################################################
 
 # Exit on any error (return code != 0)
 # set -e

linux/sdcard/write-bytes.sh

@@ -0,0 +1,80 @@
+#!/bin/bash
+###########################################
+## write-bytes.sh
+##
+## Written: Jacob Pease [email protected]
+## Created: November 2nd, 2024
+## Modified: 
+##
+## Purpose: Write a sequence of bytes from text file to an output file and a flash card.
+##
+## A component of the CORE-V-WALLY configurable RISC-V project.
+## https://github.com/openhwgroup/cvw
+##
+## Copyright (C) 2021-24 Harvey Mudd College & Oklahoma State University
+##
+## SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1
+##
+## Licensed under the Solderpad Hardware License v 2.1 (the “License”); you may not use this file
+## except in compliance with the License, or, at your option, the Apache License version 2.0. You
+## may obtain a copy of the License at
+##
+## https:##solderpad.org/licenses/SHL-2.1/
+##
+## Unless required by applicable law or agreed to in writing, any work distributed under the
+## License is distributed on an “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+## either express or implied. See the License for the specific language governing permissions
+## and limitations under the License.
+################################################################################################
+
+
+# This file writes a bunch of bytes to the flash card based on a text
+# file input with bytes written in hexadecimal.
+
+usage() { echo "Usage: $0 [-zh] [-b <path/to/buildroot>] <device>" 1>&2; exit 1; }
+
+help() {
+    echo "Usage: $0 [OPTIONS] <device>"
+    echo "  -i                          Input text file with hex bytes."
+    echo "  -b <path/to/buildroot>      Output binary file."
+    exit 0;
+}
+
+INPUTFILE=""
+OUTPUTFILE=""
+
+ARGS=()
+while [ $OPTIND -le "$#" ] ; do
+    if getopts "hi:o:" arg ; then
+        case "${arg}" in
+            h) help
+               ;;
+            i) INPUTFILE=${OPTARG}
+               ;;
+            o) OUTPUTFILE=${OPTARG}
+               ;;
+        esac
+    else
+        ARGS+=("${!OPTIND}")
+        ((OPTIND++))
+    fi
+done
+
+SDCARD=${ARGS[0]}
+
+if [ ! -e $INPUTFILE ] ; then
+    echo -e "Error: Input file $INPUTFILE does not exist."
+    exit 1
+fi
+
+if [ -e $OUTPUTFILE ] ; then
+    echo -e "Error: Output file $OUTPUTFILE already exists."
+    exit 1
+fi
+
+for word in $(cat "$INPUTFILE")
+do
+    echo -en "\x$word" >> $OUTPUTFILE
+done
+
+dd if=$OUTPUTFILE of="$SDCARD"