From 3435941eab3df290c18a74553e6b9a69e9f8a74b Mon Sep 17 00:00:00 2001 From: Daniel Lublin Date: Wed, 23 Nov 2022 09:47:48 +0100 Subject: [PATCH] Remove version suffixes, no longer needed on ubuntu 22.10 (clang 15) Signed-off-by: Daniel Lublin --- contrib/Dockerfile | 2 +- doc/system_description/firmware.md | 4 ++-- doc/toolchain_setup.md | 2 +- hw/application_fpga/Makefile | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/contrib/Dockerfile b/contrib/Dockerfile index 840cb76..e25865b 100644 --- a/contrib/Dockerfile +++ b/contrib/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:22.04 as base +FROM ubuntu:22.10 as base RUN apt-get -qq update -y \ && DEBIAN_FRONTEND=noninteractive \ diff --git a/doc/system_description/firmware.md b/doc/system_description/firmware.md index ae9cc97..7fea0aa 100644 --- a/doc/system_description/firmware.md +++ b/doc/system_description/firmware.md @@ -15,8 +15,8 @@ Build the FPGA bitstream with the firmware using `make` in the `hw/application_fpga` directory. If your available `objcopy` and `size` commands is anything other than -the default `llvm-objcopy-14` and `llvm-size-14` define `OBJCOPY` and -`SIZE` to whatever they're called on your system. +the default `llvm-objcopy` and `llvm-size` define `OBJCOPY` and `SIZE` +to whatever they're called on your system. ## Using QEMU diff --git a/doc/toolchain_setup.md b/doc/toolchain_setup.md index af3d5ca..473e360 100644 --- a/doc/toolchain_setup.md +++ b/doc/toolchain_setup.md @@ -1,7 +1,7 @@ # Toolchain setup Here are instructions for setting up the tools required to build the project. -Tested on Ubuntu 22.04 LTS. +Tested on Ubuntu 22.10. ## Gateware: icestorm toolchain diff --git a/hw/application_fpga/Makefile b/hw/application_fpga/Makefile index 74dec88..9ab2a00 100644 --- a/hw/application_fpga/Makefile +++ b/hw/application_fpga/Makefile @@ -28,16 +28,16 @@ BRAM_FW_SIZE ?= 1536 PIN_FILE ?= application_fpga_mta1_usb_v1.pcf -SIZE ?= llvm-size-14 -OBJCOPY ?= llvm-objcopy-14 +SIZE ?= llvm-size +OBJCOPY ?= llvm-objcopy -CC = clang-14 +CC = clang CFLAGS = -target riscv32-unknown-none-elf -march=rv32imc -mabi=ilp32 \ -static -std=gnu99 -Os -ffast-math -fno-common -fno-builtin-printf \ -fno-builtin-putchar -nostdlib -mno-relax -Wall -flto -DNOCONSOLE -AS = clang-14 +AS = clang ASFLAGS = -target riscv32-unknown-none-elf -march=rv32imc -mabi=ilp32 -mno-relax ICE40_SIM_CELLS = $(shell yosys-config --datdir/ice40/cells_sim.v)