Ticket #2023: 0014-Fixes-updates-and-improvements-to-virtex5-BSP.patch

c/src/lib/libbsp/powerpc/virtex5/Makefile.am

@@ -11 +11 @@
 dist_project_lib_DATA = bsp_specs
 
 # include
-include_HEADERS  = include/bsp.h
-#include_HEADERS += include/tm27.h
+include_HEADERS     = include/bsp.h
+include_HEADERS    += ../../shared/include/tm27.h
+
+include_bsp_HEADERS =
 
 nodist_include_HEADERS     = include/bspopts.h
+nodist_include_HEADERS    += include/coverhd.h
 nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES             = include/bspopts.h
 
-nodist_include_HEADERS += include/coverhd.h
-
 # start
 noinst_LIBRARIES      = libbspstart.a
 libbspstart_a_SOURCES = ../../powerpc/shared/start/rtems_crti.S
@@ -43 +44 @@
 # start
 libbsp_a_SOURCES += startup/start.S
 
-# clock
-libbsp_a_SOURCES += ../shared/clock/clock.c
+# clock & timer
+libbsp_a_SOURCES += ../../../libcpu/@RTEMS_CPU@/ppc403/clock/clock.c
+libbsp_a_SOURCES += ../../../libcpu/@RTEMS_CPU@/ppc403/timer/timer.c
 
 # console
 libbsp_a_SOURCES += startup/dummy_console.c \
                     ../../shared/dummy_printk_support.c
 
 # irq
-include_bsp_HEADERS = include/irq.h
+include_bsp_HEADERS += include/irq.h
+libbsp_a_SOURCES += irq/irq_init.c
 
 #vectors
 include_bsp_HEADERS += ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h
@@ -59 +62 @@
 
 libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \
                   ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \
-                  ../../../libcpu/@RTEMS_CPU@/@exceptions@/irq_bspsupport.rel \
                   ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
                   ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel
 
-EXTRA_DIST =
+EXTRA_DIST = times
 
 include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am

c/src/lib/libbsp/powerpc/virtex5/configure.ac

@@ -16 +16 @@
 RTEMS_PROG_CCAS
 
 RTEMS_CHECK_NETWORKING
-
 AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
 
