From ed020d7698994070edd1d6f6584e90ea3df3e0b6 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Fri, 25 Mar 2011 11:50:55 -0700 Subject: uhd: added USRP-N200 build support to images Makefile --- images/Makefile | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) (limited to 'images/Makefile') diff --git a/images/Makefile b/images/Makefile index cfc783ee4..652b127d8 100644 --- a/images/Makefile +++ b/images/Makefile @@ -90,16 +90,18 @@ ifdef HAS_ZPU_GCC _usrp2_fw_dir = $(TOP_FW_DIR)/zpu _usrp2_fw_bin = $(BUILT_IMAGES_DIR)/usrp2_fw.bin -_usrp_n2xx_fw_bin = $(BUILT_IMAGES_DIR)/usrp_n2xx_fw.bin -IMAGES_LIST += $(_usrp2_fw_bin) +_usrp_n200_fw_bin = $(BUILT_IMAGES_DIR)/usrp_n200_fw.bin +_usrp_n210_fw_bin = $(BUILT_IMAGES_DIR)/usrp_n210_fw.bin +IMAGES_LIST += $(_usrp2_fw_bin) $(_usrp_n200_fw_bin) $(_usrp_n210_fw_bin) -$(_usrp2_fw_bin) $(_usrp_n2xx_fw_bin): $(GLOBAL_DEPS) +$(_usrp2_fw_bin) $(_usrp_n200_fw_bin) $(_usrp_n210_fw_bin): $(GLOBAL_DEPS) cd $(_usrp2_fw_dir) && rm -rf build cd $(_usrp2_fw_dir) && mkdir build cd $(_usrp2_fw_dir)/build && cmake ../ cd $(_usrp2_fw_dir)/build && make cp $(_usrp2_fw_dir)/build/usrp2/usrp2_txrx_uhd.bin $(_usrp2_fw_bin) - cp $(_usrp2_fw_dir)/build/usrp2p/usrp2p_txrx_uhd.bin $(_usrp_n2xx_fw_bin) + cp $(_usrp2_fw_dir)/build/usrp2p/usrp2p_txrx_uhd.bin $(_usrp_n200_fw_bin) + cp $(_usrp2_fw_dir)/build/usrp2p/usrp2p_txrx_uhd.bin $(_usrp_n210_fw_bin) endif @@ -119,6 +121,22 @@ $(_usrp2_fpga_bin): $(GLOBAL_DEPS) endif +######################################################################## +# USRP-N200 fpga +######################################################################## +ifdef HAS_XTCLSH + +_usrp_n200_fpga_dir = $(TOP_FPGA_DIR)/usrp2/top/u2plus +_usrp_n200_fpga_bin = $(BUILT_IMAGES_DIR)/usrp_n200_fpga.bin +IMAGES_LIST += $(_usrp_n210_fpga_bin) + +$(_usrp_n200_fpga_bin): $(GLOBAL_DEPS) + cd $(_usrp_n200_fpga_dir) && make -f Makefile.N200 clean + cd $(_usrp_n200_fpga_dir) && make -f Makefile.N200 bin + cp $(_usrp_n200_fpga_dir)/build-N200/u2plus.bin $@ + +endif + ######################################################################## # USRP-N210 fpga ######################################################################## -- cgit v1.2.3 From 8a14b6c26f88aadf9d077798a7888badfde95587 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Fri, 25 Mar 2011 13:42:53 -0700 Subject: usrp2: modified firmware build rules to chain the dependencies (better for make -j4) --- images/Makefile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'images/Makefile') diff --git a/images/Makefile b/images/Makefile index 652b127d8..cadf4b71f 100644 --- a/images/Makefile +++ b/images/Makefile @@ -94,14 +94,18 @@ _usrp_n200_fw_bin = $(BUILT_IMAGES_DIR)/usrp_n200_fw.bin _usrp_n210_fw_bin = $(BUILT_IMAGES_DIR)/usrp_n210_fw.bin IMAGES_LIST += $(_usrp2_fw_bin) $(_usrp_n200_fw_bin) $(_usrp_n210_fw_bin) -$(_usrp2_fw_bin) $(_usrp_n200_fw_bin) $(_usrp_n210_fw_bin): $(GLOBAL_DEPS) +$(_usrp2_fw_bin): $(GLOBAL_DEPS) cd $(_usrp2_fw_dir) && rm -rf build cd $(_usrp2_fw_dir) && mkdir build cd $(_usrp2_fw_dir)/build && cmake ../ cd $(_usrp2_fw_dir)/build && make - cp $(_usrp2_fw_dir)/build/usrp2/usrp2_txrx_uhd.bin $(_usrp2_fw_bin) - cp $(_usrp2_fw_dir)/build/usrp2p/usrp2p_txrx_uhd.bin $(_usrp_n200_fw_bin) - cp $(_usrp2_fw_dir)/build/usrp2p/usrp2p_txrx_uhd.bin $(_usrp_n210_fw_bin) + cp $(_usrp2_fw_dir)/build/usrp2/usrp2_txrx_uhd.bin $@ + +$(_usrp_n200_fw_bin): $(_usrp2_fw_bin) + cp $(_usrp2_fw_dir)/build/usrp2p/usrp2p_txrx_uhd.bin $@ + +$(_usrp_n210_fw_bin): $(_usrp2_fw_bin) + cp $(_usrp2_fw_dir)/build/usrp2p/usrp2p_txrx_uhd.bin $@ endif -- cgit v1.2.3 From 9a52bc09e3561365c4600fdb9d3df172da014554 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Fri, 25 Mar 2011 16:07:26 -0700 Subject: usrp2: fix typo, now building n200 fpga images --- images/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'images/Makefile') diff --git a/images/Makefile b/images/Makefile index cadf4b71f..74b1cd6e4 100644 --- a/images/Makefile +++ b/images/Makefile @@ -132,7 +132,7 @@ ifdef HAS_XTCLSH _usrp_n200_fpga_dir = $(TOP_FPGA_DIR)/usrp2/top/u2plus _usrp_n200_fpga_bin = $(BUILT_IMAGES_DIR)/usrp_n200_fpga.bin -IMAGES_LIST += $(_usrp_n210_fpga_bin) +IMAGES_LIST += $(_usrp_n200_fpga_bin) $(_usrp_n200_fpga_bin): $(GLOBAL_DEPS) cd $(_usrp_n200_fpga_dir) && make -f Makefile.N200 clean -- cgit v1.2.3 From 9f72695e33093498e5957900e97817b78dba76c3 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Thu, 31 Mar 2011 12:30:31 -0700 Subject: uhd: added UHD_IMAGES_DIR option to include images in the package --- host/CMakeLists.txt | 9 +++++++++ images/Makefile | 18 +----------------- 2 files changed, 10 insertions(+), 17 deletions(-) (limited to 'images/Makefile') diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index 244793b9e..97b084572 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt @@ -207,6 +207,15 @@ ENDIF(ENABLE_UTILS) ADD_SUBDIRECTORY(usrp_e_utils) +######################################################################## +# Handle pre-built images +######################################################################## +IF(DEFINED UHD_IMAGES_DIR AND EXISTS "${UHD_IMAGES_DIR}") + FILE(GLOB _image_files "${UHD_IMAGES_DIR}/*.*") + MESSAGE(STATUS "Using images: ${_image_files}") + INSTALL(FILES ${_image_files} DESTINATION ${PKG_DATA_DIR}/images) +ENDIF(DEFINED UHD_IMAGES_DIR AND EXISTS "${UHD_IMAGES_DIR}") + ######################################################################## # Print Summary ######################################################################## diff --git a/images/Makefile b/images/Makefile index 74b1cd6e4..71b46d14e 100644 --- a/images/Makefile +++ b/images/Makefile @@ -1,5 +1,5 @@ # -# Copyright 2010 Ettus Research LLC +# Copyright 2010-2011 Ettus Research LLC # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -198,19 +198,3 @@ images: $(IMAGES_LIST) clean: $(RM) -rf $(BUILT_IMAGES_DIR) $(RM) -rf $(CMAKE_BUILD_DIR) - -#packages that a linux machine can build -linux-packages: - mkdir -p $(CMAKE_BUILD_DIR) - - cd $(CMAKE_BUILD_DIR) && cmake -DCPACK_GENERATOR=TGZ $(TOP_DIR) - make -C $(CMAKE_BUILD_DIR) package - - cd $(CMAKE_BUILD_DIR) && cmake -DCPACK_GENERATOR=ZIP $(TOP_DIR) - make -C $(CMAKE_BUILD_DIR) package - - cd $(CMAKE_BUILD_DIR) && cmake -DCPACK_GENERATOR=DEB $(TOP_DIR) - make -C $(CMAKE_BUILD_DIR) package - - cd $(CMAKE_BUILD_DIR) && cmake -DCPACK_GENERATOR=RPM $(TOP_DIR) - make -C $(CMAKE_BUILD_DIR) package -- cgit v1.2.3