Skip to content

Commit 38ab5a0

Browse files
committed
hdl: nios: clean up Makefile indentation
Apparently indentation must consist of a single tab character, and GNU make is serious about that. However, elsewhere, use spaces.
1 parent 0e58bbc commit 38ab5a0

File tree

2 files changed

+52
-52
lines changed
  • hdl/fpga/platforms
    • bladerf-micro/software/bladeRF_nios
    • bladerf/software/bladeRF_nios

2 files changed

+52
-52
lines changed

hdl/fpga/platforms/bladerf-micro/software/bladeRF_nios/Makefile

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -4,42 +4,42 @@
44

55
# paths are relative to hdl/fpga/platforms/bladerf-micro/software/bladeRF_nios
66

7-
FPGA_COMMON_DIR := ../../../../../../fpga_common
8-
LIBBLADERF_DIR := ../../../../../../host/libraries/libbladeRF
9-
BLADERF_COMMON_DIR := ../../../common/bladerf/software/bladeRF_nios
10-
HOST_COMMON_DIR := ../../../../../../host/common
11-
FIRMWARE_COMMON_DIR := ../../../../../../firmware_common
12-
13-
QUARTUS_WORKDIR := ../../../../../quartus/${WORKDIR}
14-
NIOS_BUILD_OUTDIR := $(QUARTUS_WORKDIR)/bladeRF_nios
15-
MEM_INIT_DIR := $(NIOS_BUILD_OUTDIR)/mem_init
16-
BSP_BUILD_OUTDIR := $(QUARTUS_WORKDIR)/bladeRF_nios_bsp
17-
QUARTUS_OUTDIR := $(QUARTUS_WORKDIR)/output_files
18-
19-
ALT_INCLUDE_DIRS += ./src
20-
21-
C_SRCS += ./src/bladeRF_nios.c
22-
C_SRCS += $(FPGA_COMMON_DIR)/src/ad936x_helpers.c
23-
C_SRCS += $(FPGA_COMMON_DIR)/src/bladerf2_common.c
24-
C_SRCS += $(BLADERF_COMMON_DIR)/src/devices_rfic.c
25-
C_SRCS += $(BLADERF_COMMON_DIR)/src/devices_rfic_queue.c
26-
C_SRCS += $(BLADERF_COMMON_DIR)/src/pkt_retune2.c
27-
C_SRCS += $(HOST_COMMON_DIR)/src/range.c
28-
29-
CFLAGS += -DBOARD_BLADERF_MICRO
7+
FPGA_COMMON_DIR := ../../../../../../fpga_common
8+
LIBBLADERF_DIR := ../../../../../../host/libraries/libbladeRF
9+
BLADERF_COMMON_DIR := ../../../common/bladerf/software/bladeRF_nios
10+
HOST_COMMON_DIR := ../../../../../../host/common
11+
FIRMWARE_COMMON_DIR := ../../../../../../firmware_common
12+
13+
QUARTUS_WORKDIR := ../../../../../quartus/${WORKDIR}
14+
NIOS_BUILD_OUTDIR := $(QUARTUS_WORKDIR)/bladeRF_nios
15+
MEM_INIT_DIR := $(NIOS_BUILD_OUTDIR)/mem_init
16+
BSP_BUILD_OUTDIR := $(QUARTUS_WORKDIR)/bladeRF_nios_bsp
17+
QUARTUS_OUTDIR := $(QUARTUS_WORKDIR)/output_files
18+
19+
ALT_INCLUDE_DIRS += ./src
20+
21+
C_SRCS += ./src/bladeRF_nios.c
22+
C_SRCS += $(FPGA_COMMON_DIR)/src/ad936x_helpers.c
23+
C_SRCS += $(FPGA_COMMON_DIR)/src/bladerf2_common.c
24+
C_SRCS += $(BLADERF_COMMON_DIR)/src/devices_rfic.c
25+
C_SRCS += $(BLADERF_COMMON_DIR)/src/devices_rfic_queue.c
26+
C_SRCS += $(BLADERF_COMMON_DIR)/src/pkt_retune2.c
27+
C_SRCS += $(HOST_COMMON_DIR)/src/range.c
28+
29+
CFLAGS += -DBOARD_BLADERF_MICRO
3030

3131
# libad936x build configuration and lib inclusion
3232
# These variables need to be set before including the common Makefile.
33-
LIBAD936X_BUILDDIR := $(QUARTUS_WORKDIR)/libad936x
34-
LIBAD936X_DIR := ../../../../fpga/ip/analogdevicesinc/no_OS
33+
LIBAD936X_BUILDDIR := $(QUARTUS_WORKDIR)/libad936x
34+
LIBAD936X_DIR := ../../../../fpga/ip/analogdevicesinc/no_OS
3535

36-
INC_DIRS += $(LIBAD936X_BUILDDIR) \
37-
../$(LIBAD936X_DIR)/include \
38-
../../../../../../host/common/include
36+
INC_DIRS += $(LIBAD936X_BUILDDIR) \
37+
../$(LIBAD936X_DIR)/include \
38+
../../../../../../host/common/include
3939

