Added test of SPI interface.

Author: skiphansen

fpga/panologic_g2/fpga.ucf

@@ -66,7 +66,11 @@ NET "uart_rxd_o"  LOC="AB19" | IOSTANDARD=LVTTL;        # AKA DDC2_SDA
 # Ethernet PHY
 NET "GMII_RST_N" LOC = R11 | IOSTANDARD = LVCMOS33;
 
-#NET "led_red"               LOC = E12 | IOSTANDARD = LVCMOS33;
+# Pano Button LED Output, Active High
+NET "led_red"               LOC = E12 | IOSTANDARD = LVCMOS33;
 NET "led_blue"              LOC = H13 | IOSTANDARD = LVCMOS33;
-#NET "led_green"             LOC = F13 | IOSTANDARD = LVCMOS33;
+NET "led_green"             LOC = F13 | IOSTANDARD = LVCMOS33;
+
+# Pano Button Input, Active Low
+NET "pano_button"           LOC = H12 | IOSTANDARD = LVCMOS33;
 

fpga/panologic_g2/top.v

@@ -4,8 +4,11 @@
 module top
 (
      input           SYSCLK
+    ,inout           pano_button
     ,output          GMII_RST_N
-    ,output          led_blue
+    ,output          led_red
+    ,inout           led_green
+    ,inout           led_blue
 
     // UART
     ,input           uart_txd_i
@@ -16,15 +19,8 @@ module top
     ,output          flash_cs_o
     ,output          flash_si_o
     ,input           flash_so_i
-
-    // GPIO Headers
-    ,inout  [11:0]   porta
-    ,inout  [11:0]   portb
 );
 
-wire [11:0]   porta;
-wire [11:0]   portb;
-
 // Generate 32 Mhz system clock from 125 Mhz input clock
 wire clk32_i;
 
@@ -105,7 +101,7 @@ fpga_top
     .CLK_FREQ(32000000)
    ,.BAUDRATE(1000000)   // SoC UART baud rate
    ,.UART_SPEED(1000000) // Debug bridge UART baud (should match BAUDRATE)
-   ,.C_SCK_RATIO(50)     // SPI clock divider (SPI_CLK=CLK_FREQ/C_SCK_RATIO)
+   ,.C_SCK_RATIO(1)      // SPI clock divider (SPI_CLK=CLK_FREQ/C_SCK_RATIO)
 `ifdef CPU_SELECT_ARMV6M
    ,.CPU("armv6m")       // riscv or armv6m
 `else
@@ -142,25 +138,32 @@ assign flash_cs_o  = spi_cs_w[0];
 assign spi_so_w    = flash_so_i;
 
 //-----------------------------------------------------------------
-// GPIO (Port A=gpio[11:0],...,Port B=gpio[27:16])
+// GPIO bits
+// 0: reserved for CPU reset (?)
+// 1: Pano button
+// 2: Output only - red LED
+// 3: In/out - green LED
+// 4: In/out - blue LED
+// 5...31: Not implmented
 //-----------------------------------------------------------------
-genvar i;
-generate
-for (i=0; i < 12; i=i+1)
-begin
-    assign porta[i]        = gpio_out_en_w[0+i]  ? gpio_out_w[0+i]  : 1'bz;
-    assign portb[i]        = gpio_out_en_w[16+i] ? gpio_out_w[16+i] : 1'bz;
 
-    assign gpio_in_w[0+i]  = porta[i];
-    assign gpio_in_w[16+i] = portb[i];
-end
-endgenerate
+assign pano_button = gpio_out_en_w[1]  ? gpio_out_w[1]  : 1'bz;
+assign gpio_in_w[1]  = pano_button;
+
+assign led_red = gpio_out_w[2];
+assign gpio_in_w[2]  = led_red;
+
+assign led_green = gpio_out_en_w[3]  ? gpio_out_w[3]  : 1'bz;
+assign gpio_in_w[3]  = led_green;
 
+assign led_blue = gpio_out_en_w[4]  ? gpio_out_w[4]  : 1'bz;
+assign gpio_in_w[4]  = led_blue;
+
+genvar i;
 generate
-for (i=12; i < 16; i=i+1)
+for (i=5; i < 31; i=i+1)
 begin
-    assign gpio_in_w[0+i]  = 1'b0;
-    assign gpio_in_w[16+i] = 1'b0;
+    assign gpio_in_w[i]  = 1'b0;
 end
 endgenerate
 
@@ -180,8 +183,6 @@ else
 // 'OR' two UARTs together
 assign uart_rxd_o  = txd_q;
 
-assign led_blue = uart_rxd_o;
-
 // ODDR2 debug_buf (
 //     .D0(1'b1),
 //     .D1(1'b0),

