From ae5f878d6acadabaa671a7a30b87e16eb1d718a7 Mon Sep 17 00:00:00 2001
From: Megan Wachs <megan@sifive.com>
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/common/bram.ld | 40 --------------------------------
 bootrom/common/mem.awk | 63 --------------------------------------------------
 2 files changed, 103 deletions(-)
 delete mode 100644 bootrom/common/bram.ld
 delete mode 100644 bootrom/common/mem.awk

(limited to 'bootrom/common')

diff --git a/bootrom/common/bram.ld b/bootrom/common/bram.ld
deleted file mode 100644
index 45df67f..0000000
--- a/bootrom/common/bram.ld
+++ /dev/null
@@ -1,40 +0,0 @@
-OUTPUT_ARCH("riscv")
-ENTRY(_start)
-
-MEMORY
-{
-	rom (rx) : ORIGIN = 0x00001000, LENGTH = 4K
-	ram (rwx) : ORIGIN = 0x80000000, LENGTH = 256M
-}
-
-SECTIONS
-{
-	PROVIDE(_rom = ORIGIN(rom));
-	PROVIDE(_rom_end = _rom + LENGTH(rom));
-	PROVIDE(_ram = ORIGIN(ram));
-	PROVIDE(_ram_end = _ram + LENGTH(ram));
-
-	.text : {
-		PROVIDE(_ftext = .);
-		*(.text.init)
-		*(.text .text.* .gnu.linkonce.t.*)
-		PROVIDE(_etext = .);
-	} > rom
-
-	.rodata : {
-		*(.rodata .rodata.* .gnu.linkonce.r.*)
-	} > rom
-
-	.bss : ALIGN(8) {
-		PROVIDE(_fbss = .);
-		*(.bss .bss.* .gnu.linkonce.b.*)
-		*(.sbss .sbss.* .gnu.linkonce.sb.*)
-		. = ALIGN(8);
-		PROVIDE(_ebss = .);
-	} > ram
-
-	. += 0x1000;
-	PROVIDE(_sp = NEXT(0x1000));
-
-	PROVIDE(_end = .);
-}
diff --git a/bootrom/common/mem.awk b/bootrom/common/mem.awk
deleted file mode 100644
index 3003b56..0000000
--- a/bootrom/common/mem.awk
+++ /dev/null
@@ -1,63 +0,0 @@
-BEGIN {
-	RS = ORS = "\r\n"
-	addr = 0
-	buf = ""
-	limit = (WIDTH > 0 ? WIDTH / 4 : 16)
-	print "@00000000"
-}
-
-# Portable strtonum() replacement
-function atoi(str,	x, n, i, b, c) {
-	if (str ~ /^0[0-7]*$/) {
-		i = 2
-		b = 8
-	} else if (str ~ /^0[xX][[:xdigit:]]+$/) {
-		i = 3
-		b = 16
-	} else {
-		return str
-	}
-
-	x = 0
-	n = length(str)
-	for (; i <= n; i++) {
-		c = tolower(substr(str, i , 1))
-		c = index("123456789abcdef", c)
-		x = (x * b) + c
-	}
-	return x
-}
-
-function out(x) {
-	addr++
-	buf = (REVERSE ? buf x : x buf)
-	if (length(buf) >= limit) {
-		print buf
-		buf = ""
-	}
-}
-
-function pad(n) {
-	while (addr < n) {
-		out("00")
-	}
-}
-
-match($1, /^@[[:xdigit:]]+/) {
-	pad(atoi("0x" substr($1, RSTART+1, RLENGTH-1)))
-	next
-}
-
-{
-	for (i = 1; i <= NF; i++) {
-		out($i)
-	}
-}
-
-END {
-	align = limit / 2
-	pad(int((addr + align - 1) / align) * align)
-	if (length(buf) > 0) {
-		print buf;
-	}
-}
-- 
cgit v1.2.1-18-gbd029