From f2b4993b1d060dcc05b1794b0319dc7903fd6fa0 Mon Sep 17 00:00:00 2001 From: Jonathan Neuschäfer Date: Thu, 19 Apr 2018 16:23:52 +0200 Subject: util/riscvtools: Rename to util/riscv/ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There's no good reason to use the more complicated name. Change-Id: I515e2df3b87580ddd31d18fe63451a98e92ead61 Signed-off-by: Jonathan Neuschäfer Reviewed-on: https://review.coreboot.org/25700 Reviewed-by: Ronald G. Minnich Reviewed-by: Paul Menzel Tested-by: build bot (Jenkins) --- src/mainboard/emulation/spike-riscv/Kconfig.name | 2 +- util/riscv/make-spike-elf.sh | 30 ++++++++++++++++++++++++ util/riscv/spike-elf.ld | 15 ++++++++++++ util/riscvtools/make-spike-elf.sh | 30 ------------------------ util/riscvtools/spike-elf.ld | 15 ------------ 5 files changed, 46 insertions(+), 46 deletions(-) create mode 100755 util/riscv/make-spike-elf.sh create mode 100644 util/riscv/spike-elf.ld delete mode 100755 util/riscvtools/make-spike-elf.sh delete mode 100644 util/riscvtools/spike-elf.ld diff --git a/src/mainboard/emulation/spike-riscv/Kconfig.name b/src/mainboard/emulation/spike-riscv/Kconfig.name index 66266f7293..2869425dd0 100644 --- a/src/mainboard/emulation/spike-riscv/Kconfig.name +++ b/src/mainboard/emulation/spike-riscv/Kconfig.name @@ -3,5 +3,5 @@ config BOARD_EMULATION_SPIKE_UCB_RISCV help To run coreboot in spike: * run "make" as usual - * util/riscvtools/make-spike-elf.sh build/coreboot.{rom,elf} + * util/riscv/make-spike-elf.sh build/coreboot.{rom,elf} * spike -m1024 build/coreboot.elf diff --git a/util/riscv/make-spike-elf.sh b/util/riscv/make-spike-elf.sh new file mode 100755 index 0000000000..834e8d2cb6 --- /dev/null +++ b/util/riscv/make-spike-elf.sh @@ -0,0 +1,30 @@ +#!/bin/sh +# +# This script is based on: +# https://docs.google.com/document/d/1Pvf9Yxorcd3sbgs8WcomcTl3J4bmX6e1UE0ROCefR88 + +set -e + +usage() { + echo "This script converts a flat file into an ELF, that can be passed" + echo "to SPIKE, the RISC-V reference emulator." + echo "" + echo "Usage: $0 coreboot.rom coreboot.elf" +} + +if [ $# -ne 2 ]; then + usage + exit 1 +fi + +FLAT_FILE="$1" +OBJECT_FILE=$(mktemp /tmp/coreboot-spike.XXXXXX) +ELF_FILE="$2" +TOOL_PATH="$(dirname "$0")" +XGCC_BIN="$TOOL_PATH/../crossgcc/xgcc/bin" + +"$XGCC_BIN/riscv64-elf-objcopy" -I binary -O elf64-littleriscv \ + -B riscv "$FLAT_FILE" "$OBJECT_FILE" +"$XGCC_BIN/riscv64-elf-ld" "$OBJECT_FILE" -T "$TOOL_PATH/spike-elf.ld" \ + -o "$ELF_FILE" +rm "$OBJECT_FILE" diff --git a/util/riscv/spike-elf.ld b/util/riscv/spike-elf.ld new file mode 100644 index 0000000000..44114f7cad --- /dev/null +++ b/util/riscv/spike-elf.ld @@ -0,0 +1,15 @@ +/* See make-spike-elf.sh */ + +ENTRY(_start); +SECTIONS +{ + . = 0x80000000; + _start = .; + .data : { + *(.data) + } + + tohost = .; + . = . + 8; + fromhost = .; +} diff --git a/util/riscvtools/make-spike-elf.sh b/util/riscvtools/make-spike-elf.sh deleted file mode 100755 index 834e8d2cb6..0000000000 --- a/util/riscvtools/make-spike-elf.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# This script is based on: -# https://docs.google.com/document/d/1Pvf9Yxorcd3sbgs8WcomcTl3J4bmX6e1UE0ROCefR88 - -set -e - -usage() { - echo "This script converts a flat file into an ELF, that can be passed" - echo "to SPIKE, the RISC-V reference emulator." - echo "" - echo "Usage: $0 coreboot.rom coreboot.elf" -} - -if [ $# -ne 2 ]; then - usage - exit 1 -fi - -FLAT_FILE="$1" -OBJECT_FILE=$(mktemp /tmp/coreboot-spike.XXXXXX) -ELF_FILE="$2" -TOOL_PATH="$(dirname "$0")" -XGCC_BIN="$TOOL_PATH/../crossgcc/xgcc/bin" - -"$XGCC_BIN/riscv64-elf-objcopy" -I binary -O elf64-littleriscv \ - -B riscv "$FLAT_FILE" "$OBJECT_FILE" -"$XGCC_BIN/riscv64-elf-ld" "$OBJECT_FILE" -T "$TOOL_PATH/spike-elf.ld" \ - -o "$ELF_FILE" -rm "$OBJECT_FILE" diff --git a/util/riscvtools/spike-elf.ld b/util/riscvtools/spike-elf.ld deleted file mode 100644 index 44114f7cad..0000000000 --- a/util/riscvtools/spike-elf.ld +++ /dev/null @@ -1,15 +0,0 @@ -/* See make-spike-elf.sh */ - -ENTRY(_start); -SECTIONS -{ - . = 0x80000000; - _start = .; - .data : { - *(.data) - } - - tohost = .; - . = . + 8; - fromhost = .; -} -- cgit v1.2.3