From 1165cf71a86238d396a0615984b9d63d49ffbb1e Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Tue, 19 Jul 2011 14:26:39 -0700
Subject: fpga: save the N2XX bit files into the images build

---
 images/Makefile | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/images/Makefile b/images/Makefile
index 04d828b60..c24f5e6c7 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -33,6 +33,7 @@ IMAGES_LIST =
 ##little rule to make the images directory
 $(BUILT_IMAGES_DIR):
 	mkdir $@
+	mkdir $@/bit
 
 GLOBAL_DEPS = $(BUILT_IMAGES_DIR)
 
@@ -152,13 +153,17 @@ ifdef HAS_XTCLSH
 
 _usrp_n200_r3_fpga_dir = $(TOP_FPGA_DIR)/usrp2/top/N2x0
 _usrp_n200_r3_fpga_bin = $(BUILT_IMAGES_DIR)/usrp_n200_r3_fpga.bin
-IMAGES_LIST += $(_usrp_n200_r3_fpga_bin)
+_usrp_n200_r3_fpga_bit = $(BUILT_IMAGES_DIR)/bit/usrp_n200_r3_fpga.bit
+IMAGES_LIST += $(_usrp_n200_r3_fpga_bin) $(_usrp_n200_r3_fpga_bit)
 
 $(_usrp_n200_r3_fpga_bin): $(GLOBAL_DEPS)
 	cd $(_usrp_n200_r3_fpga_dir) && make -f Makefile.N200R3 clean
 	cd $(_usrp_n200_r3_fpga_dir) && make -f Makefile.N200R3 bin
 	cp $(_usrp_n200_r3_fpga_dir)/build-N200R3/u2plus.bin $@
 
+$(_usrp_n200_r3_fpga_bit): $(_usrp_n200_r3_fpga_bin)
+	cp $(_usrp_n200_r3_fpga_dir)/build-N200R3/u2plus.bit $@
+
 #its called r2 on the silkscreen, so make an r2
 _usrp_n200_r2_fpga_bin = $(BUILT_IMAGES_DIR)/usrp_n200_r2_fpga.bin
 IMAGES_LIST += $(_usrp_n200_r2_fpga_bin)
@@ -174,13 +179,17 @@ ifdef HAS_XTCLSH
 
 _usrp_n210_r3_fpga_dir = $(TOP_FPGA_DIR)/usrp2/top/N2x0
 _usrp_n210_r3_fpga_bin = $(BUILT_IMAGES_DIR)/usrp_n210_r3_fpga.bin
-IMAGES_LIST += $(_usrp_n210_r3_fpga_bin)
+_usrp_n210_r3_fpga_bit = $(BUILT_IMAGES_DIR)/bit/usrp_n210_r3_fpga.bit
+IMAGES_LIST += $(_usrp_n210_r3_fpga_bin) $(_usrp_n210_r3_fpga_bit)
 
 $(_usrp_n210_r3_fpga_bin): $(GLOBAL_DEPS)
 	cd $(_usrp_n210_r3_fpga_dir) && make -f Makefile.N210R3 clean
 	cd $(_usrp_n210_r3_fpga_dir) && make -f Makefile.N210R3 bin
 	cp $(_usrp_n210_r3_fpga_dir)/build-N210R3/u2plus.bin $@
 
+$(_usrp_n210_r3_fpga_bit): $(_usrp_n210_r3_fpga_bin)
+	cp $(_usrp_n210_r3_fpga_dir)/build-N210R3/u2plus.bit $@
+
 #its called r2 on the silkscreen, so make an r2
 _usrp_n210_r2_fpga_bin = $(BUILT_IMAGES_DIR)/usrp_n210_r2_fpga.bin
 IMAGES_LIST += $(_usrp_n210_r2_fpga_bin)
@@ -196,13 +205,17 @@ ifdef HAS_XTCLSH
 
 _usrp_n200_r4_fpga_dir = $(TOP_FPGA_DIR)/usrp2/top/N2x0
 _usrp_n200_r4_fpga_bin = $(BUILT_IMAGES_DIR)/usrp_n200_r4_fpga.bin
-IMAGES_LIST += $(_usrp_n200_r4_fpga_bin)
+_usrp_n200_r4_fpga_bit = $(BUILT_IMAGES_DIR)/bit/usrp_n200_r4_fpga.bit
+IMAGES_LIST += $(_usrp_n200_r4_fpga_bin) $(_usrp_n200_r4_fpga_bit)
 
 $(_usrp_n200_r4_fpga_bin): $(GLOBAL_DEPS)
 	cd $(_usrp_n200_r4_fpga_dir) && make -f Makefile.N200R4 clean
 	cd $(_usrp_n200_r4_fpga_dir) && make -f Makefile.N200R4 bin
 	cp $(_usrp_n200_r4_fpga_dir)/build-N200R4/u2plus.bin $@
 
+$(_usrp_n200_r4_fpga_bit): $(_usrp_n200_r4_fpga_bin)
+	cp $(_usrp_n200_r4_fpga_dir)/build-N200R4/u2plus.bit $@
+
 endif
 
 ########################################################################
@@ -212,13 +225,17 @@ ifdef HAS_XTCLSH
 
 _usrp_n210_r4_fpga_dir = $(TOP_FPGA_DIR)/usrp2/top/N2x0
 _usrp_n210_r4_fpga_bin = $(BUILT_IMAGES_DIR)/usrp_n210_r4_fpga.bin
-IMAGES_LIST += $(_usrp_n210_r4_fpga_bin)
+_usrp_n210_r4_fpga_bit = $(BUILT_IMAGES_DIR)/bit/usrp_n210_r4_fpga.bit
+IMAGES_LIST += $(_usrp_n210_r4_fpga_bin) $(_usrp_n210_r4_fpga_bit)
 
 $(_usrp_n210_r4_fpga_bin): $(GLOBAL_DEPS)
 	cd $(_usrp_n210_r4_fpga_dir) && make -f Makefile.N210R4 clean
 	cd $(_usrp_n210_r4_fpga_dir) && make -f Makefile.N210R4 bin
 	cp $(_usrp_n210_r4_fpga_dir)/build-N210R4/u2plus.bin $@
 
+$(_usrp_n210_r4_fpga_bit): $(_usrp_n210_r4_fpga_bin)
+	cp $(_usrp_n210_r4_fpga_dir)/build-N210R4/u2plus.bit $@
+
 endif
 
 ########################################################################
-- 
cgit v1.2.3