40-
LIB_DIRS += $(LIBAD936X_BUILDDIR)
41-
LDDEPS += $(LIBAD936X_BUILDDIR)/libad936x.a
42-
LIBS += ad936x
40+
LIB_DIRS += $(LIBAD936X_BUILDDIR)
41+
LDDEPS += $(LIBAD936X_BUILDDIR)/libad936x.a
42+
LIBS += ad936x
4343

4444
#------------------------------------------------------------------------------
4545
# INCLUDE THE COMMON MAKEFILE
@@ -56,12 +56,12 @@ include $(BLADERF_COMMON_DIR)/Makefile
5656
# - make: do the actual compile, generate libad936x.a
5757

5858
# if any source file changes, re-run cmake so that patching, etc, occurs
59-
LIBAD936X_MAKE_DEP := ../../../../ip/analogdevicesinc/no_OS/CMakeLists.txt \
60-
../../../../../../thirdparty/analogdevicesinc/no-OS/ad9361/sw/* \
61-
../../../../../../thirdparty/analogdevicesinc/no-OS_local/patches/* \
62-
../../../../../../thirdparty/analogdevicesinc/no-OS_local/platform_bladerf2_headless/*
59+
LIBAD936X_MAKE_DEP := ../../../../ip/analogdevicesinc/no_OS/CMakeLists.txt \
60+
../../../../../../thirdparty/analogdevicesinc/no-OS/ad9361/sw/* \
61+
../../../../../../thirdparty/analogdevicesinc/no-OS_local/patches/* \
62+
../../../../../../thirdparty/analogdevicesinc/no-OS_local/platform_bladerf2_headless/*
6363

64-
LIBAD936X_BUILD_DEP := $(LIBAD936X_BUILDDIR)/Makefile
64+
LIBAD936X_BUILD_DEP := $(LIBAD936X_BUILDDIR)/Makefile
6565

6666
# override clean_libs to ensure libad936x gets cleaned
6767
clean_libs: $(LIB_CLEAN_TARGETS) clean_libad936x

hdl/fpga/platforms/bladerf/software/bladeRF_nios/Makefile

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,26 @@
22
# VARIABLES TO BE DEFINED BY PLATFORM MAKEFILE
33
#------------------------------------------------------------------------------
44

5-
FPGA_COMMON_DIR := ../../../../../../fpga_common
6-
LIBBLADERF_DIR := ../../../../../../host/libraries/libbladeRF
7-
BLADERF_COMMON_DIR := ../../../common/bladerf/software/bladeRF_nios
8-
HOST_COMMON_DIR := ../../../../../../host/common
9-
FIRMWARE_COMMON_DIR := ../../../../../../firmware_common
5+
FPGA_COMMON_DIR := ../../../../../../fpga_common
6+
LIBBLADERF_DIR := ../../../../../../host/libraries/libbladeRF
7+
BLADERF_COMMON_DIR := ../../../common/bladerf/software/bladeRF_nios
8+
HOST_COMMON_DIR := ../../../../../../host/common
9+
FIRMWARE_COMMON_DIR := ../../../../../../firmware_common
1010

11-
QUARTUS_WORKDIR := ../../../../../quartus/${WORKDIR}
12-
NIOS_BUILD_OUTDIR := $(QUARTUS_WORKDIR)/bladeRF_nios
13-
MEM_INIT_DIR := $(NIOS_BUILD_OUTDIR)/mem_init
14-
BSP_BUILD_OUTDIR := $(QUARTUS_WORKDIR)/bladeRF_nios_bsp
15-
QUARTUS_OUTDIR := $(QUARTUS_WORKDIR)/output_files
11+
QUARTUS_WORKDIR := ../../../../../quartus/${WORKDIR}
12+
NIOS_BUILD_OUTDIR := $(QUARTUS_WORKDIR)/bladeRF_nios
13+
MEM_INIT_DIR := $(NIOS_BUILD_OUTDIR)/mem_init
14+
BSP_BUILD_OUTDIR := $(QUARTUS_WORKDIR)/bladeRF_nios_bsp
15+
QUARTUS_OUTDIR := $(QUARTUS_WORKDIR)/output_files
1616

17-
ALT_INCLUDE_DIRS += ./src
17+
ALT_INCLUDE_DIRS += ./src
1818

19-
C_SRCS += ./src/bladeRF_nios.c
20-
C_SRCS += $(FPGA_COMMON_DIR)/src/lms.c
21-
C_SRCS += $(FPGA_COMMON_DIR)/src/band_select.c
22-
C_SRCS += $(BLADERF_COMMON_DIR)/src/pkt_retune.c
19+
C_SRCS += ./src/bladeRF_nios.c
20+
C_SRCS += $(FPGA_COMMON_DIR)/src/lms.c
21+
C_SRCS += $(FPGA_COMMON_DIR)/src/band_select.c
22+
C_SRCS += $(BLADERF_COMMON_DIR)/src/pkt_retune.c
2323

24-
CFLAGS += -DBOARD_BLADERF
24+
CFLAGS += -DBOARD_BLADERF
2525

2626
#------------------------------------------------------------------------------
2727
# INCLUDE THE COMMON MAKEFILE

0 commit comments

Comments
 (0)