switch to RV32E

README.md

@@ -26,11 +26,11 @@ Architecture
 
 SW toolchain build procedure
 --------------------------
-1. Download, configure, build and install RISC-V toolchain with Newlib + multilib support:
+1. Download, configure, build and install RISC-V toolchain with Newlib + RV32EMC support:
 ~~~~
 git clone --recursive https://github.com/riscv/riscv-gnu-toolchain
 cd riscv-gnu-toolchain
-./configure --prefix=/opt/riscv --enable-multilib
+./configure --prefix=/opt/riscv --with-arch=rv32emc --with-abi=ilp32e
 sudo make    # sudo needed if installing under default /opt/riscv location
 ~~~~
 2. Compile custom binary to IHEX converter:

ossc.qsf

@@ -224,7 +224,7 @@ set_global_assignment -name ENABLE_SIGNALTAP OFF
 set_global_assignment -name USE_SIGNALTAP_FILE output_files/ossc_la.stp
 
 set_global_assignment -name FITTER_EFFORT "AUTO FIT"
-set_global_assignment -name SEED 15
+set_global_assignment -name SEED 16
 
 
 

software/ossc_sw.project

@@ -136,7 +136,7 @@
       <CustomBuild Enabled="yes">
         <Target Name="compile_image_debug">make APP_CFLAGS_DEBUG_LEVEL="-DDEBUG" generate_hex</Target>
         <Target Name="compile_image_aud-debug">make ENABLE_AUDIO=y APP_CFLAGS_DEBUG_LEVEL="-DDEBUG" generate_hex</Target>
-        <Target Name="Ack BSP update">cd ../sys_controller_bsp &amp;&amp; touch public.mk Makefile</Target>
+        <Target Name="Ack BSP update">cd ../sys_controller_bsp &amp;&amp; touch bsp_timestamp</Target>
         <RebuildCommand/>
         <CleanCommand>make clean</CleanCommand>
         <BuildCommand>make APP_CFLAGS_DEBUG_LEVEL="-DDEBUG"</BuildCommand>
@@ -182,7 +182,7 @@
         <Target Name="compile_image">make generate_hex</Target>
         <Target Name="Build_jp">make OSDLANG=JP</Target>
         <Target Name="Build_audio">make ENABLE_AUDIO=y</Target>
-        <Target Name="Ack BSP update">cd ../sys_controller_bsp &amp;&amp; touch public.mk Makefile</Target>
+        <Target Name="Ack BSP update">cd ../sys_controller_bsp &amp;&amp; touch bsp_timestamp</Target>
         <RebuildCommand/>
         <CleanCommand>make clean</CleanCommand>
         <BuildCommand>make</BuildCommand>

software/sys_controller/Makefile

@@ -169,7 +169,7 @@ C_SRCS += ossc/utils.c
 C_SRCS += ulibSD/sd_io.c
 C_SRCS += ulibSD/spi_io.c
 CXX_SRCS :=
-ASM_SRCS := crt0.boot.S
+ASM_SRCS := crt0.boot_E.S
 
 
 # Path to root of object file tree.
@@ -652,11 +652,11 @@ build_post_process :
 # included makefile fragment.
 #
 ifeq ($(DEFAULT_CROSS_COMPILE),)
-DEFAULT_CROSS_COMPILE := riscv64-unknown-elf-
+DEFAULT_CROSS_COMPILE := riscv32-unknown-elf-
 endif
 
 ifeq ($(DEFAULT_STACKREPORT),)
-DEFAULT_STACKREPORT := riscv64-unknown-elf-size
+DEFAULT_STACKREPORT := riscv32-unknown-elf-size
 endif
 
 ifeq ($(DEFAULT_DOWNLOAD),)
@@ -755,7 +755,7 @@ ifeq ($(MKDIR),)
 MKDIR := $(DEFAULT_MKDIR)
 endif
 
-RV_OBJCOPY = riscv64-unknown-elf-objcopy
+RV_OBJCOPY = riscv32-unknown-elf-objcopy
 
 #------------------------------------------------------------------------------
 #                     PATTERN RULES TO BUILD OBJECTS

software/sys_controller/crt0.boot_E.S