+RTEMS_BSPOPTS_SET([PPC_USE_DATA_CACHE],[*],[1])
+RTEMS_BSPOPTS_HELP([PPC_USE_DATA_CACHE],
+[If defined, then the PowerPC specific code in RTEMS will use
+ data cache instructions to optimize the context switch code.
+ This code can conflict with debuggers or emulators.  It is known
+ to break the Corelis PowerPC emulator with at least some combinations
+ of PowerPC 603e revisions and emulator versions.
+ The BSP actually contains the call that enables this.])
+
 RTEMS_BSPOPTS_SET([PPC_USE_SPRG],[*],[1])
 RTEMS_BSPOPTS_HELP([PPC_USE_SPRG],
 [If defined, then the PowerPC specific code in RTEMS will use some

c/src/lib/libbsp/powerpc/virtex5/include/bsp.h

@@ -53 +53 @@
  *  confdefs.h overrides for this BSP:
  *   - Interrupt stack space is not minimum if defined.
  */
-
 #define CONFIGURE_INTERRUPT_STACK_MEMORY  (16 * 1024)
 
 #ifdef ASM
@@ -66 +65 @@
 #include <rtems/clockdrv.h>
 #include <rtems/iosupp.h>
 
+/* miscellaneous stuff assumed to exist */
+extern bool bsp_timer_internal_clock;   /* TRUE, when timer runs with CPU clk */
+
+extern rtems_configuration_table BSP_Configuration;     /* owned by BSP */
 #endif /* ASM */
 
+void BSP_ask_for_reset(void);
+void BSP_panic(char *s);
+void _BSP_Fatal_error(unsigned int v);
+
 #ifdef __cplusplus
 }
 #endif

c/src/lib/libbsp/powerpc/virtex5/include/irq.h

@@ -1 @@
-#ifndef VIRTEX5_RTEMSBSP_IRQ_H
-#define VIRTEX5_RTEMSBSP_IRQ_H
+/*===============================================================*\
+| Project: RTEMS virtex BSP                                       |
++-----------------------------------------------------------------+
+|                    Copyright (c) 2007                           |
+|                    Embedded Brains GmbH                         |
+|                    Obere Lagerstr. 30                           |
+|                    D-82178 Puchheim                             |
+|                    Germany                                      |
+|                    rtems@embedded-brains.de                     |
++-----------------------------------------------------------------+
+| The license and distribution terms for this file may be         |
+| found in the file LICENSE in this distribution or at            |
+|                                                                 |
+| http://www.rtems.com/license/LICENSE.                           |
+|                                                                 |
++-----------------------------------------------------------------+
+| this file declares constants of the interrupt controller        |
+\*===============================================================*/
+#ifndef VIRTEX5_IRQ_IRQ_H
+#define VIRTEX5_IRQ_IRQ_H
 
-#warning "virtex5 BSP's <bsp/irq.h> is BOGUS; this BSP implements no interrupt handling.  This header exists to get everything to compile."
+#include <rtems/irq.h>
 
-#define BSP_SHARED_HANDLER_SUPPORT 1
+/*
+ * the following definitions specify the indices used
+ * to interface the interrupt handler API
+ */
 
-#include <rtems/irq.h>
+/*
+ * Peripheral IRQ handlers related definitions
+ */
+  /* Not supported at this level */
+
+/*
+ * Processor IRQ handlers related definitions
+ */
+#define BSP_PROCESSOR_IRQ_NUMBER        3
+#define BSP_PROCESSOR_IRQ_LOWEST_OFFSET 0
+#define BSP_PROCESSOR_IRQ_MAX_OFFSET    (BSP_PROCESSOR_IRQ_LOWEST_OFFSET\
+                                         +BSP_PROCESSOR_IRQ_NUMBER-1)
+
+#define BSP_IS_PROCESSOR_IRQ(irqnum)                 \
+  (((irqnum) >= BSP_PROCESSOR_IRQ_LOWEST_OFFSET) &&  \
+   ((irqnum) <= BSP_PROCESSOR_IRQ_MAX_OFFSET))
 
 /*
- *  The following symbols must be defined properly.
+ * Summary
  */
-#define BSP_DECREMENTER 0
+#define BSP_IRQ_NUMBER                  (BSP_PROCESSOR_IRQ_MAX_OFFSET+1)
+#define BSP_LOWEST_OFFSET                BSP_PROCESSOR_IRQ_LOWEST_OFFSET
+#define BSP_MAX_OFFSET                   BSP_PROCESSOR_IRQ_MAX_OFFSET
+
+#define BSP_IS_VALID_IRQ(irqnum)        (BSP_IS_PROCESSOR_IRQ(irqnum))
 
