diff --git a/software/sys_controller/Makefile b/software/sys_controller/Makefile
index 2865ed4..c0ee74d 100644
--- a/software/sys_controller/Makefile
+++ b/software/sys_controller/Makefile
@@ -17,7 +17,7 @@ ALT_LIBRARY_NAMES :=
 # List of library names for -msys-lib linker option (-msys-lib added when used).
 # These are libraries that might be located in the BSP and depend on the BSP
 # library, or vice versa
-ALT_BSP_DEP_LIBRARY_NAMES :=
+ALT_BSP_DEP_LIBRARY_NAMES := libhal_bsp.a
 
 # List of dependencies for the linker.  This is usually the full pathname
 # of each library (*.a) file.
@@ -168,7 +168,7 @@ C_SRCS += ossc/userdata.c
 C_SRCS += ulibSD/sd_io.c
 C_SRCS += ulibSD/spi_io.c
 CXX_SRCS :=
-ASM_SRCS :=
+ASM_SRCS := crt0.boot.S
 
 
 # Path to root of object file tree.
@@ -344,12 +344,12 @@ ifneq ($(AVOID_NIOS2_GCC3_OPTIONS),)
 # Detect if small newlib C library is requested.
 # If yes, remove the -msmallc option because it is
 # now handled by other means.
-ifneq ($(filter -msmallc,$(ALT_LDFLAGS)),)
-	ALT_LDFLAGS := $(filter-out -msmallc,$(ALT_LDFLAGS))
-	ALT_C_LIBRARY := smallc
-else
-	ALT_C_LIBRARY := c
-endif
+#ifneq ($(filter -msmallc,$(ALT_LDFLAGS)),)
+	#ALT_LDFLAGS := $(filter-out -msmallc,$(ALT_LDFLAGS))
+	#ALT_C_LIBRARY := smallc
+#else
+	#ALT_C_LIBRARY := c
+#endif
 
 # Put each BSP dependent library in a group to avoid circular dependencies.
 APP_BSP_DEP_LIBS := $(foreach l,$(ALT_BSP_DEP_LIBRARY_NAMES),-Wl,--start-group -l$(ALT_C_LIBRARY) -lgcc -l$(l) -Wl,--end-group)
@@ -359,7 +359,8 @@ else # !AVOID_NIOS2_GCC3_OPTIONS
 #
 # Use Nios II GCC 3.X options.
 #
-APP_BSP_DEP_LIBS := $(addprefix -msys-lib=, $(ALT_BSP_DEP_LIBRARY_NAMES))
+#APP_BSP_DEP_LIBS := $(addprefix -msys-lib=, $(ALT_BSP_DEP_LIBRARY_NAMES))
+APP_BSP_DEP_LIBS := $(addprefix -l:, $(ALT_BSP_DEP_LIBRARY_NAMES))
 
 endif # !AVOID_NIOS2_GCC3_OPTIONS
 
@@ -389,7 +390,7 @@ APP_ASFLAGS := $(APP_ASM_INC_DIRS) \
                $(ASFLAGS)
 
 # Arguments only for the linker.
-APP_LDFLAGS := $(APP_LDFLAGS_USER)
+APP_LDFLAGS := $(APP_LDFLAGS_USER) --specs=nano.specs -nostartfiles
 
 ifneq ($(LINKER_SCRIPT),)
 APP_LDFLAGS += -T'$(LINKER_SCRIPT)'
@@ -410,17 +411,16 @@ else # !AVOID_NIOS2_GCC3_OPTIONS
 
 # Use Nios II GCC 3.x options.
 ifneq ($(CRT0),)
-APP_LDFLAGS += -msys-crt0='$(CRT0)'
+#APP_LDFLAGS += -msys-crt0='$(CRT0)'
 endif
 ifneq ($(SYS_LIB),)
-APP_LDFLAGS += -msys-lib=$(SYS_LIB)
+#APP_LDFLAGS += -msys-lib=$(SYS_LIB)
 endif
 
 endif # !AVOID_NIOS2_GCC3_OPTIONS
 
 APP_LDFLAGS += \
            $(APP_LIB_DIRS) \
