diff --git a/Makefile b/Makefile index e2483e7aa..b9eb15412 100644 --- a/Makefile +++ b/Makefile @@ -65,7 +65,7 @@ endif # Enable VILLASfpga support when libpci is available ifeq ($(shell pkg-config libpci; echo $$?),0) LIB_OBJS += fpga.o pci.o ip.o vfio.o - LIB_OBJS += dma.o model.o fifo.o switch.o rtds_axis.o intc.o dft.o timer.o bram.o + LIB_OBJS += dma.o model.o fifo.o switch.o rtds_axis.o intc.o dft.o timer.o LDLIBS += -lxil LDFLAGS += -Lthirdparty/xilinx -Wl,-rpath-link,'$$ORIGIN/thirdparty/xilinx' CFLAGS += -Ithirdparty/xilinx/include diff --git a/lib/fpga/bram.c b/lib/fpga/bram.c deleted file mode 100644 index dc9caa30a..000000000 --- a/lib/fpga/bram.c +++ /dev/null @@ -1,32 +0,0 @@ -/** Block RAM - * - * @author Steffen Vogel - * @copyright 2015-2016, Steffen Vogel - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. - * Unauthorized copying of this file, via any medium is strictly prohibited. - **********************************************************************************/ - -#include "fpga/ip.h" -#include "fpga/timer.h" - -int bram_parse(struct ip *c) -{ - int size; - - if (config_setting_lookup_int(c->cfg, "size", &size)) - c->bram.size = size; - else - cerror(c->cfg, "BRAM IP core requires 'size' setting"); - - if (size <= 0) - error("BRAM IP core has invalid size: %d", size); - - return 0; -} - -static struct ip_type ip = { - .vlnv = { "xilinx.com", "ip", "axi_bram_ctrl", NULL }, - .parse = bram_parse -}; - -REGISTER_IP_TYPE(&ip) \ No newline at end of file