+#ifndef ASM
+#ifdef __cplusplus
+extern "C" {
 #endif
+
+/*
+ * index table for the module specific handlers, a few entries are only placeholders
+ */
+  typedef enum {
+    BSP_EXT               = BSP_PROCESSOR_IRQ_LOWEST_OFFSET + 0,
+    BSP_PIT               = BSP_PROCESSOR_IRQ_LOWEST_OFFSET + 1,
+    BSP_CRIT              = BSP_PROCESSOR_IRQ_LOWEST_OFFSET + 2
+  } rtems_irq_symbolic_name;
+
+  extern rtems_irq_connect_data *BSP_rtems_irq_tbl;
+  void BSP_rtems_irq_mngt_init(unsigned cpuId);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* ASM */
+
+#endif /* VIRTEX5_IRQ_IRQ_H */

new file c/src/lib/libbsp/powerpc/virtex5/irq/irq_init.c

@@ +1 @@
+/*===============================================================*\
+| Project: RTEMS virtex BSP                                       |
++-----------------------------------------------------------------+
+| Partially based on the code references which are named below.   |
+| Adaptions, modifications, enhancements and any recent parts of  |
+| the code are:                                                   |
+|                    Copyright (c) 2007                           |
+|                    Embedded Brains GmbH                         |
+|                    Obere Lagerstr. 30                           |
+|                    D-82178 Puchheim                             |
+|                    Germany                                      |
+|                    rtems@embedded-brains.de                     |
++-----------------------------------------------------------------+
+| The license and distribution terms for this file may be         |
+| found in the file LICENSE in this distribution or at            |
+|                                                                 |
+| http://www.rtems.com/license/LICENSE.                           |
+|                                                                 |
++-----------------------------------------------------------------+
+| this file contains the irq controller handler                   |
+\*===============================================================*/
+#include <libcpu/spr.h>
+#include <bsp/irq.h>
+#include <bsp.h>
+#include <rtems/bspIo.h>
+#include <rtems/powerpc/powerpc.h>
+#include <bsp/vectors.h>
+
+uint32_t* IRQ_Counter = (uint32_t*)0x1500;
+
+static rtems_irq_connect_data rtemsIrqTbl[BSP_IRQ_NUMBER];
+rtems_irq_connect_data *BSP_rtems_irq_tbl;
+rtems_irq_global_settings* BSP_rtems_irq_config;
+
+/***********************************************************
+ * dummy functions for on/off/isOn calls
+ * these functions just do nothing fulfill the semantic
+ * requirements to enable/disable a certain interrupt or exception
+ */
+void BSP_irq_nop_func(const rtems_irq_connect_data *unused)
+{
+  /*
+   * nothing to do
+   */
+}
+
+void BSP_irq_nop_hdl(void *hdl)
+{
+  /*
+   * nothing to do
+   */
+}
+
+int BSP_irq_isOn_func(const rtems_irq_connect_data *unused)
+{
+  /*
+   * nothing to do
+   */
+  return 0;
+}
+
+/***********************************************************
+ * interrupt handler and its enable/disable functions
+ ***********************************************************/
+
+/***********************************************************
+ * functions to enable/disable/query external/critical interrupts
+ */
+void BSP_irqexc_on_fnc(rtems_irq_connect_data *conn_data)
+{
+  uint32_t msr_value;
+  /*
+   * get current MSR value
+   */
+  _CPU_MSR_GET(msr_value);
+
+  msr_value |= PPC_MSR_EE;
+  _CPU_MSR_SET(msr_value);
+}
+
+void BSP_irqexc_off_fnc(rtems_irq_connect_data *unused)
+{
+  uint32_t msr_value;
+  /*
+   * get current MSR value
+   */
+  _CPU_MSR_GET(msr_value);
+
+  msr_value &= ~PPC_MSR_EE;
+  _CPU_MSR_SET(msr_value);
+}
+
+/***********************************************************
+ * High level IRQ handler called from shared_raw_irq_code_entry
+ */
+int C_dispatch_irq_handler (BSP_Exception_frame *frame, unsigned int excNum)
+{
+  /*
+   * Handle interrupt
+   */
+  switch(excNum) {
+  case ASM_EXT_VECTOR:
+    BSP_rtems_irq_tbl[BSP_EXT].hdl(BSP_rtems_irq_tbl[BSP_EXT].handle);
+    break;
+  case ASM_BOOKE_DEC_VECTOR:
+    BSP_rtems_irq_tbl[BSP_PIT].hdl(BSP_rtems_irq_tbl[BSP_PIT].handle);
+    break;
+#if 0 /* Critical interrupts not yet supported */
+  case ASM_BOOKE_CRIT_VECTOR:
+    BSP_rtems_irq_tbl[BSP_CRIT].hdl(BSP_rtems_irq_tbl[BSP_CRIT].handle);
+    break;
+#endif
+  }
+
+  return 0;
+}
+
+/***********************************************************
+ * functions to set/get/remove interrupt handlers
+ ***********************************************************/
+int BSP_install_rtems_irq_handler  (const rtems_irq_connect_data* irq)
+{
+  rtems_interrupt_level level;
+
+  /*
+   * check for valid irq name
+   * if invalid, print error and return 0
+   */
+  if (!BSP_IS_VALID_IRQ(irq->name)) {
+    printk("Invalid interrupt vector %d\n",irq->name);
+    return 0;
+  }
+
+  /*
+   * disable interrupts
+   */
+  rtems_interrupt_disable(level);
+
+  /*
+   * check, that default handler is installed now
+   */
+  if (rtemsIrqTbl[irq->name].hdl != BSP_rtems_irq_config->defaultEntry.hdl) {
+    rtems_interrupt_enable(level);
+    printk("IRQ vector %d already connected\n",irq->name);
+    return 0;
+  }
+
+  /*
+   * store new handler data
+   */
+  rtemsIrqTbl[irq->name] = *irq;
+
+  /*
+   * call "on" function to enable interrupt at device
+   */
+  irq->on(irq);
+
+  /*
+   * reenable interrupts
+   */
+  rtems_interrupt_enable(level);
+
+  return 1;
+}
+
+int BSP_get_current_rtems_irq_handler   (rtems_irq_connect_data* irq)
+{
+  rtems_interrupt_level level;
+
+  /*
+   * check for valid IRQ name
+   */
+  if (!BSP_IS_VALID_IRQ(irq->name)) {
+    return 0;
+  }
+  rtems_interrupt_disable(level);
+
+  /*
+   * return current IRQ entry
+   */
+  *irq = rtemsIrqTbl[irq->name];
+  rtems_interrupt_enable(level);
+  return 1;
+}
+
+int BSP_remove_rtems_irq_handler  (const rtems_irq_connect_data* irq)
+{
+  rtems_interrupt_level level;
+
+  /*
+   * check for valid IRQ name
+   */
+  if (!BSP_IS_VALID_IRQ(irq->name)) {
+    return 0;
+  }
+  rtems_interrupt_disable(level);
+
+  /*
+   * check, that specified handler is really connected now
+   */
+  if (rtemsIrqTbl[irq->name].hdl != irq->hdl) {
+    rtems_interrupt_enable(level);
+    return 0;
+  }
+
+  /*
+   * disable interrupt at source
+   */
+  irq->off(irq);
+
+  /*
+   * restore default interrupt handler
+   */
+  rtemsIrqTbl[irq->name] = BSP_rtems_irq_config->defaultEntry;
+
+  /*
+   * reenable interrupts
+   */
+  rtems_interrupt_enable(level);
+
+  return 1;
+}
+
+/***********************************************************
+ * functions to set/get the basic interrupt management setup
+ ***********************************************************/
+/*
+ * (Re) get info on current RTEMS interrupt management.
+ */
+int BSP_rtems_irq_mngt_get(rtems_irq_global_settings** ret_ptr)
+{
+  *ret_ptr = BSP_rtems_irq_config;
+  return 0;
+}
+
+
+/*
+ * set management stuff
+ */
+int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config)
+{
+  int                    i;
+  rtems_interrupt_level  level;
+
+  rtems_interrupt_disable(level);
+
+  /*
+   * store given configuration
+   */
+  BSP_rtems_irq_config = config;
+  BSP_rtems_irq_tbl    = BSP_rtems_irq_config->irqHdlTbl;
+
+  /*
+   * store any irq-like processor exceptions
+   */
+  for (i = BSP_PROCESSOR_IRQ_LOWEST_OFFSET;
+       i < BSP_PROCESSOR_IRQ_MAX_OFFSET;
+       i++) {
+    if (BSP_rtems_irq_tbl[i].hdl != config->defaultEntry.hdl) {
+      if (BSP_rtems_irq_tbl[i].on != NULL) {
+        BSP_rtems_irq_tbl[i].on
+          (&(BSP_rtems_irq_tbl[i]));
+      }
+    }
+    else {
+      if (BSP_rtems_irq_tbl[i].off != NULL) {
+        BSP_rtems_irq_tbl[i].off
+          (&(BSP_rtems_irq_tbl[i]));
+      }
+    }
+  }
+  rtems_interrupt_enable(level);
+  return 1;
+}
+
+/*
+ * dummy for an empty IRQ handler entry
+ */
+static rtems_irq_connect_data emptyIrq = {
+  0,                     /* Irq Name                 */
+  BSP_irq_nop_hdl,       /* handler function         */
+  NULL,                  /* handle passed to handler */
+  BSP_irq_nop_func,      /* on function              */
+  BSP_irq_nop_func,      /* off function             */
+  BSP_irq_isOn_func      /* isOn function            */
+};
+
+static rtems_irq_global_settings initialConfig = {
+  BSP_IRQ_NUMBER,    /* irqNb */
+  {  0,                          /* Irq Name                 */
+     BSP_irq_nop_hdl,       /* handler function         */
+     NULL,                  /* handle passed to handler */
+     BSP_irq_nop_func,      /* on function              */
+     BSP_irq_nop_func,      /* off function             */
+     BSP_irq_isOn_func      /* isOn function            */
+  }, /* emptyIrq */
+  rtemsIrqTbl, /* irqHdlTbl  */
+  0,           /* irqBase    */
+  NULL         /* irqPrioTbl */
+};
+
+void BSP_rtems_irq_mngt_init(unsigned cpuId)
+{
+  int i;
+
+  /*
+   * connect all exception vectors needed
+   */
+  ppc_exc_set_handler(ASM_EXT_VECTOR,       C_dispatch_irq_handler);
+  ppc_exc_set_handler(ASM_BOOKE_DEC_VECTOR, C_dispatch_irq_handler);
+
+  /*
+   * setup interrupt handlers table
+   */
+  for (i = 0;
+       i < BSP_IRQ_NUMBER;
+       i++) {
+    rtemsIrqTbl[i]      = emptyIrq;
+    rtemsIrqTbl[i].name = i;
+  }
+
+  /*
+   * initialize interrupt management
+   */
+  if (!BSP_rtems_irq_mngt_set(&initialConfig)) {
+    BSP_panic("Unable to initialize RTEMS interrupt Management!!! System locked\n");
+  }
+}