-           $(ALT_LDFLAGS) \
            $(LDFLAGS)
 
 LINKER_MAP_NAME := $(APP_NAME).map
@@ -651,23 +651,24 @@ build_post_process :
 # included makefile fragment.
 #
 ifeq ($(DEFAULT_CROSS_COMPILE),)
-DEFAULT_CROSS_COMPILE := nios2-elf-
+DEFAULT_CROSS_COMPILE := riscv64-unknown-elf-
 endif
 
 ifeq ($(DEFAULT_STACKREPORT),)
-DEFAULT_STACKREPORT := nios2-stackreport
+DEFAULT_STACKREPORT := riscv64-unknown-elf-size
 endif
 
 ifeq ($(DEFAULT_DOWNLOAD),)
-DEFAULT_DOWNLOAD := nios2-download
+DEFAULT_DOWNLOAD := anios2-download
 endif
 
 ifeq ($(DEFAULT_FLASHPROG),)
-DEFAULT_FLASHPROG := nios2-flash-programmer
+DEFAULT_FLASHPROG := anios2-flash-programmer
 endif
 
+DISABLE_ELFPATCH 		:= 1
 ifeq ($(DEFAULT_ELFPATCH),)
-DEFAULT_ELFPATCH := nios2-elf-insert
+DEFAULT_ELFPATCH := anios2-elf-insert
 endif
 
 ifeq ($(DEFAULT_RM),)
@@ -732,7 +733,7 @@ OBJCOPY := $(CROSS_COMPILE)objcopy
 endif
 
 ifeq ($(STACKREPORT),)
-STACKREPORT := $(DEFAULT_STACKREPORT) --prefix $(CROSS_COMPILE)
+STACKREPORT := $(DEFAULT_STACKREPORT)
 else
 DISABLE_STACKREPORT := 1
 endif
diff --git a/software/sys_controller/memory/flash.c b/software/sys_controller/memory/flash.c
index 455ecf7..df146f8 100644
--- a/software/sys_controller/memory/flash.c
+++ b/software/sys_controller/memory/flash.c
@@ -95,7 +95,7 @@ int verify_flash(alt_u32 offset, alt_u32 length, alt_u32 golden_crc, alt_u8 *tmp
         if (retval != 0)
             return retval;
 
-        crcval = crcCI(tmpbuf, bytes_to_read, (i==0));
+        //crcval = crcCI(tmpbuf, bytes_to_read, (i==0));
     }
 
     if (crcval != golden_crc)
diff --git a/software/sys_controller/ossc/firmware.c b/software/sys_controller/ossc/firmware.c
index 569522a..6f490f9 100644
--- a/software/sys_controller/ossc/firmware.c
+++ b/software/sys_controller/ossc/firmware.c
@@ -60,7 +60,7 @@ static int check_fw_header(alt_u8 *databuf, fw_hdr *hdr)
     if (hdr->hdr_len < 26 || hdr->hdr_len > 508)
         return FW_HDR_ERROR;
 
-    crcval = crcCI(databuf, hdr->hdr_len, 1);
+    //crcval = crcCI(databuf, hdr->hdr_len, 1);
 
     if (crcval != hdr->hdr_crc)
         return FW_HDR_CRC_ERROR;
@@ -81,7 +81,7 @@ static int check_fw_image(alt_u32 offset, alt_u32 size, alt_u32 golden_crc, alt_
         if (retval != SD_OK)
             return retval;
 
-        crcval = crcCI(tmpbuf, bytes_to_read, (i==0));
+        //crcval = crcCI(tmpbuf, bytes_to_read, (i==0));
     }
 
     if (crcval != golden_crc)
diff --git a/software/sys_controller_bsp/HAL/inc/io.h b/software/sys_controller_bsp/HAL/inc/io.h
index 912b286..8053c41 100644
--- a/software/sys_controller_bsp/HAL/inc/io.h
+++ b/software/sys_controller_bsp/HAL/inc/io.h
@@ -51,18 +51,18 @@ extern "C"
   ((void *)(((alt_u8*)BASE) + (OFFSET)))
 
 #define IORD_32DIRECT(BASE, OFFSET) \
