[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r4338 - in gnuradio/branches/developers/n4hy/ofdm2/usr
From: |
n4hy |
Subject: |
[Commit-gnuradio] r4338 - in gnuradio/branches/developers/n4hy/ofdm2/usrp/firmware/src: common usrp2 |
Date: |
Mon, 29 Jan 2007 21:25:44 -0700 (MST) |
Author: n4hy
Date: 2007-01-29 21:25:44 -0700 (Mon, 29 Jan 2007)
New Revision: 4338
Modified:
gnuradio/branches/developers/n4hy/ofdm2/usrp/firmware/src/common/Makefile.am
gnuradio/branches/developers/n4hy/ofdm2/usrp/firmware/src/usrp2/Makefile.am
Log:
update to more usrp files
Modified:
gnuradio/branches/developers/n4hy/ofdm2/usrp/firmware/src/common/Makefile.am
===================================================================
---
gnuradio/branches/developers/n4hy/ofdm2/usrp/firmware/src/common/Makefile.am
2007-01-30 04:16:35 UTC (rev 4337)
+++
gnuradio/branches/developers/n4hy/ofdm2/usrp/firmware/src/common/Makefile.am
2007-01-30 04:25:44 UTC (rev 4338)
@@ -1,5 +1,5 @@
#
-# Copyright 2003,2006 Free Software Foundation, Inc.
+# Copyright 2004 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -19,153 +19,32 @@
# Boston, MA 02110-1301, USA.
#
-firmware2dir = $(prefix)/share/usrp/rev2
-firmware2_DATA = std.ihx
-
-# we put the same stuff in the rev4 directory
-firmware4dir = $(prefix)/share/usrp/rev4
-firmware4_DATA = std.ihx
-
-EXTRA_DIST = \
- edit-gpif \
+EXTRA_DIST = \
_startup.a51 \
blink_leds.c \
- board_specific.c \
check_mdelay.c \
check_udelay.c \
- eeprom_boot.a51 \
- eeprom_init.c \
- eeprom_io.c \
- eeprom_io.h \
+ edit-gpif \
+ fpga.h \
+ fpga_load.h \
fpga_load.c \
- fpga_rev2.c \
- fpga_rev2.h \
gpif.c \
+ gpif.gpf \
init_gpif.c \
- spi.c \
- spi.h \
- usb_descriptors.a51 \
usrp_common.c \
- usrp_common.h \
- usrp_gpif.c \
- usrp_main.c \
- usrp_rev2_regs.h \
- vectors.a51
+ usrp_globals.h \
+ vectors.a51 \
+ build_eeprom.py
-
-DEFINES=-DHAVE_USRP2
-INCLUDES=-I$(top_srcdir)/usrp/firmware/include \
- -I$(top_srcdir)/usrp/firmware/src/usrp2 \
- -I$(top_srcdir)/usrp/firmware/src/common \
- -I$(top_builddir)/usrp/firmware/src/common
-
-# with EA = 0, the FX2 implements a portion of the 8051 "external memory"
-# on chip. This memory is mapped like this:
-#
-# The bottom 8K of memory (0x0000 - 0x1fff) is used for both data and
-# code accesses. There's also 512 bytes for data only from 0xe000 - 0xe1ff.
-#
-# We tell the linker to start the xdata segment at 0x1800, 6K up from
-# the bottom.
-
-MEMOPTS = --code-loc 0x0000 --code-size 0x1800 --xram-loc 0x1800 --xram-size
0x0800 \
- -Wl '-b USBDESCSEG = 0xE000'
-
-LIBOPTS = -L ../../lib libfx2.lib
-LIBDEP = ../../lib/libfx2.lib
-
-LINKOPTS = $(MEMOPTS) $(LIBOPTS)
-
-EXECUTABLES = \
- std.ihx \
- blink_leds.ihx \
- check_mdelay.ihx \
- check_udelay.ihx \
- eeprom_boot.ihx
-
-STARTUP = _startup.rel
-
-noinst_SCRIPTS = \
- burn-usrp2-eeprom \
- burn-usrp4-eeprom
-
-
-.c.rel:
- $(XCC) $(INCLUDES) $(DEFINES) \
- -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-.a51.rel:
- test -f `basename '$<'` || $(LN_S) '$<' .
- test -f ../common/`basename '$<'` -o \
- \! -f `dirname '$<'`/../common/`basename '$<'` \
- || $(LN_S) `dirname '$<'`/../common/`basename '$<'`
../common/`basename '$<'`
- $(XAS) `basename '$<'`
-
-
-EEPROM_BOOT_OBJS = eeprom_boot.rel eeprom_init.rel $(STARTUP)
-
-eeprom_boot.ihx: $(EEPROM_BOOT_OBJS) $(LIBDEP)
- $(XCC) $(LINKOPTS) -o $@ $(EEPROM_BOOT_OBJS)
-
-burn-usrp2-eeprom: eeprom_boot.ihx
- $(PYTHON) $(srcdir)/../common/build_eeprom.py -r2 eeprom_boot.ihx > $@
- chmod +x $@
-
-burn-usrp4-eeprom: eeprom_boot.ihx
- $(PYTHON) $(srcdir)/../common/build_eeprom.py -r4 eeprom_boot.ihx > $@
- chmod +x $@
-
-
-BLINK_LEDS_OBJS = blink_leds.rel usrp_common.rel board_specific.rel spi.rel
$(STARTUP)
-
-blink_leds.ihx: $(BLINK_LEDS_OBJS) $(LIBDEP)
- $(XCC) $(LINKOPTS) -o $@ $(BLINK_LEDS_OBJS)
-
-
-CHECK_MDELAY_OBJS = check_mdelay.rel usrp_common.rel board_specific.rel
spi.rel $(STARTUP)
-
-check_mdelay.ihx: $(CHECK_MDELAY_OBJS) $(LIBDEP)
- $(XCC) $(LINKOPTS) -o $@ $(CHECK_MDELAY_OBJS)
-
-
-
-CHECK_UDELAY_OBJS = check_udelay.rel usrp_common.rel board_specific.rel
spi.rel $(STARTUP)
-
-check_udelay.ihx: $(CHECK_UDELAY_OBJS) $(LIBDEP)
- $(XCC) $(LINKOPTS) -o $@ $(CHECK_UDELAY_OBJS)
-
-
-
-USRP_OBJS = \
- vectors.rel \
- usrp_main.rel usrp_common.rel board_specific.rel \
- fpga_load.rel fpga_rev2.rel init_gpif.rel usrp_gpif.rel \
- usb_descriptors.rel spi.rel eeprom_io.rel $(STARTUP)
-
-std.ihx: $(USRP_OBJS) $(LIBDEP)
- $(XCC) $(LINKOPTS) -o $@ $(USRP_OBJS)
-
-CLEANFILES = \
- *.ihx *.lnk *.lst *.map *.mem *.rel *.rst *.sym *.asm *.lib \
- usrp_gpif.c usrp_gpif_inline.h \
- burn-usrp2-eeprom \
- burn-usrp4-eeprom
-
-DISTCLEANFILES = \
- *.ihx *.lnk *.lst *.map *.mem *.rel *.rst *.sym *.asm *.lib
-
-# build gpif stuff
-
all: usrp_gpif.c
usrp_gpif.c usrp_gpif_inline.h : gpif.c
srcdir=$(srcdir) $(PYTHON) $(srcdir)/edit-gpif $(srcdir)/gpif.c
usrp_gpif.c usrp_gpif_inline.h
+CLEANFILES = \
+ *.ihx *.lnk *.lst *.map *.mem *.rel *.rst *.sym *.asm *.lib \
+ usrp_gpif.c usrp_gpif_inline.h
-# dependencies
-
-usrp_main.rel: usrp_gpif_inline.h
-#usrp_main.rel: fpga.h usrp_common.h ../../include/usrp_commands.h
usrp_gpif_inline.h ../../include/usrp_config.h usrp_rev2_regs.h
../../include/fx2regs.h
-#usrp_common.rel: usrp_common.h ../../include/usrp_commands.h
../../include/usrp_config.h usrp_rev2_regs.h ../../include/fx2regs.h
-#fpga.rel: usrp_common.h ../../include/usrp_commands.h fpga.h
../../include/usrp_config.h usrp_rev2_regs.h ../../include/fx2regs.h
-#init_gpif.rel: usrp_common.h ../../include/usrp_config.h usrp_rev2_regs.h
../../include/fx2regs.h
+DISTCLEANFILES = \
+ *.ihx *.lnk *.lst *.map *.mem *.rel *.rst *.sym *.asm *.lib \
+ usrp_gpif.c usrp_gpif_inline.h
Modified:
gnuradio/branches/developers/n4hy/ofdm2/usrp/firmware/src/usrp2/Makefile.am
===================================================================
--- gnuradio/branches/developers/n4hy/ofdm2/usrp/firmware/src/usrp2/Makefile.am
2007-01-30 04:16:35 UTC (rev 4337)
+++ gnuradio/branches/developers/n4hy/ofdm2/usrp/firmware/src/usrp2/Makefile.am
2007-01-30 04:25:44 UTC (rev 4338)
@@ -108,11 +108,11 @@
$(XCC) $(LINKOPTS) -o $@ $(EEPROM_BOOT_OBJS)
burn-usrp2-eeprom: eeprom_boot.ihx
- $(srcdir)/../common/build_eeprom.py -r2 eeprom_boot.ihx > $@
+ $(PYTHON) $(srcdir)/../common/build_eeprom.py -r2 eeprom_boot.ihx > $@
chmod +x $@
burn-usrp4-eeprom: eeprom_boot.ihx
- $(srcdir)/../common/build_eeprom.py -r4 eeprom_boot.ihx > $@
+ $(PYTHON) $(srcdir)/../common/build_eeprom.py -r4 eeprom_boot.ihx > $@
chmod +x $@
@@ -159,7 +159,7 @@
all: usrp_gpif.c
usrp_gpif.c usrp_gpif_inline.h : gpif.c
- srcdir=$(srcdir) $(srcdir)/edit-gpif $(srcdir)/gpif.c usrp_gpif.c
usrp_gpif_inline.h
+ srcdir=$(srcdir) $(PYTHON) $(srcdir)/edit-gpif $(srcdir)/gpif.c
usrp_gpif.c usrp_gpif_inline.h
# dependencies
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r4338 - in gnuradio/branches/developers/n4hy/ofdm2/usrp/firmware/src: common usrp2,
n4hy <=