From 5326455c027b67b5f5999599716a45ffe2aa1187 Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Wed, 16 Dec 2020 10:51:38 +1100 Subject: [PATCH] No need to set HAS_FPU and LOG_LENGTH in Makefile --- Makefile | 4 ++-- fpga/top-caravel.vhdl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 02526e0..a034b80 100644 --- a/Makefile +++ b/Makefile @@ -116,7 +116,7 @@ $(soc_dram_tbs): else VERILATOR_CFLAGS=-O3 -VERILATOR_FLAGS=-O3 +VERILATOR_FLAGS=-O3 --x-assign=1 --x-initial=1 verilated_dram: litedram/generated/sim/litedram_core.v verilator $(VERILATOR_FLAGS) -CFLAGS $(VERILATOR_CFLAGS) -Wno-fatal --cc $< --trace make -C obj_dir -f ../litedram/extras/sim_dram_verilate.mk VERILATOR_ROOT=$(VERILATOR_ROOT) @@ -171,7 +171,7 @@ OPENOCD_DEVICE_CONFIG=openocd/LFE5UM5G-85F.cfg endif GHDL_IMAGE_GENERICS=-gMEMORY_SIZE=$(MEMORY_SIZE) -gRAM_INIT_FILE=$(RAM_INIT_FILE) \ - -gRESET_LOW=$(RESET_LOW) -gCLK_INPUT=$(CLK_INPUT) -gCLK_FREQUENCY=$(CLK_FREQUENCY) -gLOG_LENGTH=8 -gHAS_FPU=false + -gRESET_LOW=$(RESET_LOW) -gCLK_INPUT=$(CLK_INPUT) -gCLK_FREQUENCY=$(CLK_FREQUENCY) clkgen=fpga/clk_gen_ecp5.vhd toplevel=fpga/top-generic.vhdl diff --git a/fpga/top-caravel.vhdl b/fpga/top-caravel.vhdl index 20512fd..8c84f44 100644 --- a/fpga/top-caravel.vhdl +++ b/fpga/top-caravel.vhdl @@ -18,7 +18,7 @@ entity toplevel is SPI_FLASH_OFFSET : integer := 0; SPI_FLASH_DEF_CKDV : natural := 4; SPI_FLASH_DEF_QUAD : boolean := false; - LOG_LENGTH : natural := 16; + LOG_LENGTH : natural := 8; UART_IS_16550 : boolean := true; HAS_UART1 : boolean := false; HAS_JTAG : boolean := true