-  __builtin_ldwio (__IO_CALC_ADDRESS_DYNAMIC ((BASE), (OFFSET)))
+  (*(volatile alt_u32*)(__IO_CALC_ADDRESS_DYNAMIC ((BASE), (OFFSET))))
 #define IORD_16DIRECT(BASE, OFFSET) \
-  __builtin_ldhuio (__IO_CALC_ADDRESS_DYNAMIC ((BASE), (OFFSET)))
+  (*(volatile alt_u16*)(__IO_CALC_ADDRESS_DYNAMIC ((BASE), (OFFSET))))
 #define IORD_8DIRECT(BASE, OFFSET) \
-  __builtin_ldbuio (__IO_CALC_ADDRESS_DYNAMIC ((BASE), (OFFSET)))
+  (*(volatile alt_u8*)(__IO_CALC_ADDRESS_DYNAMIC ((BASE), (OFFSET))))
 
 #define IOWR_32DIRECT(BASE, OFFSET, DATA) \
-  __builtin_stwio (__IO_CALC_ADDRESS_DYNAMIC ((BASE), (OFFSET)), (DATA))
+  (*(volatile alt_u32*)(__IO_CALC_ADDRESS_DYNAMIC ((BASE), (OFFSET))) = (DATA))
 #define IOWR_16DIRECT(BASE, OFFSET, DATA) \
-  __builtin_sthio (__IO_CALC_ADDRESS_DYNAMIC ((BASE), (OFFSET)), (DATA))
+  (*(volatile alt_u16*)(__IO_CALC_ADDRESS_DYNAMIC ((BASE), (OFFSET))) = (DATA))
 #define IOWR_8DIRECT(BASE, OFFSET, DATA) \
-  __builtin_stbio (__IO_CALC_ADDRESS_DYNAMIC ((BASE), (OFFSET)), (DATA))
+  (*(volatile alt_u8*)(__IO_CALC_ADDRESS_DYNAMIC ((BASE), (OFFSET))) = (DATA))
 
 /* Native bus access functions */
 
@@ -70,9 +70,9 @@ extern "C"
   ((void *)(((alt_u8*)BASE) + ((REGNUM) * (SYSTEM_BUS_WIDTH/8))))
 
 #define IORD(BASE, REGNUM) \
-  __builtin_ldwio (__IO_CALC_ADDRESS_NATIVE ((BASE), (REGNUM)))
+  (*(volatile alt_u32*)(__IO_CALC_ADDRESS_NATIVE ((BASE), (REGNUM))))
 #define IOWR(BASE, REGNUM, DATA) \
-  __builtin_stwio (__IO_CALC_ADDRESS_NATIVE ((BASE), (REGNUM)), (DATA))
+  (*(volatile alt_u32*)(__IO_CALC_ADDRESS_NATIVE ((BASE), (REGNUM))) = (DATA))
 
 #ifdef __cplusplus
 }
diff --git a/software/sys_controller_bsp/Makefile b/software/sys_controller_bsp/Makefile
index aa3ece7..37e1e44 100644
--- a/software/sys_controller_bsp/Makefile
+++ b/software/sys_controller_bsp/Makefile
@@ -112,10 +112,10 @@ SOPC_FILE := ../../sys.sopcinfo
 #-------------------------------------------------------------------------------
 
 # Archiver command. Creates library files. 
-AR = nios2-elf-ar
+AR = riscv64-unknown-elf-ar
 
 # Assembler command. Note that CC is used for .S files. 
-AS = nios2-elf-gcc
+AS = riscv64-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 = nios2-elf-gcc -xc
+CC = riscv64-unknown-elf-gcc -xc
 
 # C++ compiler command. 
-CXX = nios2-elf-gcc -xc++
+CXX = riscv64-unknown-elf-gcc -xc++
 
 # Command used to remove files during 'clean' target. 
 RM = rm -f