@@ -0,0 +1,87 @@
+// Copyright 2017 ETH Zurich and University of Bologna.
+// Copyright and related rights are licensed under the Solderpad Hardware
+// License, Version 0.51 (the “License”); you may not use this file except in
+// compliance with the License.  You may obtain a copy of the License at
+// http://solderpad.org/licenses/SHL-0.51. Unless required by applicable law
+// or agreed to in writing, software, hardware and materials distributed under
+// this 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.
+
+#include "pulpino.h"
+
+#define EXCEPTION_STACK_SIZE 72
+
+
+/* ========================================================= [ entry ] === */
+  .section .text
+
+default_exc_handler:
+  jal x0, default_exc_handler
+
+reset_handler:
+  /* set all registers to zero */
+  mv  x1, x0
+  mv  x2, x1
+  mv  x3, x1
+  mv  x4, x1
+  mv  x5, x1
+  mv  x6, x1
+  mv  x7, x1
+  mv  x8, x1
+  mv  x9, x1
+  mv x10, x1
+  mv x11, x1
+  mv x12, x1
+  mv x13, x1
+  mv x14, x1
+  mv x15, x1
+
+  /* stack initilization */
+  la   x2, _stack_start
+
+_start:
+  .global _start
+
+  /* clear BSS */
+  la x14, _bss_start
+  la x15, _bss_end
+
+  bge x14, x15, zero_loop_end
+
+zero_loop:
+  sw x0, 0(x14)
+  addi x14, x14, 4
+  ble x14, x15, zero_loop
+zero_loop_end:
+
+
+main_entry:
+  /* jump to alt_main program entry point */
+  jal alt_main
+
+/* =================================================== [ exceptions ] === */
+/* This section has to be down here, since we have to disable rvc for it  */
+
+  .section .vectors, "ax"
+  .option norvc;
+
+  // external interrupts are handled by the same callback
+  // until compiler supports IRQ routines
+  .org 0x00
+  .rept 31
+  nop
+  .endr
+  jal x0, default_exc_handler
+
+  // reset vector
+  .org 0x80
+  jal x0, reset_handler
+
+  // illegal instruction exception
+  .org 0x84
+  jal x0, default_exc_handler
+
+  // ecall handler
+  .org 0x88
+  jal x0, default_exc_handler

software/sys_controller_bsp/Makefile

@@ -112,10 +112,10 @@ SOPC_FILE := ../../sys.sopcinfo
 #-------------------------------------------------------------------------------
 
 # Archiver command. Creates library files. 
-AR = riscv64-unknown-elf-ar
+AR = riscv32-unknown-elf-ar
 
 # Assembler command. Note that CC is used for .S files. 
-AS = riscv64-unknown-elf-gcc
+AS = riscv32-unknown-elf-gcc
 
 # Custom flags only passed to the archiver. This content of this variable is 
 # directly passed to the archiver rather than the more standard "ARFLAGS". The 
@@ -139,10 +139,10 @@ BSP_CFLAGS_OPTIMIZATION = -Os
 BSP_CFLAGS_WARNINGS = -Wall
 
 # C compiler command. 
-CC = riscv64-unknown-elf-gcc -xc
+CC = riscv32-unknown-elf-gcc -xc
 
 # C++ compiler command. 
-CXX = riscv64-unknown-elf-gcc -xc++
+CXX = riscv32-unknown-elf-gcc -xc++
 
 # Command used to remove files during 'clean' target. 
 RM = rm -f

software/sys_controller_bsp/public.mk

@@ -259,7 +259,7 @@ ALT_CPPFLAGS += -DSMALL_C_LIB
 # or common. none 
 # setting hal.make.cflags_mgpopt is -mgpopt=global
 #ALT_CFLAGS += -mgpopt=global
-ALT_CFLAGS += -march=rv32imc -mabi=ilp32
+ALT_CFLAGS += -march=rv32emc -mabi=ilp32e
 
 # Enable BSP generation to query if SOPC system is big endian. If true ignores 
 # export of 'ALT_CFLAGS += -meb' to public.mk if big endian system. none 

sys.qsys

@@ -725,7 +725,7 @@
   <parameter name="AXI_USER_WIDTH" value="0" />
   <parameter name="RISCY_RV32F" value="false" />
   <parameter name="USE_ZERO_RISCY" value="true" />
-  <parameter name="ZERO_RV32E" value="false" />
+  <parameter name="ZERO_RV32E" value="true" />
   <parameter name="ZERO_RV32M" value="true" />
  </module>
  <module name="timer_0" kind="altera_avalon_timer" version="17.1" enabled="1">

sys.sopcinfo

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EnsembleReport name="sys" kind="sys" version="1.0" fabric="QSYS">
  <!-- Format version 17.1 590 (Future versions may contain additional information.) -->
- <!-- 2018.10.10.22:28:26 -->
+ <!-- 2018.10.29.20:53:41 -->
  <!-- A collection of modules and connections -->
  <parameter name="AUTO_GENERATION_ID">
   <type>java.lang.Integer</type>
-  <value>1539199706</value>
+  <value>1540839221</value>
   <derived>false</derived>
   <enabled>true</enabled>
   <visible>false</visible>
@@ -12922,7 +12922,7 @@ the requested settings for a module instance. -->
   </parameter>
   <parameter name="ZERO_RV32E">
    <type>boolean</type>
-   <value>false</value>
+   <value>true</value>
    <derived>false</derived>
    <enabled>true</enabled>
    <visible>true</visible>