2010-05-20 Sebastian Huber <sebastian.huber@embedded-brains.de>

	* make/custom/lpc32xx.inc, make/custom/lpc32xx_mzx_boot_int.cfg,
	startup/linkcmds.lpc32xx_mzx_boot_int: New files.
	* Makefile.am, configure.ac, preinstall.am, include/bsp.h,
	include/bspopts.h.in, include/lpc32xx.h, irq/irq.c,
	make/custom/lpc32xx_phycore.cfg, startup/bspstart.c,
	startup/bspstarthooks.c: Changes throughout.

1 files changed, 1 insertions, 77 deletions

diff --git a/c/src/lib/libbsp/arm/lpc32xx/startup/bspstart.c b/c/src/lib/libbsp/arm/lpc32xx/startup/bspstart.c
index a005054222..c8f0a728ba 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/startup/bspstart.c
+++ b/c/src/lib/libbsp/arm/lpc32xx/startup/bspstart.c
@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (c) 2009
+ * Copyright (c) 2009, 2010
  * embedded brains GmbH
  * Obere Lagerstr. 30
  * D-82178 Puchheim
@@ -27,22 +27,6 @@
 #include <bsp/stackalloc.h>
 #include <bsp/lpc32xx.h>
 
-/* FIXME */
-#define CONSOLE_RBR (*(volatile uint32_t *) (LPC32XX_BASE_UART_5 + 0x00))
-#define CONSOLE_THR (*(volatile uint32_t *) (LPC32XX_BASE_UART_5 + 0x00))
-#define CONSOLE_DLL (*(volatile uint32_t *) (LPC32XX_BASE_UART_5 + 0x00))
-#define CONSOLE_DLM (*(volatile uint32_t *) (LPC32XX_BASE_UART_5 + 0x04))
-#define CONSOLE_IER (*(volatile uint32_t *) (LPC32XX_BASE_UART_5 + 0x04))
-#define CONSOLE_IIR (*(volatile uint32_t *) (LPC32XX_BASE_UART_5 + 0x08))
-#define CONSOLE_FCR (*(volatile uint32_t *) (LPC32XX_BASE_UART_5 + 0x08))
-#define CONSOLE_LCR (*(volatile uint32_t *) (LPC32XX_BASE_UART_5 + 0x0C))
-#define CONSOLE_LSR (*(volatile uint32_t *) (LPC32XX_BASE_UART_5 + 0x14))
-#define CONSOLE_SCR (*(volatile uint32_t *) (LPC32XX_BASE_UART_5 + 0x1C))
-#define CONSOLE_ACR (*(volatile uint32_t *) (LPC32XX_BASE_UART_5 + 0x20))
-#define CONSOLE_ICR (*(volatile uint32_t *) (LPC32XX_BASE_UART_5 + 0x24))
-#define CONSOLE_FDR (*(volatile uint32_t *) (LPC32XX_BASE_UART_5 + 0x28))
-#define CONSOLE_TER (*(volatile uint32_t *) (LPC32XX_BASE_UART_5 + 0x30))
-
 static void lpc32xx_timer_initialize(void)
 {
   volatile lpc_timer *timer = LPC32XX_STANDARD_TIMER;
@@ -60,42 +44,6 @@ static void lpc32xx_timer_initialize(void)
 
 void bsp_start(void)
 {
-  uint32_t uartclk_ctrl = 0;
-
-  #ifdef LPC32XX_CONFIG_U3CLK
-    uartclk_ctrl |= 1U << 0;
-    LPC32XX_U3CLK = LPC32XX_CONFIG_U3CLK;
-  #endif
-  #ifdef LPC32XX_CONFIG_U4CLK
-    uartclk_ctrl |= 1U << 1;
-    LPC32XX_U4CLK = LPC32XX_CONFIG_U4CLK;
-  #endif
-  #ifdef LPC32XX_CONFIG_U5CLK
-    uartclk_ctrl |= 1U << 2;
-    LPC32XX_U5CLK = LPC32XX_CONFIG_U5CLK;
-  #endif
-  #ifdef LPC32XX_CONFIG_U6CLK
-    uartclk_ctrl |= 1U << 3;
-    LPC32XX_U6CLK = LPC32XX_CONFIG_U6CLK;
-  #endif
-
-  #ifdef LPC32XX_CONFIG_UART_CLKMODE
-    LPC32XX_UART_CLKMODE = LPC32XX_CONFIG_UART_CLKMODE;
-  #endif
-
-  LPC32XX_UARTCLK_CTRL = uartclk_ctrl;
-  LPC32XX_UART_CTRL = 0x0;
-  LPC32XX_UART_LOOP = 0x0;
-
-  /* FIXME */
-  CONSOLE_LCR = 0x0;
-  CONSOLE_IER = 0x0;
-  CONSOLE_LCR = 0x80;
-  CONSOLE_DLL = 0x1; /* Clock is already set in LPC32XX_U5CLK */
-  CONSOLE_DLM = 0x0;
-  CONSOLE_LCR = 0x3;
-  CONSOLE_FCR = 0x7;
-
   if (bsp_interrupt_initialize() != RTEMS_SUCCESSFUL) {
     _CPU_Fatal_halt(0xe);
   }
@@ -107,27 +55,3 @@ void bsp_start(void)
 
   lpc32xx_timer_initialize();
 }
-
-#define UART_LSR_THRE 0x00000020U
-
-static void lpc32xx_console_wait(void)
-{
-  while ((CONSOLE_LSR & UART_LSR_THRE) == 0) {
-    /* Wait */
-  }
-}
-
-static void lpc32xx_BSP_output_char(char c)
-{
-  lpc32xx_console_wait();
-
-  CONSOLE_THR = c;
-
-  if (c == '\n') {
-    lpc32xx_console_wait();
-
-    CONSOLE_THR = '\r';
-  }
-}
-
-BSP_output_char_function_type BSP_output_char = lpc32xx_BSP_output_char;