aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-10-12 15:24:37 -0700
committerJosh Blum <josh@joshknows.com>2010-10-12 15:24:37 -0700
commit2c08c9a7e62b2ad7f75047cc54b0256173f1b674 (patch)
treedff870e41085e86354d0f0a668ec5fa42a82278c
parentf9755b0ab33eb20abb5689893061f3b4039505fd (diff)
downloaduhd-2c08c9a7e62b2ad7f75047cc54b0256173f1b674.tar.gz
uhd-2c08c9a7e62b2ad7f75047cc54b0256173f1b674.tar.bz2
uhd-2c08c9a7e62b2ad7f75047cc54b0256173f1b674.zip
usrp2: register overflow, underflow, and pps level for pic
also fix minor build issue w/ LDADD
-rw-r--r--firmware/microblaze/lib/pic.c2
-rw-r--r--firmware/microblaze/usrp2/Makefile.am3
2 files changed, 3 insertions, 2 deletions
diff --git a/firmware/microblaze/lib/pic.c b/firmware/microblaze/lib/pic.c
index e89d2b755..226da5f85 100644
--- a/firmware/microblaze/lib/pic.c
+++ b/firmware/microblaze/lib/pic.c
@@ -44,7 +44,7 @@ pic_init(void)
// uP is level triggered
pic_regs->mask = ~0; // mask all interrupts
- pic_regs->edge_enable = PIC_ONETIME_INT;
+ pic_regs->edge_enable = PIC_ONETIME_INT | PIC_UNDERRUN_INT | PIC_OVERRUN_INT | PIC_PPS_INT;
pic_regs->polarity = ~0 & ~PIC_PHY_INT; // rising edge
pic_regs->pending = ~0; // clear all pending ints
}
diff --git a/firmware/microblaze/usrp2/Makefile.am b/firmware/microblaze/usrp2/Makefile.am
index 8da013980..ba426b75c 100644
--- a/firmware/microblaze/usrp2/Makefile.am
+++ b/firmware/microblaze/usrp2/Makefile.am
@@ -22,10 +22,11 @@ AM_CFLAGS = \
AM_LDFLAGS = \
$(COMMON_LFLAGS) \
- libusrp2.a \
-Wl,-defsym -Wl,_TEXT_START_ADDR=0x0050 \
-Wl,-defsym -Wl,_STACK_SIZE=3072
+LDADD = libusrp2.a
+
########################################################################
# USRP2 specific library and programs
########################################################################