c/src/lib/libbsp/powerpc/virtex5/preinstall.am

@@ -45 +45 @@
         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
 
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
 $(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
 
+$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
+
 $(PROJECT_LIB)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
         $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
 TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT)

c/src/lib/libbsp/powerpc/virtex5/startup/bspclean.c

@@ -30 +30 @@
  *  The license and distribution terms for this file may be
  *  found in the file LICENSE in this distribution or at
  *  http://www.rtems.com/license/LICENSE.
- *
- *  $Id: bspclean.c 63 2011-04-26 00:23:51Z claus $
  */
 
 #include <rtems.h>
 #include <bsp.h>
 
+static void _noopfun(void) {}
+
+void app_bsp_cleanup(void)
+__attribute__(( weak, alias("_noopfun") ));
+
 void bsp_cleanup( void )
 {
-  /*  rtems_fatal_error_occurred(0); */
+  app_bsp_cleanup();
+
+  /* All done.  Hang out. */
+  BSP_ask_for_reset();
 }

c/src/lib/libbsp/powerpc/virtex5/startup/bspstart.c

@@ -53 +53 @@
  *
  *  Modifications for PPC405GP by Dennis Ehlin
  *  Modifications for Virtex5 by Richard Claus <claus@slac.stanford.edu>
- *
- *  $Id: bspstart.c 63 2011-04-26 00:23:51Z claus $
  */
 
 #include <string.h>
 #include <fcntl.h>
 
 #include <bsp.h>