src_c/arch/riscv/init.c

@@ -7,6 +7,10 @@
 #include "irq_ctrl.h"
 #endif
 
+#ifdef CONFIG_SPILITE
+#include "spi_lite.h"
+#endif
+
 #ifdef CONFIG_MALLOC
 #include "malloc.h"
 #endif
@@ -20,12 +24,18 @@ static uint8_t _heap[CONFIG_MALLOC_SIZE];
 //-----------------------------------------------------------------
 void init(void)
 {
+#ifdef CONFIG_UARTLITE
     // Setup serial port
     uartlite_init(CONFIG_UARTLITE_BASE);
+#endif
 
     // Register serial driver with printf
     printf_register(uartlite_putc);
 
+#ifdef CONFIG_SPILITE
+    spi_init(CONFIG_SPILITE_BASE);
+#endif
+
 #ifdef CONFIG_MALLOC
     malloc_init(_heap, CONFIG_MALLOC_SIZE, 0, 0);
 #endif

src_c/main.c

@@ -2,18 +2,89 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
+#include "spi_lite.h"
 #include "printf.h"
 
+void LogHex(void *Data,int Len);
+
 //-----------------------------------------------------------------
 // main
 //-----------------------------------------------------------------
 int main(int argc, char *argv[])
 {
     int i;
+    unsigned char Buf[256];
+    int Id = 0;
     for(i = 0; i < 8; i++) {
        printf("helloworld!\n");
     }
 
+    printf("Spi read test\n");
+    memset(Buf,0x55,sizeof(Buf));
+    spi_cs(0);
+// read SPI flash device id
+    spi_sendrecv(0x9f);
+// Read and toss first byte which was received while the command was
+// being shifted out
+    spi_readblock(Buf,1);
+    spi_readblock(Buf,3);
+    spi_cs(1);
+    printf("SPI flash JEDEC device ID:");
+    for(i = 0; i < 3; i++) {
+       Id <<= 8;
+       Id += Buf[i];
+       printf(" 0x%02x",Buf[i]);
+    }
+    printf("\n");
+
+    switch(Id) {
+       case 0x202018:
+          printf("M25P128 SPI flash confirmed\n");
+          break;
+
+       case 0x202014:
+          printf("M25P80 SPI flash confirmed\n");
+          break;
+
+       default:
+          printf("Unknown JEDEC ID\n");
+          break;
+    }
+
+    printf("\nReading first 256 bytes of flash...");
+    spi_cs(0);
+    spi_sendrecv(0x03);
+    spi_sendrecv(0);
+    spi_sendrecv(0);
+    spi_sendrecv(0);
+    spi_readblock(Buf,1);
+    spi_readblock(Buf,sizeof(Buf));
+    spi_cs(1);
+
+    printf("\n");
+    LogHex(Buf,sizeof(Buf));
+
     return 0;
 }
+
+void LogHex(void *Data,int Len)
+{
+   int i;
+   uint8_t *cp = (uint8_t *) Data;
+
+   for(i = 0; i < Len; i++) {
+      if(i != 0 && (i & 0xf) == 0) {
+         printf("\n");
+      }
+      else if(i != 0) {
+         printf(" ");
+      }
+      printf("%02x",cp[i]);
+   }
+   if(((i - 1) & 0xf) != 0) {
+      printf("\n");
+   }
+}
+

src_c/makefile

@@ -4,20 +4,26 @@ PLATFORM     = machine-fpga
 
 EXTRA_CFLAGS+= -DCPU_KHZ=50000
 
+# UART driver
+EXTRA_CFLAGS += -DCONFIG_UARTLITE
+EXTRA_CFLAGS += -DCONFIG_UARTLITE_BASE=0x92000000
+
+# SPI driver
+EXTRA_CFLAGS += -DCONFIG_SPILITE
+EXTRA_CFLAGS += -DCONFIG_SPILITE_BASE=0x93000000
+
 SRC_DIR      = ./ 
 SRC_DIR     += ./include
 SRC_DIR     += ../soc/core_soc/src_c
 
-# UART driver
-EXTRA_CFLAGS += -DCONFIG_UARTLITE
-EXTRA_CFLAGS += -DCONFIG_UARTLITE_BASE=0x92000000
-SRC_DIR     += ./drivers/uart
 
 BASE_ADDRESS  = 0x0
 OPT           = 2
 
 TARGET_PORT ?= /dev/ttyUSB1
 RUN_PREFIX  := ../run.py -d $(TARGET_PORT) -b 1000000 -f 
 
+ENABLE_LST=yes
+
 MAKE_DIR=./make
 include $(MAKE_DIR)/makefile.exe