From 9585a0b6fd88efd2a8bd43c8b034ae21264b9fc4 Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Wed, 27 Oct 2010 11:42:52 -0700
Subject: usrp_e: added support for building fpga image into images Makefile

---
 images/Makefile | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'images')

diff --git a/images/Makefile b/images/Makefile
index 57277e787..92379271d 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -111,6 +111,22 @@ $(_usrp2_fpga_bin):
 
 endif
 
+########################################################################
+# USRP-E100 fpga
+########################################################################
+ifdef HAS_XTCLSH
+
+_usrp_e100_fpga_dir = $(TOP_FPGA_DIR)/usrp2/top/u1e
+_usrp_e100_fpga_bin = $(BUILT_IMAGES_DIR)/usrp_e100_fpga.bin
+IMAGES_LIST += $(_usrp_e100_fpga_bin)
+
+$(_usrp_e100_fpga_bin):
+	cd $(_usrp_e100_fpga_dir) && make clean
+	cd $(_usrp_e100_fpga_dir) && make bin
+	cp $(_usrp_e100_fpga_dir)/build/u1e.bin $@
+
+endif
+
 ########################################################################
 # Build rules
 ########################################################################
-- 
cgit v1.2.3


From 92499bee52e77102612f3e3860ab60e0b84dacdb Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Tue, 23 Nov 2010 13:59:23 -0800
Subject: usrp-n210: added fpga build entry to images makefile

---
 images/Makefile | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'images')

diff --git a/images/Makefile b/images/Makefile
index 34943cc59..5a2ac6303 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -78,7 +78,7 @@ $(_usrp1_fpga_4rx_rbf):
 	cp $(_usrp1_fpga_dir)/std_4rx_0tx.rbf $@
 
 ########################################################################
-# USRP2/2+ firmware
+# USRP2 and USRP-N2XX firmware
 ########################################################################
 ifdef HAS_MB_GCC
 
@@ -113,6 +113,22 @@ $(_usrp2_fpga_bin):
 
 endif
 
+########################################################################
+# USRP-N210 fpga
+########################################################################
+ifdef HAS_XTCLSH
+
+_usrp_n210_fpga_dir = $(TOP_FPGA_DIR)/usrp2/top/u2plus
+_usrp_n210_fpga_bin = $(BUILT_IMAGES_DIR)/usrp_n210_fpga.bin
+IMAGES_LIST += $(_usrp_n210_fpga_bin)
+
+$(_usrp_n210_fpga_bin):
+	cd $(_usrp_n210_fpga_dir) && make clean
+	cd $(_usrp_n210_fpga_dir) && make bin
+	cp $(_usrp_n210_fpga_dir)/build/u2plus.bin $@
+
+endif
+
 ########################################################################
 # USRP-E100 fpga
 ########################################################################
-- 
cgit v1.2.3


From 30b223ef5e84a1eb273b06a444038c5cf8d8864a Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Tue, 23 Nov 2010 14:33:14 -0800
Subject: usrp-n2xx: modified fw build name in makefile

---
 images/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'images')

diff --git a/images/Makefile b/images/Makefile
index 5a2ac6303..228b6fb7d 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -84,16 +84,16 @@ ifdef HAS_MB_GCC
 
 _usrp2_fw_dir = $(TOP_FW_DIR)/microblaze
 _usrp2_fw_bin = $(BUILT_IMAGES_DIR)/usrp2_fw.bin
-_usrp2p_fw_bin = $(BUILT_IMAGES_DIR)/usrp2p_fw.bin
+_usrp_n2xx_fw_bin = $(BUILT_IMAGES_DIR)/usrp_n2xx_fw.bin
 IMAGES_LIST += $(_usrp2_fw_bin)
 
-$(_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 $(_usrp2p_fw_bin)
+	cp $(_usrp2_fw_dir)/usrp2p/usrp2p_txrx_uhd.bin $(_usrp_n2xx_fw_bin)
 
 endif
 
-- 
cgit v1.2.3