@@ -222,7 +222,6 @@ altera_avalon_timer_driver_SRCS_ROOT := drivers
 
 # altera_avalon_timer_driver sources 
 altera_avalon_timer_driver_C_LIB_SRCS := \
-	$(altera_avalon_timer_driver_SRCS_ROOT)/src/altera_avalon_timer_sc.c \
 	$(altera_avalon_timer_driver_SRCS_ROOT)/src/altera_avalon_timer_ts.c \
 	$(altera_avalon_timer_driver_SRCS_ROOT)/src/altera_avalon_timer_vars.c
 
@@ -238,96 +237,25 @@ altera_nios2_gen2_hal_driver_SRCS_ROOT := HAL
 
 # altera_nios2_gen2_hal_driver sources 
 altera_nios2_gen2_hal_driver_C_LIB_SRCS := \
-	$(altera_nios2_gen2_hal_driver_SRCS_ROOT)/src/altera_nios2_gen2_irq.c \
 	$(altera_nios2_gen2_hal_driver_SRCS_ROOT)/src/alt_usleep.c \
 	$(altera_nios2_gen2_hal_driver_SRCS_ROOT)/src/alt_busy_sleep.c \
-	$(altera_nios2_gen2_hal_driver_SRCS_ROOT)/src/alt_irq_vars.c \
-	$(altera_nios2_gen2_hal_driver_SRCS_ROOT)/src/alt_icache_flush.c \
-	$(altera_nios2_gen2_hal_driver_SRCS_ROOT)/src/alt_icache_flush_all.c \
-	$(altera_nios2_gen2_hal_driver_SRCS_ROOT)/src/alt_dcache_flush.c \
-	$(altera_nios2_gen2_hal_driver_SRCS_ROOT)/src/alt_dcache_flush_all.c \
-	$(altera_nios2_gen2_hal_driver_SRCS_ROOT)/src/alt_dcache_flush_no_writeback.c \
 	$(altera_nios2_gen2_hal_driver_SRCS_ROOT)/src/alt_ecc_fatal_exception.c \
 	$(altera_nios2_gen2_hal_driver_SRCS_ROOT)/src/alt_instruction_exception_entry.c \
-	$(altera_nios2_gen2_hal_driver_SRCS_ROOT)/src/alt_irq_register.c \
-	$(altera_nios2_gen2_hal_driver_SRCS_ROOT)/src/alt_iic.c \
 	$(altera_nios2_gen2_hal_driver_SRCS_ROOT)/src/alt_remap_cached.c \
 	$(altera_nios2_gen2_hal_driver_SRCS_ROOT)/src/alt_remap_uncached.c \
 	$(altera_nios2_gen2_hal_driver_SRCS_ROOT)/src/alt_uncached_free.c \
 	$(altera_nios2_gen2_hal_driver_SRCS_ROOT)/src/alt_uncached_malloc.c \
 	$(altera_nios2_gen2_hal_driver_SRCS_ROOT)/src/alt_do_ctors.c \
-	$(altera_nios2_gen2_hal_driver_SRCS_ROOT)/src/alt_do_dtors.c \
-	$(altera_nios2_gen2_hal_driver_SRCS_ROOT)/src/alt_gmon.c
-
-altera_nios2_gen2_hal_driver_ASM_LIB_SRCS := \
-	$(altera_nios2_gen2_hal_driver_SRCS_ROOT)/src/alt_ecc_fatal_entry.S \
-	$(altera_nios2_gen2_hal_driver_SRCS_ROOT)/src/alt_exception_entry.S \
-	$(altera_nios2_gen2_hal_driver_SRCS_ROOT)/src/alt_exception_trap.S \
-	$(altera_nios2_gen2_hal_driver_SRCS_ROOT)/src/alt_exception_muldiv.S \
-	$(altera_nios2_gen2_hal_driver_SRCS_ROOT)/src/alt_irq_entry.S \
-	$(altera_nios2_gen2_hal_driver_SRCS_ROOT)/src/alt_software_exception.S \
-	$(altera_nios2_gen2_hal_driver_SRCS_ROOT)/src/alt_mcount.S \
-	$(altera_nios2_gen2_hal_driver_SRCS_ROOT)/src/alt_log_macro.S \
-	$(altera_nios2_gen2_hal_driver_SRCS_ROOT)/src/crt0.S
+	$(altera_nios2_gen2_hal_driver_SRCS_ROOT)/src/alt_do_dtors.c
 
 # hal sources root 
 hal_SRCS_ROOT := HAL
 
 # hal sources 
 hal_C_LIB_SRCS := \
