From ae5f878d6acadabaa671a7a30b87e16eb1d718a7 Mon Sep 17 00:00:00 2001 From: Megan Wachs Date: Wed, 30 Nov 2016 10:55:18 -0800 Subject: Bump Everything to Match new Freedom Repo (#8) * Bump tool versions * Use version of OpenOCD which can load programs into flash * Bump OpenOCD to Handle ISSI Flash Programming * Update Header files * add initial support for hifive1 * add dhrystone * add clock helper functions * add openocd cfg file * Demo_GPIO checkpoint -- compiles and runs but no blinky LEDs * Remove riscv-tests submodule * Remove FPGA files, as they are no longer relevant to this Repository * Add openocd_upload script * Add Pinmux Mappings Adding the pinmux mappings to the Platform Header * Add IOF Mappings to platform header * Re-order the IOF Mapping declarations * Add more useful things to platform headers * Get GPIO Demo working again (except interrupts aren't working) * Update README with more OS packages needed A bare ubuntu-16.04.1-server installation could not run `make tools` without these packages. * bump openocd to get SCKDIV fix * Remove duplicated help text for run_debug target * Add package to README that is needed for openocd build Without this package I was seeing two different failures like below when running `make tools`. /home/scottj/freedom-e-sdk/openocd/configure: line 4533: syntax error near unexpected token `0.23' /home/scottj/freedom-e-sdk/openocd/configure: line 4533: `PKG_PROG_PKG_CONFIG(0.23)' Makefile:70: recipe for target '/home/scottj/freedom-e-sdk/toolchain/bin/openocd' failed make: *** [/home/scottj/freedom-e-sdk/toolchain/bin/openocd] Error 2 ... or ... + autoconf configure.ac:12: error: possibly undefined macro: AC_MSG_WARN If this token and others are legitimate, please use m4_pattern_allow. See the Autoconf documentation. configure.ac:240: error: possibly undefined macro: AC_MSG_NOTICE configure.ac:342: error: possibly undefined macro: AC_DEFINE Makefile:70: recipe for target '/home/scottj/freedom-e-sdk/toolchain/bin/openocd' failed make: *** [/home/scottj/freedom-e-sdk/toolchain/bin/openocd] Error 1 * Bump OpenOCD to not overwrite SCKDIV when flashing * Roll back CoreMark --- bootrom/demo/Makefile | 5 ---- bootrom/demo/demo.S | 71 ---------------------------------------------- bootrom/demo/hello_msg.txt | 37 ------------------------ 3 files changed, 113 deletions(-) delete mode 100644 bootrom/demo/Makefile delete mode 100644 bootrom/demo/demo.S delete mode 100644 bootrom/demo/hello_msg.txt (limited to 'bootrom/demo') diff --git a/bootrom/demo/Makefile b/bootrom/demo/Makefile deleted file mode 100644 index dfe3663..0000000 --- a/bootrom/demo/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -PROG := demo -SRCS := demo.S -EXTRAS := hello_msg.txt - -include ../bram.mk diff --git a/bootrom/demo/demo.S b/bootrom/demo/demo.S deleted file mode 100644 index c6f2618..0000000 --- a/bootrom/demo/demo.S +++ /dev/null @@ -1,71 +0,0 @@ -#define UART_BASE 0x48000000 -#define SPI_BASE 0x48001000 -#define GPIO_BASE 0x48002000 - -#ifndef CFG_STRING -#error Must define CFG_STRING -#endif - - .globl _start -_start: - j uart_init - nop - nop - .word cfgstr - -uart_init: - // a1 = UART_TX - // a2 = hello_msg_end - // for (a0 = hello_msg_start; a0 != a2; ++ a0){ - // while (a3 = TX_READY == 0); - // a3 = *a0 - // *a1 = a3 - // } - - la a0, hello_msg_start - la a2, hello_msg_end - li a1, UART_BASE - -uart_loop: - lw a3, 4(a1) // Wait until non-zero (uart can send data). - beqz a3, uart_loop - - lb a3, 0(a0) // read the next character in hello_msg - sw a3, 0(a1) // Write the current character. - addi a0, a0, 1 // increment the pointer. - bne a0, a2, uart_loop - -gpio_init: - li a0, GPIO_BASE - li t0, 0xFFFF0000 - sw t0, 4(a0) - -gpio_loop: - // For Red LEDs, increment manually. - li t0, 0x1 - sw t0, (a0) - li t0, 0x2 - sw t0, (a0) - li t0, 0x4 - sw t0, (a0) - li t0, 0x8 - sw t0, (a0) - - // For Blue and Green LEDs, sample the switches & buttons - - lw t0, (a0) - srli t0, t0, 16 - andi t0, t0, 0xFF - slli t0, t0, 4 - sw t0, (a0) - - j gpio_loop - - .section .rodata - -hello_msg_start: - .incbin "hello_msg.txt" -hello_msg_end: - -cfgstr: - .incbin CFG_STRING diff --git a/bootrom/demo/hello_msg.txt b/bootrom/demo/hello_msg.txt deleted file mode 100644 index c3cb3f2..0000000 --- a/bootrom/demo/hello_msg.txt +++ /dev/null @@ -1,37 +0,0 @@ - - SIFIVE, INC. - - 5555555555555555555555555 - 5555 5555 - 5555 5555 - 5555 5555 - 5555 5555555555555555555555 - 5555 555555555555555555555555 - 5555 5555 - 5555 5555 - 5555 5555 -5555555555555555555555555555 55555 - 55555 555555555 55555 - 55555 55555 55555 - 55555 5 55555 - 55555 55555 - 55555 55555 - 55555 55555 - 55555 55555 - 55555 55555 - 555555555 - 55555 - 5 - - SiFive RISC-V Coreplex - -Welcome to the Arty FPGA Freedom E Dev Kit. -The red LEDs are blinking very fast and appear -dim. Try pressing the buttons and switches to control -the blue and green LEDs. You can try using the -debugger to step through the boot code. - - - - - -- cgit v1.2.1-18-gbd029