+#include <bsp/irq.h>
+#include <bsp/vectors.h>
+#include <rtems/bspIo.h>
 #include <rtems/libio.h>
 #include <rtems/libcsupport.h>
-#include <rtems/bspIo.h>
-#include <bsp/vectors.h>
-#include <libcpu/spr.h>
+#include <rtems/sptables.h>             /* for RTEMS_VERSION */
 #include <libcpu/cpuIdent.h>
+#include <libcpu/spr.h>
 
 #define DO_DOWN_ALIGN(x,a) ((x) & ~((a)-1))
 
@@ -83 +83 @@
 uint32_t    bsp_timer_average_overhead;
 
 
-/* Provide weak aliases so that RTEMS distribution builds; the
- * generated executables are bogus, however...
+/* Defined in linkcmds linker script */
+LINKER_SYMBOL(RamBase);
+LINKER_SYMBOL(RamSize);
+LINKER_SYMBOL(__bsp_ram_start);
+LINKER_SYMBOL(__bsp_ram_end);
+LINKER_SYMBOL(__rtems_end);
+LINKER_SYMBOL(_stack);
+LINKER_SYMBOL(StackSize);
+LINKER_SYMBOL(__stack_base);
+LINKER_SYMBOL(WorkAreaBase);
+LINKER_SYMBOL(MsgAreaBase);
+LINKER_SYMBOL(MsgAreaSize);
+LINKER_SYMBOL(__phy_ram_end);
+
+
+/*
+ * Provide weak aliases so that RTEMS distribution builds
  */
