Remove version suffixes, no longer needed on ubuntu 22.10 (clang 15)

Signed-off-by: Daniel Lublin <daniel@lublin.se>
This commit is contained in:
Daniel Lublin 2022-11-23 09:47:48 +01:00 committed by Joachim Strömbergson
parent ca5541ce0e
commit b30e62dbb5
4 changed files with 8 additions and 8 deletions

View File

@ -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 \

View File

@ -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

View File

@ -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

View File

@ -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)