-	$(hal_SRCS_ROOT)/src/alt_alarm_start.c \
-	$(hal_SRCS_ROOT)/src/alt_close.c \
-	$(hal_SRCS_ROOT)/src/alt_dev.c \
 	$(hal_SRCS_ROOT)/src/alt_dev_llist_insert.c \
-	$(hal_SRCS_ROOT)/src/alt_dma_rxchan_open.c \
-	$(hal_SRCS_ROOT)/src/alt_dma_txchan_open.c \
-	$(hal_SRCS_ROOT)/src/alt_environ.c \
-	$(hal_SRCS_ROOT)/src/alt_env_lock.c \
 	$(hal_SRCS_ROOT)/src/alt_errno.c \
-	$(hal_SRCS_ROOT)/src/alt_execve.c \
-	$(hal_SRCS_ROOT)/src/alt_exit.c \
-	$(hal_SRCS_ROOT)/src/alt_fcntl.c \
-	$(hal_SRCS_ROOT)/src/alt_fd_lock.c \
-	$(hal_SRCS_ROOT)/src/alt_fd_unlock.c \
-	$(hal_SRCS_ROOT)/src/alt_find_dev.c \
-	$(hal_SRCS_ROOT)/src/alt_find_file.c \
 	$(hal_SRCS_ROOT)/src/alt_flash_dev.c \
-	$(hal_SRCS_ROOT)/src/alt_fork.c \
-	$(hal_SRCS_ROOT)/src/alt_fs_reg.c \
-	$(hal_SRCS_ROOT)/src/alt_fstat.c \
-	$(hal_SRCS_ROOT)/src/alt_get_fd.c \
-	$(hal_SRCS_ROOT)/src/alt_getchar.c \
-	$(hal_SRCS_ROOT)/src/alt_getpid.c \
-	$(hal_SRCS_ROOT)/src/alt_gettod.c \
-	$(hal_SRCS_ROOT)/src/alt_iic_isr_register.c \
-	$(hal_SRCS_ROOT)/src/alt_instruction_exception_register.c \
-	$(hal_SRCS_ROOT)/src/alt_ioctl.c \
-	$(hal_SRCS_ROOT)/src/alt_io_redirect.c \
-	$(hal_SRCS_ROOT)/src/alt_irq_handler.c \
-	$(hal_SRCS_ROOT)/src/alt_isatty.c \
-	$(hal_SRCS_ROOT)/src/alt_kill.c \
-	$(hal_SRCS_ROOT)/src/alt_link.c \
-	$(hal_SRCS_ROOT)/src/alt_load.c \
-	$(hal_SRCS_ROOT)/src/alt_log_printf.c \
-	$(hal_SRCS_ROOT)/src/alt_lseek.c \
-	$(hal_SRCS_ROOT)/src/alt_main.c \
-	$(hal_SRCS_ROOT)/src/alt_malloc_lock.c \
-	$(hal_SRCS_ROOT)/src/alt_open.c \
-	$(hal_SRCS_ROOT)/src/alt_printf.c \
-	$(hal_SRCS_ROOT)/src/alt_putchar.c \
-	$(hal_SRCS_ROOT)/src/alt_putcharbuf.c \
-	$(hal_SRCS_ROOT)/src/alt_putstr.c \
-	$(hal_SRCS_ROOT)/src/alt_read.c \
-	$(hal_SRCS_ROOT)/src/alt_release_fd.c \
-	$(hal_SRCS_ROOT)/src/alt_rename.c \
-	$(hal_SRCS_ROOT)/src/alt_sbrk.c \
-	$(hal_SRCS_ROOT)/src/alt_settod.c \
-	$(hal_SRCS_ROOT)/src/alt_stat.c \
-	$(hal_SRCS_ROOT)/src/alt_tick.c \
-	$(hal_SRCS_ROOT)/src/alt_times.c \
-	$(hal_SRCS_ROOT)/src/alt_unlink.c \
-	$(hal_SRCS_ROOT)/src/alt_wait.c \
-	$(hal_SRCS_ROOT)/src/alt_write.c
 
 # i2c_opencores_driver sources root 
 i2c_opencores_driver_SRCS_ROOT := drivers