-void __app_noopfun(void) {}
+static void _noopfun(void) {}
+static void _bsp_start(void)
+{
+  rtems_status_code sc             = RTEMS_SUCCESSFUL;
+  uintptr_t         intrStackStart = CPU_UP_ALIGN((uint32_t)__bsp_ram_start);
+  uintptr_t         intrStackSize  = rtems_configuration_get_interrupt_stack_size();
+
+  /*
+   * Initialize default raw exception handlers.
+   *
+   * This BSP does not assume anything about firmware possibly loaded in the
+   * FPGA, so the external interrupt should not be enabled in order to avoid
+   * spurious interrupts.
+   */
+  sc = ppc_exc_initialize(PPC_INTERRUPT_DISABLE_MASK_DEFAULT & ~MSR_EE,
+                          intrStackStart,
+                          intrStackSize);
+  if (sc != RTEMS_SUCCESSFUL)  BSP_panic("Cannot initialize exceptions");
+
+  /* Install our own set of exception vectors */
+  BSP_rtems_irq_mngt_init(0);
+}
 
-void app_memory_write(void)             /* See dummy_console.c */
-__attribute__(( weak, alias("__app_noopfun") ));
 
 void app_bsp_start(void)
-__attribute__(( weak, alias("__app_noopfun") ));
+__attribute__(( weak, alias("_bsp_start") ));
 
 void app_bsp_pretasking_hook(void)
-__attribute__(( weak, alias("__app_noopfun") ));
+__attribute__(( weak, alias("_noopfun") ));
 
 void app_bsp_predriver_hook(void)
-__attribute__(( weak, alias("__app_noopfun") ));
+__attribute__(( weak, alias("_noopfun") ));
 
 
-LINKER_SYMBOL(__bsp_ram_start);
-LINKER_SYMBOL(__bsp_ram_end);
-LINKER_SYMBOL(WorkAreaBase);
-LINKER_SYMBOL(MsgAreaBase);
-LINKER_SYMBOL(MsgAreaSize);
-
 static char* bspMsgBuffer = (char*)MsgAreaBase;
 
 static void __bsp_outchar_to_memory(char c)
@@ -120 +148 @@
 
 void BSP_ask_for_reset(void)
 {
-  printk("\nSystem stopped, press RESET");
+  printk("\nSystem stopped, issue RESET");
   for(;;);
-  /*__asm__ __volatile ("sc");*/
 }
 
 
