aboutsummaryrefslogtreecommitdiffstats
path: root/firmware/usrp2
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/usrp2')
-rw-r--r--firmware/usrp2/CMakeLists.txt68
-rw-r--r--firmware/usrp2/lib/CMakeLists.txt2
-rw-r--r--firmware/usrp2/usrp2/CMakeLists.txt16
-rw-r--r--firmware/usrp2/usrp2p/CMakeLists.txt18
-rw-r--r--firmware/usrp2/usrp2p/bootloader/CMakeLists.txt22
5 files changed, 63 insertions, 63 deletions
diff --git a/firmware/usrp2/CMakeLists.txt b/firmware/usrp2/CMakeLists.txt
index 80fd074bd..693fbf9c3 100644
--- a/firmware/usrp2/CMakeLists.txt
+++ b/firmware/usrp2/CMakeLists.txt
@@ -18,19 +18,19 @@
########################################################################
# setup project and compiler
########################################################################
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+cmake_minimum_required(VERSION 2.6)
#force the compiler because the check wont use the special flag below
-INCLUDE(CMakeForceCompiler)
-SET(CMAKE_SYSTEM_NAME Generic)
+include(CMakeForceCompiler)
+set(CMAKE_SYSTEM_NAME Generic)
CMAKE_FORCE_C_COMPILER(zpu-elf-gcc GNU)
-PROJECT(USRP_NXXX_FW C)
+project(USRP_NXXX_FW C)
########################################################################
# lwIP header include dirs
########################################################################
-SET(LWIPDIR ${CMAKE_SOURCE_DIR}/lwip/lwip-1.3.1)
+set(LWIPDIR ${CMAKE_SOURCE_DIR}/lwip/lwip-1.3.1)
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}/lwip
${CMAKE_SOURCE_DIR}/lwip_port
${LWIPDIR}/src/include
@@ -40,16 +40,16 @@ INCLUDE_DIRECTORIES(
########################################################################
# misc flags for the gcc compiler
########################################################################
-SET(CMAKE_C_FLAGS -phi) #always needed compile time and link time
-ADD_DEFINITIONS(-Os)
-ADD_DEFINITIONS(--std=gnu99)
-ADD_DEFINITIONS(-Wall)
-ADD_DEFINITIONS(-Werror-implicit-function-declaration)
-ADD_DEFINITIONS(-ffunction-sections)
+set(CMAKE_C_FLAGS -phi) #always needed compile time and link time
+add_definitions(-Os)
+add_definitions(--std=gnu99)
+add_definitions(-Wall)
+add_definitions(-Werror-implicit-function-declaration)
+add_definitions(-ffunction-sections)
-MACRO(ADD_LINKER_FLAGS flags)
- SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${flags}")
-ENDMACRO(ADD_LINKER_FLAGS)
+macro(ADD_LINKER_FLAGS flags)
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${flags}")
+endmacro(ADD_LINKER_FLAGS)
ADD_LINKER_FLAGS("-Wl,--gc-sections")
ADD_LINKER_FLAGS("-Wl,--relax")
@@ -57,13 +57,13 @@ ADD_LINKER_FLAGS("-Wl,--relax")
########################################################################
# define for the hal io (FIXME move?)
########################################################################
-#ADD_DEFINITIONS(-DHAL_IO_USES_DBOARD_PINS)
-ADD_DEFINITIONS(-DHAL_IO_USES_UART)
+#add_definitions(-DHAL_IO_USES_DBOARD_PINS)
+add_definitions(-DHAL_IO_USES_UART)
########################################################################
# common cflags and ldflags
########################################################################
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}/../../host/lib/usrp
${CMAKE_SOURCE_DIR}/lib
)
@@ -71,52 +71,52 @@ INCLUDE_DIRECTORIES(
########################################################################
# setup programs for output files
########################################################################
-FIND_PROGRAM(LINKER zpu-elf-ld)
-FIND_PROGRAM(OBJCOPY zpu-elf-objcopy)
-FIND_PROGRAM(OBJDUMP zpu-elf-objdump)
-FIND_PROGRAM(HEXDUMP hexdump)
+find_program(LINKER zpu-elf-ld)
+find_program(OBJCOPY zpu-elf-objcopy)
+find_program(OBJDUMP zpu-elf-objdump)
+find_program(HEXDUMP hexdump)
########################################################################
# helper functions to build output formats
########################################################################
-SET(GEN_OUTPUTS_BIN_SIZE "bin_size_not_set") #set before calling
-MACRO(GEN_OUTPUTS target)
- GET_FILENAME_COMPONENT(name ${target} NAME_WE)
+set(GEN_OUTPUTS_BIN_SIZE "bin_size_not_set") #set before calling
+macro(GEN_OUTPUTS target)
+ get_filename_component(name ${target} NAME_WE)
#command to create a map from elf
- ADD_CUSTOM_COMMAND(
+ add_custom_command(
OUTPUT ${name}.map DEPENDS ${target}
COMMAND ${LINKER} -Map ${name}.map ${target}
)
#command to create a bin from elf
- ADD_CUSTOM_COMMAND(
+ add_custom_command(
OUTPUT ${name}.bin DEPENDS ${target}
COMMAND ${OBJCOPY} -O binary ${target} ${name}.bin
--pad-to ${GEN_OUTPUTS_BIN_SIZE}
)
#command to create a ihx from elf
- ADD_CUSTOM_COMMAND(
+ add_custom_command(
OUTPUT ${name}.ihx DEPENDS ${target}
COMMAND ${OBJCOPY} -O ihex ${target} ${name}.ihx
--pad-to ${GEN_OUTPUTS_BIN_SIZE}
)
#command to create a dump from elf
- ADD_CUSTOM_COMMAND(
+ add_custom_command(
OUTPUT ${name}.dump DEPENDS ${target}
COMMAND ${OBJDUMP} -DSC ${target} > ${name}.dump
)
#command to create a rom from bin
- ADD_CUSTOM_COMMAND(
+ add_custom_command(
OUTPUT ${name}.rom DEPENDS ${name}.bin
COMMAND ${HEXDUMP} -v -e'1/1 \"%.2X\\n\"' ${name}.bin > ${name}.rom
)
#add a top level target for output files
- ADD_CUSTOM_TARGET(
+ add_custom_target(
${name}_outputs ALL DEPENDS ${name}.map ${name}.bin ${name}.ihx ${name}.dump ${name}.rom
)
-ENDMACRO(GEN_OUTPUTS)
+endmacro(GEN_OUTPUTS)
########################################################################
# Add the subdirectories
########################################################################
-ADD_SUBDIRECTORY(usrp2)
-ADD_SUBDIRECTORY(usrp2p)
+add_subdirectory(usrp2)
+add_subdirectory(usrp2p)
diff --git a/firmware/usrp2/lib/CMakeLists.txt b/firmware/usrp2/lib/CMakeLists.txt
index ce6b7fa44..7d83ddb4b 100644
--- a/firmware/usrp2/lib/CMakeLists.txt
+++ b/firmware/usrp2/lib/CMakeLists.txt
@@ -16,7 +16,7 @@
#
########################################################################
-SET(COMMON_SRCS
+set(COMMON_SRCS
${CMAKE_SOURCE_DIR}/lib/u2_init.c
${CMAKE_SOURCE_DIR}/lib/abort.c
${CMAKE_SOURCE_DIR}/lib/ad9510.c
diff --git a/firmware/usrp2/usrp2/CMakeLists.txt b/firmware/usrp2/usrp2/CMakeLists.txt
index 3662532f1..1cbbd1e7c 100644
--- a/firmware/usrp2/usrp2/CMakeLists.txt
+++ b/firmware/usrp2/usrp2/CMakeLists.txt
@@ -16,22 +16,22 @@
#
########################################################################
-INCLUDE(${CMAKE_SOURCE_DIR}/lib/CMakeLists.txt)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+include(${CMAKE_SOURCE_DIR}/lib/CMakeLists.txt)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-ADD_DEFINITIONS(-DUSRP2)
-ADD_DEFINITIONS(-DUDP_UART_MASK=0)
+add_definitions(-DUSRP2)
+add_definitions(-DUDP_UART_MASK=0)
-ADD_LIBRARY(libusrp2fw STATIC
+add_library(libusrp2fw STATIC
${COMMON_SRCS}
sd.c
ethernet.c
)
########################################################################
-SET(GEN_OUTPUTS_BIN_SIZE 0x3fff)
+set(GEN_OUTPUTS_BIN_SIZE 0x3fff)
-ADD_EXECUTABLE(usrp2_txrx_uhd.elf ${CMAKE_SOURCE_DIR}/apps/txrx_uhd.c)
-TARGET_LINK_LIBRARIES(usrp2_txrx_uhd.elf libusrp2fw)
+add_executable(usrp2_txrx_uhd.elf ${CMAKE_SOURCE_DIR}/apps/txrx_uhd.c)
+target_link_libraries(usrp2_txrx_uhd.elf libusrp2fw)
GEN_OUTPUTS(usrp2_txrx_uhd.elf)
diff --git a/firmware/usrp2/usrp2p/CMakeLists.txt b/firmware/usrp2/usrp2p/CMakeLists.txt
index 4cb663742..d83e9e84c 100644
--- a/firmware/usrp2/usrp2p/CMakeLists.txt
+++ b/firmware/usrp2/usrp2p/CMakeLists.txt
@@ -16,13 +16,13 @@
#
########################################################################
-INCLUDE(${CMAKE_SOURCE_DIR}/lib/CMakeLists.txt)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+include(${CMAKE_SOURCE_DIR}/lib/CMakeLists.txt)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-ADD_DEFINITIONS(-DUSRP2P)
-ADD_DEFINITIONS(-DUDP_UART_MASK=4) #GPS=UART2 streaming enabled
+add_definitions(-DUSRP2P)
+add_definitions(-DUDP_UART_MASK=4) #GPS=UART2 streaming enabled
-ADD_LIBRARY(libusrp2pfw STATIC
+add_library(libusrp2pfw STATIC
${COMMON_SRCS}
spif.c
spi_flash.c
@@ -34,12 +34,12 @@ ADD_LIBRARY(libusrp2pfw STATIC
u2p_init.c
)
-ADD_SUBDIRECTORY(bootloader)
+add_subdirectory(bootloader)
########################################################################
-SET(GEN_OUTPUTS_BIN_SIZE 0x3fff)
+set(GEN_OUTPUTS_BIN_SIZE 0x3fff)
-ADD_EXECUTABLE(usrp2p_txrx_uhd.elf ${CMAKE_SOURCE_DIR}/apps/txrx_uhd.c)
-TARGET_LINK_LIBRARIES(usrp2p_txrx_uhd.elf libusrp2pfw)
+add_executable(usrp2p_txrx_uhd.elf ${CMAKE_SOURCE_DIR}/apps/txrx_uhd.c)
+target_link_libraries(usrp2p_txrx_uhd.elf libusrp2pfw)
GEN_OUTPUTS(usrp2p_txrx_uhd.elf)
diff --git a/firmware/usrp2/usrp2p/bootloader/CMakeLists.txt b/firmware/usrp2/usrp2p/bootloader/CMakeLists.txt
index 07f234302..86a3b0e5c 100644
--- a/firmware/usrp2/usrp2p/bootloader/CMakeLists.txt
+++ b/firmware/usrp2/usrp2p/bootloader/CMakeLists.txt
@@ -16,27 +16,27 @@
#
########################################################################
-INCLUDE(FindPythonInterp)
+include(FindPythonInterp)
-MACRO(GEN_RMI target)
- GET_FILENAME_COMPONENT(name ${target} NAME_WE)
+macro(GEN_RMI target)
+ get_filename_component(name ${target} NAME_WE)
#command to create a rmi from elf
- ADD_CUSTOM_COMMAND(
+ add_custom_command(
OUTPUT ${name}.rmi DEPENDS ${name}.bin
COMMAND ${PYTHON_EXECUTABLE}
${CMAKE_SOURCE_DIR}/bin/bin_to_ram_macro_init.py ${name}.bin ${name}.rmi
)
#add a top level target for output files
- ADD_CUSTOM_TARGET(
+ add_custom_target(
${name}_rmi ALL DEPENDS ${name}.rmi
)
-ENDMACRO(GEN_RMI)
+endmacro(GEN_RMI)
########################################################################
-ADD_EXECUTABLE(bootloader.elf ${CMAKE_SOURCE_DIR}/apps/txrx_uhd.c)
-ADD_DEFINITIONS(-DUSRP2P)
-ADD_DEFINITIONS(-DBOOTLOADER)
-TARGET_LINK_LIBRARIES(bootloader.elf libusrp2pfw)
-SET(GEN_OUTPUTS_BIN_SIZE 0x3fff)
+add_executable(bootloader.elf ${CMAKE_SOURCE_DIR}/apps/txrx_uhd.c)
+add_definitions(-DUSRP2P)
+add_definitions(-DBOOTLOADER)
+target_link_libraries(bootloader.elf libusrp2pfw)
+set(GEN_OUTPUTS_BIN_SIZE 0x3fff)
GEN_OUTPUTS(bootloader.elf)
GEN_RMI(bootloader.bin)
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-04 04:04:42 +0000