@@ -339,11 +267,6 @@ i2c_opencores_driver_C_LIB_SRCS := \
 # nios2_hw_crc32_driver sources root 
 nios2_hw_crc32_driver_SRCS_ROOT := drivers
 
-# nios2_hw_crc32_driver sources 
-nios2_hw_crc32_driver_C_LIB_SRCS := \
-	$(nios2_hw_crc32_driver_SRCS_ROOT)/src/ci_crc.c \
-	$(nios2_hw_crc32_driver_SRCS_ROOT)/src/crc.c
-
 
 # Assemble all component C source files 
 COMPONENT_C_LIB_SRCS += \
@@ -444,8 +367,7 @@ GENERATED_H_FILES := $(ABS_BSP_ROOT)/system.h
 
 GENERATED_LINKER_SCRIPT := $(ABS_BSP_ROOT)/linker.x
 
-GENERATED_FILES += $(GENERATED_H_FILES) \
-                   $(GENERATED_LINKER_SCRIPT)
+GENERATED_FILES += $(GENERATED_H_FILES)
 
 
 #------------------------------------------------------------------------------
diff --git a/software/sys_controller_bsp/alt_sys_init.c b/software/sys_controller_bsp/alt_sys_init.c
index 562b9ae..ea8e0b6 100644
--- a/software/sys_controller_bsp/alt_sys_init.c
+++ b/software/sys_controller_bsp/alt_sys_init.c
@@ -49,7 +49,7 @@
  */
 
 #include "system.h"
-#include "sys/alt_irq.h"
+//#include "sys/alt_irq.h"
 #include "sys/alt_sys_init.h"
 
 #include <stddef.h>
@@ -58,7 +58,7 @@
  * Device headers
  */
 
-#include "altera_nios2_gen2_irq.h"
+//#include "altera_nios2_gen2_irq.h"
 #include "altera_avalon_jtag_uart.h"
 #include "altera_avalon_timer.h"
 #include "altera_epcq_controller_mod.h"
@@ -68,7 +68,7 @@
  * Allocate the device storage
  */
 
-ALTERA_NIOS2_GEN2_IRQ_INSTANCE ( NIOS2_QSYS_0, nios2_qsys_0);
+//ALTERA_NIOS2_GEN2_IRQ_INSTANCE ( NIOS2_QSYS_0, nios2_qsys_0);
 ALTERA_AVALON_JTAG_UART_INSTANCE ( JTAG_UART_0, jtag_uart_0);
 ALTERA_AVALON_TIMER_INSTANCE ( TIMER_0, timer_0);
 ALTERA_EPCQ_CONTROLLER_MOD_AVL_MEM_AVL_CSR_INSTANCE ( EPCQ_CONTROLLER_0, EPCQ_CONTROLLER_0_AVL_MEM, EPCQ_CONTROLLER_0_AVL_CSR, epcq_controller_0);
@@ -83,11 +83,11 @@ I2C_OPENCORES_INSTANCE ( I2C_OPENCORES_1, i2c_opencores_1);
  * present for backwards-compatibility.
  */
 
