From 608bf0b673e744d06719967eefa7eea8a7cb524e Mon Sep 17 00:00:00 2001 From: Rey Tucker Date: Mon, 26 Nov 2018 18:51:33 -0500 Subject: [PATCH] hdl: nios: split up build files by platform --- .../platforms/bladerf-micro/software/bladeRF_nios/Makefile | 1 + .../bladerf-micro/software/bladeRF_nios/src/bladeRF_nios.c | 2 -- hdl/fpga/platforms/bladerf/software/bladeRF_nios/Makefile | 3 +++ .../platforms/common/bladerf/software/bladeRF_nios/Makefile | 4 ---- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/hdl/fpga/platforms/bladerf-micro/software/bladeRF_nios/Makefile b/hdl/fpga/platforms/bladerf-micro/software/bladeRF_nios/Makefile index 428a087c..a7660461 100644 --- a/hdl/fpga/platforms/bladerf-micro/software/bladeRF_nios/Makefile +++ b/hdl/fpga/platforms/bladerf-micro/software/bladeRF_nios/Makefile @@ -14,6 +14,7 @@ QUARTUS_OUTDIR := $(QUARTUS_WORKDIR)/output_files ALT_INCLUDE_DIRS += -I ./src +C_SRCS += $(BLADERF_COMMON_DIR)/src/pkt_retune2.c C_SRCS += ./src/bladeRF_nios.c #------------------------------------------------------------------------------ diff --git a/hdl/fpga/platforms/bladerf-micro/software/bladeRF_nios/src/bladeRF_nios.c b/hdl/fpga/platforms/bladerf-micro/software/bladeRF_nios/src/bladeRF_nios.c index 2fddeec8..09ece6d0 100644 --- a/hdl/fpga/platforms/bladerf-micro/software/bladeRF_nios/src/bladeRF_nios.c +++ b/hdl/fpga/platforms/bladerf-micro/software/bladeRF_nios/src/bladeRF_nios.c @@ -43,7 +43,6 @@ #include "pkt_8x64.h" #include "pkt_16x64.h" #include "pkt_32x32.h" -#include "pkt_retune.h" #include "pkt_retune2.h" #include "pkt_legacy.h" #include "debug.h" @@ -84,7 +83,6 @@ * to include the magic header byte value in the `magics` array. */ static const struct pkt_handler pkt_handlers[] = { - PKT_RETUNE, PKT_RETUNE2, PKT_8x8, PKT_8x16, diff --git a/hdl/fpga/platforms/bladerf/software/bladeRF_nios/Makefile b/hdl/fpga/platforms/bladerf/software/bladeRF_nios/Makefile index 428a087c..c74dc1ac 100644 --- a/hdl/fpga/platforms/bladerf/software/bladeRF_nios/Makefile +++ b/hdl/fpga/platforms/bladerf/software/bladeRF_nios/Makefile @@ -14,6 +14,9 @@ QUARTUS_OUTDIR := $(QUARTUS_WORKDIR)/output_files ALT_INCLUDE_DIRS += -I ./src +C_SRCS += $(FPGA_COMMON_DIR)/src/lms.c +C_SRCS += $(FPGA_COMMON_DIR)/src/band_select.c +C_SRCS += $(BLADERF_COMMON_DIR)/src/pkt_retune.c C_SRCS += ./src/bladeRF_nios.c #------------------------------------------------------------------------------ diff --git a/hdl/fpga/platforms/common/bladerf/software/bladeRF_nios/Makefile b/hdl/fpga/platforms/common/bladerf/software/bladeRF_nios/Makefile index 11846eda..07cea782 100644 --- a/hdl/fpga/platforms/common/bladerf/software/bladeRF_nios/Makefile +++ b/hdl/fpga/platforms/common/bladerf/software/bladeRF_nios/Makefile @@ -167,12 +167,8 @@ C_SRCS += $(BLADERF_COMMON_DIR)/src/pkt_8x32.c C_SRCS += $(BLADERF_COMMON_DIR)/src/pkt_8x64.c C_SRCS += $(BLADERF_COMMON_DIR)/src/pkt_16x64.c C_SRCS += $(BLADERF_COMMON_DIR)/src/pkt_32x32.c -C_SRCS += $(BLADERF_COMMON_DIR)/src/pkt_retune.c -C_SRCS += $(BLADERF_COMMON_DIR)/src/pkt_retune2.c C_SRCS += $(BLADERF_COMMON_DIR)/src/pkt_legacy.c C_SRCS += $(BLADERF_COMMON_DIR)/src/devices_sim.c -C_SRCS += $(FPGA_COMMON_DIR)/src/lms.c -C_SRCS += $(FPGA_COMMON_DIR)/src/band_select.c CXX_SRCS := ASM_SRCS :=