@@ -149 +176 @@
  */
 void bsp_start(void)
 {
-  rtems_status_code  sc = RTEMS_SUCCESSFUL;
   uintptr_t          intrStackStart;
   uintptr_t          intrStackSize;
   ppc_cpu_id_t       myCpu;
@@ -158 +184 @@
   /* Set the character output function;  The application may override this */
   BSP_output_char = __bsp_outchar_to_memory;
 
+  printk("\nWelcome to RTEMS %s\n", _RTEMS_version );
+
   /*
    * Get CPU identification dynamically. Note that the get_ppc_cpu_type()
-   * function stores the result in global variables
-   * so that it can be used later...
+   * function stores the result in global variables so that it can be used later...
    */
   myCpu         = get_ppc_cpu_type();
   myCpuRevision = get_ppc_cpu_revision();
@@ -183 +210 @@
    */
   intrStackStart = CPU_UP_ALIGN((uint32_t)__bsp_ram_start);
   intrStackSize  = rtems_configuration_get_interrupt_stack_size();
-
-  /*
-   * Initialize default raw exception handlers.
-   */
-  sc = ppc_exc_initialize(PPC_INTERRUPT_DISABLE_MASK_DEFAULT,
-                          intrStackStart,
-                          intrStackSize);
-  if (sc != RTEMS_SUCCESSFUL)  BSP_panic("Cannot initialize exceptions");
+  printk("RamBase:               0x%08x                 Size: 0x%x\n"
+         "RTEMS End:             0x%08x\n"
+         "Interrupt Stack Start: 0x%08x                 Size: 0x%x\n"
+         "Stack Base:            0x%08x End: 0x%08x Size: 0x%x\n"
+         "Workspace Start:       0x%08x End: 0x%08x\n"
+         "MsgAreaBase:           0x%08x                 Size: 0x%x\n"
+         "Physical RAM End:      0x%08x\n",
+         (uint32_t)RamBase, (uint32_t)RamSize,
+         (uint32_t)__rtems_end,
+         intrStackStart, intrStackSize,
+         (uint32_t)__stack_base, (uint32_t)StackSize, (uint32_t)_stack,
+         (uint32_t)WorkAreaBase, (uint32_t)__bsp_ram_end,
+         (uint32_t)MsgAreaBase, (uint32_t)MsgAreaSize,
+         (uint32_t)__phy_ram_end);
 
   /* Continue with application-specific initialization */
   app_bsp_start();

c/src/lib/libbsp/powerpc/virtex5/startup/dummy_console.c

@@ -1 +1 @@
 #include <rtems.h>
 #include <rtems/libio.h>
 
-extern int app_memory_write(int minor, const char* buf, int len);
+#include <string.h>
+
+ssize_t app_memory_write(int minor, const char* buf, size_t len)
+__attribute__(( weak, alias("__bsp_memory_write") ));
+
+ssize_t __bsp_memory_write(int minor, const char* buf, size_t len);
+rtems_device_driver console_initialize(rtems_device_major_number major,
+                                       rtems_device_minor_number minor,
+                                       void*                     arg);
+rtems_device_driver console_open(rtems_device_major_number major,
+                                 rtems_device_minor_number minor,
+                                 void*                     arg);
+rtems_device_driver console_close(rtems_device_major_number major,
+                                  rtems_device_minor_number minor,
+                                  void*                     arg);
+rtems_device_driver console_read(rtems_device_major_number major,
+                                 rtems_device_minor_number minor,
+                                 void*                     arg);
+rtems_device_driver console_write(rtems_device_major_number major,
+                                  rtems_device_minor_number minor,
+                                  void*                     arg);
+rtems_device_driver console_control(rtems_device_major_number major,
+                                    rtems_device_minor_number minor,
+                                    void*                     arg);
+
+
+ssize_t __bsp_memory_write(int minor, const char* buf, size_t len)
+{
+  const char* const last = buf+len;
+  while (buf < last)
+  {
+    BSP_output_char(*buf++);
+  }
+  return len;
+}
 
 static rtems_termios_callbacks gMemCallbacks = {
         0,                /* firstOpen */

c/src/lib/libbsp/powerpc/virtex5/startup/linkcmds

@@ -10 +10 @@
 
 ENTRY(download_entry)
 
-MsgAreaSize       = DEFINED(MsgAreaSize)   ? MsgAreaSize   : 1K;
+MsgAreaSize       = DEFINED(MsgAreaSize)   ? MsgAreaSize   : 1M;
 RamBase           = DEFINED(RamBase)       ? RamBase       : 0x0;
-RamSize           = DEFINED(RamSize)       ? RamSize       : 4096M - MsgAreaSize;
+RamSize           = DEFINED(RamSize)       ? RamSize       : 2048M - MsgAreaSize;
 IntrStackSize     = DEFINED(IntrStackSize) ? IntrStackSize : 16K;
 StackSize         = DEFINED(StackSize)     ? StackSize     : 64K;
 HeapSize          = DEFINED(HeapSize)      ? HeapSize      : 0; /* 0=Use def */
@@ -21 +21 @@
 MEMORY
 {
   VECTORS         : ORIGIN = 0x00000000, LENGTH = 8K
-  RAM             : ORIGIN = 0x00002000, LENGTH = 4096M - 8K
+  RAM             : ORIGIN = 0x00002000, LENGTH = 2048M - 8K
 }
 
 
@@ -244 +244 @@
 
   /* The heap comes after the work space */
 
-   .              = RamBase + RamSize - MsgAreaSize;
+   .              = RamBase + RamSize;
   PROVIDE(__bsp_ram_end = .);
 
   /* Message area for capturing early printk output */