From 3e214cb7ba3a80495db77c4f92132c4497667a69 Mon Sep 17 00:00:00 2001
From: JohnOrlando
Date: Tue, 30 Mar 2010 20:30:09 -0500
Subject: Fixed issue with with wrong Makefile.am files being copied

---
 usrp2/firmware/lib/Makefile.am | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

(limited to 'usrp2/firmware/lib/Makefile.am')

diff --git a/usrp2/firmware/lib/Makefile.am b/usrp2/firmware/lib/Makefile.am
index 0a7d5c39b..0069c93eb 100644
--- a/usrp2/firmware/lib/Makefile.am
+++ b/usrp2/firmware/lib/Makefile.am
@@ -20,6 +20,7 @@ include $(top_srcdir)/Makefile.common
 noinst_LIBRARIES = \
 	libu2fw.a \
 	libu2fw_wbx.a \
+	libu2fw_burx.a \
 	libu2fw_xcvr.a
 
 
@@ -99,6 +100,41 @@ libu2fw_wbx_a_SOURCES = \
 	spi.c \
 	u2_init.c	
 
+libu2fw_burx_a_SOURCES = \
+	abort.c \
+	ad9510.c \
+	ad9777.c \
+	bsm12.c \
+	buffer_pool.c \
+	clocks.c \
+	db_basic.c \
+	db_bitshark_rx.c \
+	db_init_bitshark_rx.c \
+	dbsm.c \
+	eeprom.c \
+	ethernet.c \
+	eth_mac.c \
+	_exit.c \
+	exit.c \
+	hal_io.c \
+	hal_uart.c \
+	i2c.c \
+	lsadc.c \
+	lsdac.c \
+	mdelay.c \
+	memcpy_wa.c \
+	memset_wa.c \
+	nonstdio.c \
+	pic.c \
+	print_mac_addr.c \
+	print_rmon_regs.c \
+	print_fxpt.c \
+	print_buffer.c \
+	printf.c \
+	sd.c \
+	spi.c \
+	u2_init.c
+
 libu2fw_xcvr_a_SOURCES = \
 	abort.c \
 	ad9510.c \
@@ -149,6 +185,7 @@ noinst_HEADERS = \
 	db.h \
 	db_base.h \
 	db_wbxng.h \
+	db_bitshark_rx.h
 	dbsm.h \
 	eth_mac.h \
 	eth_mac_regs.h \
-- 
cgit 


From 22a3ed8955a9d40796d58e83993b5f56f117a27a Mon Sep 17 00:00:00 2001
From: JohnOrlando
Date: Mon, 17 May 2010 16:15:49 -0500
Subject: -Updated to allow BURX support to be built into standard txrx.bin
 image -Also corrected db_bitshark_rx.c to the current version (previous git
 push error) that includes the needed delays after I2C commands

---
 usrp2/firmware/lib/Makefile.am | 38 +-------------------------------------
 1 file changed, 1 insertion(+), 37 deletions(-)

(limited to 'usrp2/firmware/lib/Makefile.am')

diff --git a/usrp2/firmware/lib/Makefile.am b/usrp2/firmware/lib/Makefile.am
index 0069c93eb..84e0c9440 100644
--- a/usrp2/firmware/lib/Makefile.am
+++ b/usrp2/firmware/lib/Makefile.am
@@ -20,20 +20,18 @@ include $(top_srcdir)/Makefile.common
 noinst_LIBRARIES = \
 	libu2fw.a \
 	libu2fw_wbx.a \
-	libu2fw_burx.a \
 	libu2fw_xcvr.a
 
 
 libu2fw_a_SOURCES = \
 	abort.c \
 	ad9510.c \
-	adf4350.c \
-	adf4350_regs.c \
 	ad9777.c \
 	bsm12.c \
 	buffer_pool.c \
 	clocks.c \
 	db_basic.c \
+	db_bitshark_rx.c \
 	db_dbsrx.c \
 	db_rfx.c \
 	db_tvrx.c \
@@ -100,40 +98,6 @@ libu2fw_wbx_a_SOURCES = \
 	spi.c \
 	u2_init.c	
 
-libu2fw_burx_a_SOURCES = \
-	abort.c \
-	ad9510.c \
-	ad9777.c \
-	bsm12.c \
-	buffer_pool.c \
-	clocks.c \
-	db_basic.c \
-	db_bitshark_rx.c \
-	db_init_bitshark_rx.c \
-	dbsm.c \
-	eeprom.c \
-	ethernet.c \
-	eth_mac.c \
-	_exit.c \
-	exit.c \
-	hal_io.c \
-	hal_uart.c \
-	i2c.c \
-	lsadc.c \
-	lsdac.c \
-	mdelay.c \
-	memcpy_wa.c \
-	memset_wa.c \
-	nonstdio.c \
-	pic.c \
-	print_mac_addr.c \
-	print_rmon_regs.c \
-	print_fxpt.c \
-	print_buffer.c \
-	printf.c \
-	sd.c \
-	spi.c \
-	u2_init.c
 
 libu2fw_xcvr_a_SOURCES = \
 	abort.c \
-- 
cgit