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
---
 software/shared/Makefile.shared | 48 -----------------------------------------
 1 file changed, 48 deletions(-)
 delete mode 100644 software/shared/Makefile.shared

(limited to 'software/shared/Makefile.shared')

diff --git a/software/shared/Makefile.shared b/software/shared/Makefile.shared
deleted file mode 100644
index 70550a0..0000000
--- a/software/shared/Makefile.shared
+++ /dev/null
@@ -1,48 +0,0 @@
-# See LICENSE for license details.
-
-SHARED_DIR = $(SWDIR)/shared
-
-ASM_SRCS += $(SHARED_DIR)/entry.S
-
-C_SRCS += $(SHARED_DIR)/init.c
-C_SRCS += $(SHARED_DIR)/syscall.c
-C_SRCS += $(SHARED_DIR)/drivers_sifive/plic.c
-
-PLATFORM ?= freedom-e300
-LINKER_SCRIPT := $(SWDIR)/../riscv-tests/debug/targets/$(PLATFORM)/link.lds
-HEADERS += $(SHARED_DIR)/*.h
-
-C_SRCS += $(TARGET).c
-
-INCLUDES += -I .
-INCLUDES += -I $(SHARED_DIR)
-INCLUDES += -I $(SWDIR)/../riscv-tests/env
-INCLUDES += -I$(SHARED_DIR)/drivers_sifive/
-
-CC = $(SWDIR)/../toolchain/bin/riscv32-unknown-elf-gcc
-
-CFLAGS += $(CDEFINES)
-
-LDFLAGS := -T $(LINKER_SCRIPT) -nostdlib -nostartfiles -lc -lgcc
-LDFLAGS += -L$(SHARED_DIR)
-LDFLAGS += -L$(SHARED_DIR)/drivers
-LDFLAGS += -L$(SHARED_DIR)/hal
-
-ASM_OBJS := $(patsubst %.S,%.o,$(ASM_SRCS))
-C_OBJS := $(patsubst %.c,%.o,$(C_SRCS))
-
-$(TARGET): $(ASM_OBJS) $(C_OBJS) $(LINKER_SCRIPT)
-	$(CC) $(CFLAGS) $(INCLUDES) $(C_OBJS) $(ASM_OBJS) -o $@ $(LDFLAGS)
-
-$(ASM_OBJS): %.o: %.S $(HEADERS)
-	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
-
-$(C_OBJS): %.o: %.c $(HEADERS)
-	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
-
-all: default
-
-clean:
-	rm -f $(TARGET) *.o $(SHARED_DIR)/*.o $(SHARED_DIR)/drivers/*/*.o $(SHARED_DIR)/drivers_sifive/*.o
-
-.PHONY: clean all default
-- 
cgit v1.2.1-18-gbd029