fixed BrunoLevy#90 (ST_NICCC demo was too large to fit in BRAM)

Author: BrunoLevy

Basic/FOMU/FOMU_VGA/vga.v

@@ -28,8 +28,8 @@ module vga (
    wire   pixel_clk;
 
 // Choose your video mode here:
-`define VGA_MODE_640x480
-//`define VGA_MODE_1024x768
+//`define VGA_MODE_640x480
+`define VGA_MODE_1024x768
 //`define VGA_MODE_1280x1024
 
 `ifdef VGA_MODE_640x480

FemtoRV/FIRMWARE/ASM_EXAMPLES/mandelbrot_terminal.S

@@ -87,8 +87,8 @@ exit_Z:
 
         li a0,13
 	call putchar
-        li a0,10
-	call putchar
+#        li a0,10
+# 	 call putchar
 
 	add s1,s1,1
 	add s3,s3,dy

FemtoRV/FIRMWARE/EXAMPLES/hello_LED.c

@@ -6,10 +6,12 @@
 int main() {
    MAX7219_tty_init(); // redirect printf() to led matrix scroller   
    for(;;) {
-   printf("Hello, RISC-V world \001 \002 \001 \002 ");
-//   printf("Hello, TelecomNancy ! \001 \002 Best school ! \001 \002 ");
+// printf("Hello, RISC-V world \001 \002 \001 \002 ");
+// printf("Hello, TelecomNancy ! \001 \002 Best school ! \001 \002 ");
 // printf("Hello FemtoRV friend !!! \001 \002 \001 \002 ");
 // printf("Hello, Hackaday \001 \002 Greetings from FemtoRV !!! ");
+// printf("Hello, RISC-V world \001 \002 \001 \002 ");
+   printf("Hello, caf\202 LoOPS ! \001 \002 \001 \002 ");
    }
    return 0;
 }

FemtoRV/FIRMWARE/EXAMPLES/mandel_float.c

@@ -32,6 +32,7 @@ void mandel() {
    for(int Y=0; Y<H; ++Y) {
       float Cr = xmin;
       for(int X=0; X<W; ++X) {
+	 printf("%d %d\n",X,Y);
 	 float Zr = Cr;
 	 float Zi = Ci;
 	 int iter = 15;
@@ -54,6 +55,7 @@ void mandel() {
 }
 
 int main() {
+   printf("Mandel float");
    for(;;) {
       GL_init(GL_MODE_CHOOSE);
       GL_tty_init(FGA_mode);   

FemtoRV/RTL/CONFIGS/icestick_config.v

@@ -5,7 +5,7 @@
 `define NRV_IO_LEDS          // Mapped IO, LEDs D1,D2,D3,D4 (D5 is used to display errors)
 `define NRV_IO_IRDA          // In IO_LEDS, support for the IRDA on the IceStick (WIP)
 `define NRV_IO_UART          // Mapped IO, virtual UART (USB)
-//`define NRV_IO_SSD1351       // Mapped IO, 128x128x64K OLED screen
+`define NRV_IO_SSD1351       // Mapped IO, 128x128x64K OLED screen
 `define NRV_IO_MAX7219       // Mapped IO, 8x8 led matrix
 `define NRV_MAPPED_SPI_FLASH // SPI flash mapped in address space. Can be used to run code from SPI flash.
 

FemtoRV/TUTORIALS/FROM_BLINKER_TO_RISCV/BOARDS/run_icestick_show.sh

@@ -0,0 +1,9 @@
+PROJECTNAME=SOC
+BOARD=icestick
+BOARD_FREQ=12
+CPU_FREQ=45
+FPGA_VARIANT=hx1k
+FPGA_PACKAGE=tq144
+VERILOGS=$1
+yosys -q -DICE_STICK -DBOARD_FREQ=$BOARD_FREQ -DCPU_FREQ=$CPU_FREQ -p "synth_ice40 -relut -top $PROJECTNAME -json $PROJECTNAME.json" $VERILOGS  || exit
+nextpnr-ice40 --gui --force --timing-allow-fail --json $PROJECTNAME.json --pcf BOARDS/$BOARD.pcf --asc $PROJECTNAME.asc --freq $CPU_FREQ --$FPGA_VARIANT --package $FPGA_PACKAGE --pcf-allow-unconstrained --opt-timing || exit

FemtoRV/TUTORIALS/FROM_BLINKER_TO_RISCV/FIRMWARE/ST_NICCC.c

@@ -20,17 +20,27 @@
 #ifdef __linux__
 #include <stdlib.h>
 #include <unistd.h>
+#else
+#include "io.h"
 #endif
 
-
+// when compiling for SPI flash, uncomment to fit some routines in fast BRAM
+// (but it does not change much, the bottleneck is ANSI RGB encoding and uart.
 //#define RV32_FASTCODE __attribute((section(".fastcode")))
 #define RV32_FASTCODE
 
+// when compiling for SPI flash, uncomment to enable wireframe mode (but it is ugly
+// and it will not fit in BRAM !)
+// #define WITH_WIREFRAME 
+
+#ifdef WITH_WIREFRAME
 int wireframe = 0;
+#endif
 
 #define MIN(x,y) ((x) < (y) ? (x) : (y))
 #define MAX(x,y) ((x) > (y) ? (x) : (y))
 
+
 /**********************************************************************************/
 /* Graphics routines                                                              */
 /**********************************************************************************/
@@ -46,13 +56,11 @@ static inline uint8_t map_y(uint8_t y) {
     return y >> 2;
 }
 
-
 void GL_clear() {
     printf("\033[48;5;16m"   // set background color black
            "\033[2J");       // clear screen
 }
 
-
 /* 
  * Set background color using 6x6x6 colorcube codes
  * see https://stackoverflow.com/questions/4842424/list-of-ansi-color-escape-sequences
@@ -69,6 +77,7 @@ static inline void GL_setpixel(int x, int y) {
    printf("\033[%d;%dH ",y,x); // Goto_XY(x1,y) and print space
 }
 
+#ifdef WITH_WIREFRAME
 void GL_line(int x1, int y1, int x2, int y2) RV32_FASTCODE;
 void GL_line(int x1, int y1, int x2, int y2) {
     int x,y,dx,dy,sy,tmp;
@@ -83,7 +92,7 @@ void GL_line(int x1, int y1, int x2, int y2) {
        y1 = tmp;
     }
 
-    /* Bresenham line drawing. */
+    // Bresenham line drawing.
     dy = y2 - y1;
     sy = 1;
     if(dy < 0) {
@@ -127,6 +136,7 @@ void GL_line(int x1, int y1, int x2, int y2) {
 	}
     }
 }
+#endif
 
 void GL_fillpoly(int nb_pts, int* points) RV32_FASTCODE;
 void GL_fillpoly(int nb_pts, int* points) {
@@ -163,12 +173,14 @@ void GL_fillpoly(int nb_pts, int* points) {
 	int x2 = points[2*i2];
 	int y2 = points[2*i2+1];
 
+#ifdef WITH_WIREFRAME
         if(wireframe) {
 	   if((clockwise > 0) ^ (y2 > y1)) {
 	      GL_line(x1,y1,x2,y2);
 	   }
 	    continue;
 	}
+#endif
 
 	char* x_buffer = ((clockwise > 0) ^ (y2 > y1)) ? x_left : x_right;
 	int dx = x2 - x1;
@@ -208,7 +220,10 @@ void GL_fillpoly(int nb_pts, int* points) {
 	}
     }
 
-    if(!wireframe) {
+#ifdef WITH_WIREFRAME    
+    if(!wireframe) 
+#endif    
+    {
 	for(int y = miny; y <= maxy; ++y) {
 	    int x1 = x_left[y];
 	    int x2 = x_right[y];
@@ -431,18 +446,35 @@ int read_frame() {
 
 int main() {
     // printf("\x1B[?25l"); // hide cursor
-    wireframe = 0;
+
+#ifndef __linux__   
+    IO_OUT(IO_LEDS,15);
+#endif
+    printf("starting\n");
+
+#ifdef WITH_WIREFRAME    
+     wireframe = 0;
+#endif     
+    int frame = 0;
     GL_clear();
     for(;;) {
         spi_reset();
+        frame = 0;
 	while(read_frame()) {
+#ifdef WITH_WIREFRAME    
 	   if(wireframe) {
 	      GL_clear();
 	   }
+#endif
 #ifdef __linux__       
         usleep(20000);
-#endif       
+#else
+        IO_OUT(IO_LEDS,frame);
+#endif	   
+        ++frame;
 	}
+#ifdef WITH_WIREFRAME    
         wireframe = !wireframe;
+#endif        
     }
 }

FemtoRV/TUTORIALS/FROM_BLINKER_TO_RISCV/emitter_uart.v

@@ -1,7 +1,7 @@
 module corescore_emitter_uart
   #(
     parameter clk_freq_hz = 0,
-    parameter baud_rate = 57600)
+    parameter baud_rate = 1000000)
   (
    input wire 	    i_clk,
    input wire 	    i_rst,

FemtoRV/TUTORIALS/FROM_BLINKER_TO_RISCV/pipelineZ.v

@@ -12,7 +12,7 @@
 
 `define CONFIG_RV32M      // RV32M instruction set (MUL,DIV,REM)
 
-`define CONFIG_DEBUG      // debug mode, displays execution
+//`define CONFIG_DEBUG      // debug mode, displays execution
                             // See "debugger" section in source 
                             // to define breakpoints
 

FemtoRV/TUTORIALS/FROM_BLINKER_TO_RISCV/terminal.sh

@@ -1,6 +1,7 @@
 DEVICE=/dev/ttyUSB1   # replace by the terminal used by your device
 BAUDS=1000000
 
+
 # MINITERM  exit: <ctrl> ]     package: sudo apt-get install python3-serial
 #miniterm --dtr=0 $DEVICE $BAUDS