-void alt_irq_init ( const void* base )
+/*void alt_irq_init ( const void* base )
 {
     ALTERA_NIOS2_GEN2_IRQ_INIT ( NIOS2_QSYS_0, nios2_qsys_0);
     alt_irq_cpu_enable_interrupts();
-}
+}*/
 
 /*
  * Initialize the non-interrupt controller devices.
diff --git a/software/sys_controller_bsp/drivers/src/altera_avalon_jtag_uart_init.c b/software/sys_controller_bsp/drivers/src/altera_avalon_jtag_uart_init.c
index 7317bec..b08f1f7 100644
--- a/software/sys_controller_bsp/drivers/src/altera_avalon_jtag_uart_init.c
+++ b/software/sys_controller_bsp/drivers/src/altera_avalon_jtag_uart_init.c
@@ -35,7 +35,7 @@
 
 #include <sys/stat.h>
 
-#include "sys/alt_irq.h"
+//#include "sys/alt_irq.h"
 #include "sys/alt_alarm.h"
 #include "sys/ioctl.h"
 #include "alt_types.h"
diff --git a/software/sys_controller_bsp/drivers/src/altera_avalon_jtag_uart_read.c b/software/sys_controller_bsp/drivers/src/altera_avalon_jtag_uart_read.c
index 5657adb..bf4a916 100644
--- a/software/sys_controller_bsp/drivers/src/altera_avalon_jtag_uart_read.c
+++ b/software/sys_controller_bsp/drivers/src/altera_avalon_jtag_uart_read.c
@@ -35,7 +35,7 @@
 
 #include <sys/stat.h>
 
-#include "sys/alt_irq.h"
+//#include "sys/alt_irq.h"
 #include "sys/alt_alarm.h"
 #include "sys/ioctl.h"
 #include "alt_types.h"
diff --git a/software/sys_controller_bsp/drivers/src/altera_avalon_jtag_uart_write.c b/software/sys_controller_bsp/drivers/src/altera_avalon_jtag_uart_write.c
index cf41ba8..2cfc417 100644
--- a/software/sys_controller_bsp/drivers/src/altera_avalon_jtag_uart_write.c
+++ b/software/sys_controller_bsp/drivers/src/altera_avalon_jtag_uart_write.c
@@ -35,7 +35,7 @@
 
 #include <sys/stat.h>
 
-#include "sys/alt_irq.h"
+//#include "sys/alt_irq.h"
 #include "sys/alt_alarm.h"
 #include "sys/ioctl.h"
 #include "alt_types.h"
diff --git a/software/sys_controller_bsp/libhal_bsp.a b/software/sys_controller_bsp/libhal_bsp.a
index 39829dd..b07326c 100644
Binary files a/software/sys_controller_bsp/libhal_bsp.a and b/software/sys_controller_bsp/libhal_bsp.a differ
diff --git a/software/sys_controller_bsp/public.mk b/software/sys_controller_bsp/public.mk
index cff38a9..34bc070 100644
--- a/software/sys_controller_bsp/public.mk
+++ b/software/sys_controller_bsp/public.mk
@@ -19,7 +19,7 @@
 
 
 # Path to the provided linker script.
-BSP_LINKER_SCRIPT := $(ALT_LIBRARY_ROOT_DIR)/linker.x
+BSP_LINKER_SCRIPT := link.riscv.ld
 
 # Include paths:
 # The path to root of all header files that a library wishes to make
@@ -119,15 +119,15 @@ ELF_PATCH_FLAG  += --cpu_name $(CPU_NAME)
 
 # Hardware Divider present. 
 # setting HARDWARE_DIVIDE is false
-ALT_CFLAGS += -mno-hw-div
+#ALT_CFLAGS += -mno-hw-div
 
 # Hardware Multiplier present. 
 # setting HARDWARE_MULTIPLY is false
-ALT_CFLAGS += -mno-hw-mul
+#ALT_CFLAGS += -mno-hw-mul
 
 # Hardware Mulx present. 
 # setting HARDWARE_MULX is false
-ALT_CFLAGS += -mno-hw-mulx
+#ALT_CFLAGS += -mno-hw-mulx
 
 # Debug Core present. 
 # setting HAS_DEBUG_CORE is true
@@ -258,7 +258,8 @@ ALT_CPPFLAGS += -DSMALL_C_LIB
 # generate GP-relative accesses for small data objects that are external, weak, 
 # or common. none 
 # setting hal.make.cflags_mgpopt is -mgpopt=global
-ALT_CFLAGS += -mgpopt=global
+#ALT_CFLAGS += -mgpopt=global
+ALT_CFLAGS += -march=rv32imc -mabi=ilp32
 
 # 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 
diff --git a/software/sys_controller_bsp/settings.bsp b/software/sys_controller_bsp/settings.bsp
index 9476c51..6657c70 100644
--- a/software/sys_controller_bsp/settings.bsp
+++ b/software/sys_controller_bsp/settings.bsp
@@ -2,8 +2,8 @@
 <sch:Settings xmlns:sch="http://www.altera.com/embeddedsw/bsp/schema">
         <BspType>hal</BspType>
         <BspVersion>default</BspVersion>
-        <BspGeneratedTimeStamp>Apr 18, 2018 10:30:05 PM</BspGeneratedTimeStamp>
-        <BspGeneratedUnixTimeStamp>1524079805195</BspGeneratedUnixTimeStamp>
+        <BspGeneratedTimeStamp>Sep 25, 2018 9:18:49 PM</BspGeneratedTimeStamp>
+        <BspGeneratedUnixTimeStamp>1537899529022</BspGeneratedUnixTimeStamp>
         <BspGeneratedLocation>./</BspGeneratedLocation>
         <BspSettingsFile>settings.bsp</BspSettingsFile>
         <SopcDesignFile>../../sys.sopcinfo</SopcDesignFile>
diff --git a/software/sys_controller_bsp/system.h b/software/sys_controller_bsp/system.h
index 3b8af96..e07c2c7 100644
--- a/software/sys_controller_bsp/system.h
+++ b/software/sys_controller_bsp/system.h
@@ -133,14 +133,18 @@
  *
  */
 
