diff options
| author | Josh Blum <josh@joshknows.com> | 2010-12-14 14:04:39 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-12-14 14:04:39 -0800 |
| commit | 03d200f9484d9706535142d9cc0336fcf02b369c (patch) | |
| tree | 3888cc71786aee9fab7706a42ce2ebcb6cacf062 | |
| parent | fcfac9f3607fdc04d3624034ada2ff724a500b06 (diff) | |
| download | uhd-03d200f9484d9706535142d9cc0336fcf02b369c.tar.gz uhd-03d200f9484d9706535142d9cc0336fcf02b369c.tar.bz2 uhd-03d200f9484d9706535142d9cc0336fcf02b369c.zip | |
usrp2: updated images Makefile for the zpu gcc compiler
| -rw-r--r-- | firmware/microblaze/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | images/Makefile | 20 |
2 files changed, 10 insertions, 11 deletions
diff --git a/firmware/microblaze/CMakeLists.txt b/firmware/microblaze/CMakeLists.txt index 0b7f396c7..4344b3ab9 100644 --- a/firmware/microblaze/CMakeLists.txt +++ b/firmware/microblaze/CMakeLists.txt @@ -40,7 +40,6 @@ INCLUDE_DIRECTORIES( # misc flags for the gcc compiler ######################################################################## SET(CMAKE_C_FLAGS -abel) #always needed compile time and link time -#ADD_DEFINITIONS(-mxl-soft-div -msoft-float -mxl-soft-mul -mxl-barrel-shift) ADD_DEFINITIONS(-Os --std=gnu99 -Wall -Werror-implicit-function-declaration -ffunction-sections) MACRO(ADD_LINKER_FLAGS flags) diff --git a/images/Makefile b/images/Makefile index 27390427d..ee82ca659 100644 --- a/images/Makefile +++ b/images/Makefile @@ -37,8 +37,8 @@ ifeq ($(shell sdcc --help > /dev/null 2>&1 && echo $$?),0) HAS_SDCC=1 endif -ifeq ($(shell mb-gcc --help > /dev/null 2>&1 && echo $$?),0) - HAS_MB_GCC=1 +ifeq ($(shell zpu-elf-gcc --help > /dev/null 2>&1 && echo $$?),0) + HAS_ZPU_GCC=1 endif ifeq ($(shell xtclsh -h > /dev/null 2>&1 && echo $$?),0) @@ -78,9 +78,9 @@ $(_usrp1_fpga_4rx_rbf): cp $(_usrp1_fpga_dir)/std_4rx_0tx.rbf $@ ######################################################################## -# USRP2 and USRP-N2XX firmware +# USRP2 and N Series firmware ######################################################################## -ifdef HAS_MB_GCC +ifdef HAS_ZPU_GCC _usrp2_fw_dir = $(TOP_FW_DIR)/microblaze _usrp2_fw_bin = $(BUILT_IMAGES_DIR)/usrp2_fw.bin @@ -88,12 +88,12 @@ _usrp_n2xx_fw_bin = $(BUILT_IMAGES_DIR)/usrp_n2xx_fw.bin IMAGES_LIST += $(_usrp2_fw_bin) $(_usrp2_fw_bin) $(_usrp_n2xx_fw_bin): - cd $(_usrp2_fw_dir) && ./bootstrap - cd $(_usrp2_fw_dir) && ./configure --host=mb - make -C $(_usrp2_fw_dir) clean - make -C $(_usrp2_fw_dir) all - cp $(_usrp2_fw_dir)/usrp2/usrp2_txrx_uhd.bin $(_usrp2_fw_bin) - cp $(_usrp2_fw_dir)/usrp2p/usrp2p_txrx_uhd.bin $(_usrp_n2xx_fw_bin) + 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) endif |