diff options
| author | Harald Welte <laforge@gnumonks.org> | 2011-07-30 19:04:55 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2011-07-30 19:04:55 +0200 |
| commit | a3de0a4ac29118c3ada946a0c8f7f602c9066ec1 (patch) | |
| tree | 8408d463a3ea6910d7336e24d60611da8a50b77d /firmware/src/openpcd.h | |
| parent | dd88fde8d2b78243c01871cabca37c9e46ebd03d (diff) | |
| parent | ffbce3ea2cda51214be0bb7a107954f890f99b0d (diff) | |
Merge branch 'simtrace'
Diffstat (limited to 'firmware/src/openpcd.h')
| -rw-r--r-- | firmware/src/openpcd.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/firmware/src/openpcd.h b/firmware/src/openpcd.h index a65cd0e..3bc890e 100644 --- a/firmware/src/openpcd.h +++ b/firmware/src/openpcd.h @@ -10,11 +10,13 @@ #define USB_VENDOR_ID OPENPCD_VENDOR_ID -#ifdef OLIMEX +#if defined(OLIMEX) || defined(SIMTRACE) #define OPENPCD_PIO_LED2 AT91C_PIO_PA17 #define OPENPCD_PIO_LED1 AT91C_PIO_PA18 #define OPENPCD_PIO_UDP_CNX AT91C_PIO_PA24 -#define OPENPCD_PIO_UDP_PUP AT91C_PIO_PA16 +#define OPENPCD_PIO_UDP_PUPv4 AT91C_PIO_PA16 +#define PIO_BOOTLDR AT91C_PIO_PA19 /* B1 used as bootloader switch */ +#define USB_PRODUCT_ID SIMTRACE_PRODUCT_ID #else #if defined(PCD) #define OPENPCD_PIO_UDP_CNX AT91C_PIO_PA15 @@ -166,6 +168,7 @@ #define OPENPCD_IRQ_PRIO_SPI AT91C_AIC_PRIOR_HIGHEST #define OPENPCD_IRQ_PRIO_SSC (AT91C_AIC_PRIOR_HIGHEST-1) #define OPENPCD_IRQ_PRIO_SYS (AT91C_AIC_PRIOR_HIGHEST-2) +#define OPENPCD_IRQ_PRIO_USART (AT91C_AIC_PRIOR_HIGHEST-3) #define OPENPCD_IRQ_PRIO_TC_FDT (AT91C_AIC_PRIOR_LOWEST+3) #define OPENPCD_IRQ_PRIO_UDP (AT91C_AIC_PRIOR_LOWEST+2) #define OPENPCD_IRQ_PRIO_PIT (AT91C_AIC_PRIOR_LOWEST+1) |