-#define ALT_CI_NIOS2_HW_CRC32_0(n,A) __builtin_custom_ini(ALT_CI_NIOS2_HW_CRC32_0_N+(n&ALT_CI_NIOS2_HW_CRC32_0_N_MASK),(A))
+//#define ALT_CI_NIOS2_HW_CRC32_0(n,A) __builtin_custom_ini(ALT_CI_NIOS2_HW_CRC32_0_N+(n&ALT_CI_NIOS2_HW_CRC32_0_N_MASK),(A))
 #define ALT_CI_NIOS2_HW_CRC32_0_N 0x0
 #define ALT_CI_NIOS2_HW_CRC32_0_N_MASK ((1<<3)-1)
-#define ALT_CI_NIOS_CUSTOM_INSTR_BITSWAP_0(A) __builtin_custom_ini(ALT_CI_NIOS_CUSTOM_INSTR_BITSWAP_0_N,(A))
+//#define ALT_CI_NIOS_CUSTOM_INSTR_BITSWAP_0(A) __builtin_custom_ini(ALT_CI_NIOS_CUSTOM_INSTR_BITSWAP_0_N,(A))
 #define ALT_CI_NIOS_CUSTOM_INSTR_BITSWAP_0_N 0x9
-#define ALT_CI_NIOS_CUSTOM_INSTR_ENDIANCONVERTER_0(A) __builtin_custom_ini(ALT_CI_NIOS_CUSTOM_INSTR_ENDIANCONVERTER_0_N,(A))
+//#define ALT_CI_NIOS_CUSTOM_INSTR_ENDIANCONVERTER_0(A) __builtin_custom_ini(ALT_CI_NIOS_CUSTOM_INSTR_ENDIANCONVERTER_0_N,(A))
 #define ALT_CI_NIOS_CUSTOM_INSTR_ENDIANCONVERTER_0_N 0x8
 
+#define ALT_CI_NIOS2_HW_CRC32_0(n,A) n
+#define ALT_CI_NIOS_CUSTOM_INSTR_BITSWAP_0(A) A
+#define ALT_CI_NIOS_CUSTOM_INSTR_ENDIANCONVERTER_0(A) A
+
 
 /*
  * Define for each module class mastered by the CPU