diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-05-09 18:08:35 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-05-09 18:08:35 +0000 |
| commit | d81d05783944cadfb13df29effc61c0c16034745 (patch) | |
| tree | d40ecfb5906403036b49c660b16fb26e1cea221f | |
| parent | 2007-05-09 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
| download | rtems-d81d05783944cadfb13df29effc61c0c16034745.tar.bz2 | |
2007-05-09 Joel Sherrill <joel.sherrill@OARcorp.com>
* Makefile.am, console/lpc22xx_uart.h: Remove warnings, cleanup and do
not build SPARC code accidentally referenced in Makefile.am.
| -rw-r--r-- | c/src/lib/libbsp/arm/rtl22xx/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/arm/rtl22xx/Makefile.am | 9 | ||||
| -rw-r--r-- | c/src/lib/libbsp/arm/rtl22xx/console/lpc22xx_uart.h | 13 |
3 files changed, 14 insertions, 13 deletions
diff --git a/c/src/lib/libbsp/arm/rtl22xx/ChangeLog b/c/src/lib/libbsp/arm/rtl22xx/ChangeLog index 8d6e7075ae..77b1d62519 100644 --- a/c/src/lib/libbsp/arm/rtl22xx/ChangeLog +++ b/c/src/lib/libbsp/arm/rtl22xx/ChangeLog @@ -1,5 +1,10 @@ 2007-05-09 Joel Sherrill <joel.sherrill@OARcorp.com> + * Makefile.am, console/lpc22xx_uart.h: Remove warnings, cleanup and do + not build SPARC code accidentally referenced in Makefile.am. + +2007-05-09 Joel Sherrill <joel.sherrill@OARcorp.com> + * console/uart.c, startup/bspclean.c, startup/bspstart.c: Remove debug print methods that are redundant with prntk and replace their usage with printk. diff --git a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am index 5f34dcc6c2..ec7ff80457 100644 --- a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am +++ b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am @@ -35,12 +35,6 @@ startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \ startup_rel_CPPFLAGS = $(AM_CPPFLAGS) startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -noinst_PROGRAMS += gnatsupp.rel -gnatsupp_rel_SOURCES = ../../sparc/shared/gnatcommon.c -gnatsupp_rel_CPPFLAGS = $(AM_CPPFLAGS) -gnatsupp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - - noinst_PROGRAMS += console.rel console_rel_SOURCES = ../../shared/console.c console_rel_CPPFLAGS = $(AM_CPPFLAGS) @@ -51,7 +45,6 @@ debugio_rel_SOURCES = console/uart.c debugio_rel_CPPFLAGS = $(AM_CPPFLAGS) debugio_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - if HAS_NETWORKING network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ noinst_PROGRAMS += network.rel @@ -62,7 +55,7 @@ endif noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = -libbsp_a_LIBADD = gnatsupp.rel console.rel debugio.rel +libbsp_a_LIBADD = console.rel debugio.rel if HAS_NETWORKING libbsp_a_LIBADD += network.rel endif diff --git a/c/src/lib/libbsp/arm/rtl22xx/console/lpc22xx_uart.h b/c/src/lib/libbsp/arm/rtl22xx/console/lpc22xx_uart.h index 660e50d0eb..a11833511b 100644 --- a/c/src/lib/libbsp/arm/rtl22xx/console/lpc22xx_uart.h +++ b/c/src/lib/libbsp/arm/rtl22xx/console/lpc22xx_uart.h @@ -1,6 +1,11 @@ -/*Define for LPC22xx/LPC21xx */ -#ifndef UART_H -#define UART_H +/* + * Definitions for LPC22xx/LPC21xx + * + * $Id$ + */ + +#ifndef LPC22XX_UART_H +#define LPC22XX_UART_H #define FIFODEEP 16 @@ -8,8 +13,6 @@ #define BD38400 38400 #define BD9600 9600 -#define CR 0x0D -#define LF 0x0A #define U0_PINSEL (0x00000005) /* PINSEL0 Value for UART0 */ #define U0_PINMASK (0x0000000F) /* PINSEL0 Mask for UART0 */ #define U1_PINSEL (0x00050000) /* PINSEL0 Value for UART1 */ |