Index: c/src/lib/libbsp/powerpc/gen5200/ChangeLog
===================================================================
--- c/src/lib/libbsp/powerpc/gen5200/ChangeLog	(revision 18481be37d418fc713ee411f34e329266d60985f)
+++ c/src/lib/libbsp/powerpc/gen5200/ChangeLog	(revision 7da34053e781f749be7e05b29c2e008d55b98e12)
@@ -1,2 +1,23 @@
+2007-06-20	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	Add Embedded Planets EP5200 which is the same as the Freescale
+	5200Lite (a.k.a. IceCube) evaluation board.
+	* Makefile.am: Add linkcmds.ep5200.
+	Add -DMPC5200_BAPI_LIBC_HEADERS to remove some warnings in bestcomm.
+	* preinstall.am: Add linkcmds.ep5200.
+	* clock/clock.c: Correct math for prescaler/counter when bus speed
+	is high enough to require multiple passes of loop.
+	* console/console.c: Use same math for initial baud rate as when it
+	is changed via ioctl.  When HAS_UBOOT is defined, initialize console
+	to the same baud as it was with U-Boot.
+	* include/bsp.h: Add EP5200 and console boot baud support.
+	* include/mpc5200.h: Spacing.
+	* startup/bspstart.c: If HAS_UBOOT and SHOW_MORE_INIT_SETTINGS are
+	both defined, dump the U-Boot BD info structure.
+	* vectors/vectors.S: ep5200 cannot use vectors segment.  When loading
+	it, U-Boot freezes.  Besides, U-Boot can automatically start the BSP
+	so we do not have to run from board reset.
+	* startup/linkcmds.ep5200: New file.
+
 2007-04-17	Ralf CorsÃ©pius <ralf.corsepius@rtems.org>
 
Index: c/src/lib/libbsp/powerpc/gen5200/Makefile.am
===================================================================
--- c/src/lib/libbsp/powerpc/gen5200/Makefile.am	(revision 18481be37d418fc713ee411f34e329266d60985f)
+++ c/src/lib/libbsp/powerpc/gen5200/Makefile.am	(revision 7da34053e781f749be7e05b29c2e008d55b98e12)
@@ -32,4 +32,5 @@
 dist_project_lib_DATA += startup/linkcmds
 dist_project_lib_DATA += startup/linkcmds.brs5l
+dist_project_lib_DATA += startup/linkcmds.ep5200
 dist_project_lib_DATA += startup/linkcmds.pm520
 
@@ -52,5 +53,5 @@
     bestcomm/task_api/tasksetup_bdtable.h \
     bestcomm/task_api/tasksetup_general.h
-bestcomm_rel_CPPFLAGS = $(AM_CPPFLAGS)
+bestcomm_rel_CPPFLAGS = $(AM_CPPFLAGS) -DMPC5200_BAPI_LIBC_HEADERS
 bestcomm_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
@@ -112,5 +113,5 @@
 startup_rel_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \
     ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \
-    ../../shared/sbrk.c \
+    ../../shared/sbrk.c ../shared/uboot_dump_bdinfo.c \
     ../../shared/gnatinstallhandler.c startup/cpuinit.c start/start.S
 startup_rel_CPPFLAGS = $(AM_CPPFLAGS)
Index: c/src/lib/libbsp/powerpc/gen5200/clock/clock.c
===================================================================
--- c/src/lib/libbsp/powerpc/gen5200/clock/clock.c	(revision 18481be37d418fc713ee411f34e329266d60985f)
+++ c/src/lib/libbsp/powerpc/gen5200/clock/clock.c	(revision 7da34053e781f749be7e05b29c2e008d55b98e12)
@@ -171,18 +171,17 @@
   {
   uint32_t prescaler_value = 1;
+  uint32_t counter = counter_value;
   struct mpc5200_gpt *gpt = (struct mpc5200_gpt *)(&mpc5200.gpt[gpt_no]);
 
   /* Calculate counter/prescaler value, e.g. IPB_Clock=33MHz -> Int. every 0,3 nsecs. - 130 secs.*/
-  while((counter_value >= (1 << 16)) && (prescaler_value < (1 << 16)))
+  while((counter >= (1 << 16)) && (prescaler_value < (1 << 16)))
     {
-
-    prescaler_value++;
-	counter_value /= prescaler_value;
-
-    }
-
-  counter_value = (uint16_t)counter_value;
-
-  gpt->count_in = (prescaler_value << 16) + counter_value;
+      prescaler_value++;
+      counter = counter_value / prescaler_value;
+    }
+
+  counter = (uint16_t)counter;
+
+  gpt->count_in = (prescaler_value << 16) + counter;
 
   }
Index: c/src/lib/libbsp/powerpc/gen5200/console/console.c
===================================================================
--- c/src/lib/libbsp/powerpc/gen5200/console/console.c	(revision 18481be37d418fc713ee411f34e329266d60985f)
+++ c/src/lib/libbsp/powerpc/gen5200/console/console.c	(revision 7da34053e781f749be7e05b29c2e008d55b98e12)
@@ -498,10 +498,10 @@
   psc->tfalarm = 1;
 
-  baud_divider = IPB_CLOCK / (9600 * 32);
+  baud_divider = (IPB_CLOCK + GEN5200_CONSOLE_BAUD *16) / (GEN5200_CONSOLE_BAUD * 32);
+
   /*
    * Set upper timer counter
    */
   psc->ctur = baud_divider >> 16;
-
 
   /*
Index: c/src/lib/libbsp/powerpc/gen5200/include/bsp.h
===================================================================
--- c/src/lib/libbsp/powerpc/gen5200/include/bsp.h	(revision 18481be37d418fc713ee411f34e329266d60985f)
+++ c/src/lib/libbsp/powerpc/gen5200/include/bsp.h	(revision 7da34053e781f749be7e05b29c2e008d55b98e12)
@@ -91,4 +91,22 @@
 #define HAS_UBOOT
 
+#elif defined (ep5200)
+/*
+ *  Embedded Planet EP5200 -- should be the same as a Freescale 5200lite
+ *  which is also known as the Ice Cube.  In the RTEMS configuration,
+ *  we load U-Boot on it instead of the default dBug.
+ */
+
+#define HAS_UBOOT
+
+/* These are copied from PM520 but seem to work so OK */
+#define GPIOPCR_INITMASK 0x330F0F77
+#define GPIOPCR_INITVAL  0x01050444
+
+/* we only have PSC1 */
+#define GEN5200_UART_AVAIL_MASK 0x01
+
+#define	MBAR         0xF0000000
+
 #else
 #error "board type not defined"
@@ -111,6 +129,8 @@
 
 #if defined(HAS_UBOOT)
+/* This is the define U-Boot uses to configure which entries in the structure are valid */
 #define CONFIG_MPC5xxx
 #include <u-boot.h>
+
 extern bd_t *uboot_bdinfo_ptr;
 extern bd_t uboot_bdinfo_copy;
@@ -190,4 +210,5 @@
 #define SINGLE_CHAR_MODE
 #define UARTS_USE_TERMIOS_INT   1
+/* #define SHOW_MORE_INIT_SETTINGS 1 */
 
 /* ata modes */
@@ -206,4 +227,10 @@
 #endif
 
+#if defined(HAS_UBOOT)
+#define GEN5200_CONSOLE_BAUD (uboot_bdinfo_ptr->bi_baudrate)
+#else
+#define GEN5200_CONSOLE_BAUD 9600
+#endif
+
 /*
  *  Convert decrement value to tenths of microsecnds (used by
Index: c/src/lib/libbsp/powerpc/gen5200/include/mpc5200.h
===================================================================
--- c/src/lib/libbsp/powerpc/gen5200/include/mpc5200.h	(revision 18481be37d418fc713ee411f34e329266d60985f)
+++ c/src/lib/libbsp/powerpc/gen5200/include/mpc5200.h	(revision 7da34053e781f749be7e05b29c2e008d55b98e12)
@@ -700,5 +700,5 @@
 
 #endif
-	/*
+    /*
      * programmable serial controller 1 (MBAR + 0x2000)
      */
Index: c/src/lib/libbsp/powerpc/gen5200/preinstall.am
===================================================================
--- c/src/lib/libbsp/powerpc/gen5200/preinstall.am	(revision 18481be37d418fc713ee411f34e329266d60985f)
+++ c/src/lib/libbsp/powerpc/gen5200/preinstall.am	(revision 7da34053e781f749be7e05b29c2e008d55b98e12)
@@ -86,4 +86,8 @@
 PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.brs5l
 
+$(PROJECT_LIB)/linkcmds.ep5200: startup/linkcmds.ep5200 $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.ep5200
+PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.ep5200
+
 $(PROJECT_LIB)/linkcmds.pm520: startup/linkcmds.pm520 $(PROJECT_LIB)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.pm520
Index: c/src/lib/libbsp/powerpc/gen5200/startup/bspstart.c
===================================================================
--- c/src/lib/libbsp/powerpc/gen5200/startup/bspstart.c	(revision 18481be37d418fc713ee411f34e329266d60985f)
+++ c/src/lib/libbsp/powerpc/gen5200/startup/bspstart.c	(revision 7da34053e781f749be7e05b29c2e008d55b98e12)
@@ -245,6 +245,4 @@
 }
 
-
-
 void bsp_start(void)
 {
@@ -258,5 +256,5 @@
    * store the result in global variables so that it can be used latter...
    */
-  myCpu 	    = get_ppc_cpu_type();
+  myCpu         = get_ppc_cpu_type();
   myCpuRevision = get_ppc_cpu_revision();
 
@@ -265,4 +263,12 @@
   uboot_bdinfo_ptr = &uboot_bdinfo_copy;
 #endif  
+
+#if defined(HAS_UBOOT) && defined(SHOW_MORE_INIT_SETTINGS)
+  {
+    void dumpUBootBDInfo( bd_t * );
+    dumpUBootBDInfo( uboot_bdinfo_ptr );
+  }
+#endif
+
   cpu_init();
 
Index: c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.icecube
===================================================================
--- c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.icecube	(revision 7da34053e781f749be7e05b29c2e008d55b98e12)
+++ c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.icecube	(revision 7da34053e781f749be7e05b29c2e008d55b98e12)
@@ -0,0 +1,348 @@
+/*
+ *  This file contains directives for the GNU linker which are specific
+ *  to a MicroSys PM520 Board
+ *
+ *  linkcmds,v 1.3 2003/01/20 19:53:27 joel Exp
+ */
+
+OUTPUT_FORMAT("elf32-powerpc", "elf32-powerpc",
+              "elf32-powerpc")
+OUTPUT_ARCH(powerpc)
+ 
+ENTRY(start)
+
+/*
+ * Declare some sizes.
+ * XXX: The assignment of ". += XyzSize;" fails in older gld's if the
+ *      number used there is not constant.  If this happens to you, edit
+ *      the lines marked XXX below to use a constant value.
+ */
+HeapSize = DEFINED(HeapSize) ? HeapSize    : 0x100000;  /* 1M  Heap */
+StackSize = DEFINED(StackSize) ? StackSize :   0x80000;  /* 512 kB   */
+WorkSpaceSize = DEFINED(WorkSpaceSize) ? WorkSpaceSize : 0x80000; /* 512k */
+RamDiskSize = DEFINED(RamDiskSize) ? RamDiskSize : 0x80000; /* 512 ram disk */
+ 
+MEMORY
+	{
+	ram : org = 0x0, l = 128M
+	mpc5200_regs : org = 0xF0000000, l = 24K 
+	flash : org = 0xFFE00000, l = 2M
+	}
+
+
+SECTIONS
+{
+
+/*
+   .vectors 0x100 :
+    {
+    *(.vectors)
+    }   
+    > ram
+*/
+
+    /* 
+     * The stack will live in this area - between the vectors and
+     * the text section.
+     */
+	
+    .text 0x40000:
+    {
+    _textbase = .;
+
+
+    text.start = .;
+
+    /* Entry point is the .entry section */
+    *(.entry)
+    *(.entry2)
+
+    /* Actual Code */
+    *(.text*)
+
+
+    *(.rodata*)
+    *(.rodata1)
+
+
+    /*
+     * Special FreeBSD sysctl sections.
+     */
+    . = ALIGN (16);
+    __start_set_sysctl_set = .;
+    *(set_sysctl_*);
+    __stop_set_sysctl_set = ABSOLUTE(.);
+    *(set_domain_*);
+    *(set_pseudo_*);
+
+    /* C++ constructors/destructors */
+    *(.gnu.linkonce.t*)
+
+    /*  Initialization and finalization code.
+     *
+     *  Various files can provide initialization and finalization functions.
+     *  The bodies of these functions are in .init and .fini sections. We
+     *  accumulate the bodies here, and prepend function prologues from
+     *  ecrti.o and function epilogues from ecrtn.o. ecrti.o must be linked
+     *  first; ecrtn.o must be linked last. Because these are wildcards, it
+     *  doesn't matter if the user does not actually link against ecrti.o and
+     *  ecrtn.o; the linker won't look for a file to match a wildcard.  The
+     *  wildcard also means that it doesn't matter which directory ecrti.o
+     *  and ecrtn.o are in. 
+     */
+    PROVIDE (_init = .);
+    *ecrti.o(.init)
+    *(.init)
+    *ecrtn.o(.init)
+    
+    PROVIDE (_fini = .);
+    *ecrti.o(.fini)
+    *(.fini)
+    *ecrtn.o(.init)
+
+    /* 
+     *  C++ constructors and destructors for static objects.
+     *  PowerPC EABI does not use crtstuff yet, so we build "old-style"
+     *  constructor and destructor lists that begin with the list lenght
+     *  end terminate with a NULL entry.
+     */
+     
+    PROVIDE (__CTOR_LIST__ = .);	     
+    /* LONG((__CTOR_END__ - __CTOR_LIST__) / 4 - 2) */
+    *crtbegin.o(.ctors)
+    *(.ctors)
+    *crtend.o(.ctors)
+    LONG(0)
+    PROVIDE (__CTOR_END__ = .);
+	
+    PROVIDE (__DTOR_LIST__ = .);
+    /* LONG((__DTOR_END__ - __DTOR_LIST__) / 4 - 2) */
+    *crtbegin.o(.dtors)
+    *(.dtors)
+    *crtend.o(.dtors)
+    LONG(0)
+    PROVIDE (__DTOR_END__ = .);
+	
+    /* Exception frame info */
+    *(.eh_frame)
+
+    /* Miscellaneous read-only data */
+    _rodata_start = . ;
+    *(.gnu.linkonce.r*)
+    *(.lit)
+    *(.shdata)
+    *(.rodata)
+    *(.rodata1)
+    *(.descriptors)
+    *(rom_ver)
+    _erodata = .;
+
+
+    /* Various possible names for the end of the .text section */
+    etext = ALIGN(0x10);
+    _etext = .;
+    _endtext = .;
+    text.end = .;
+    PROVIDE (etext = .);
+    PROVIDE (__etext = .);
+ 
+    } > ram
+
+	
+    PROVIDE (__EXCEPT_START__ = .);
+    .gcc_except_table   : { *(.gcc_except_table) } >ram
+    PROVIDE (__EXCEPT_END__ = .);
+    __GOT_START__ = .;
+    .got :
+    {
+      s.got = .;
+      *(.got.plt) *(.got)
+    } > ram
+    __GOT_END__ = .;
+	
+    .got1		  : { *(.got1) 		} >ram
+    PROVIDE (__GOT2_START__ = .);
+    PROVIDE (_GOT2_START_ = .);
+    .got2		  :  { *(.got2) 	} >ram
+    PROVIDE (__GOT2_END__ = .);
+    PROVIDE (_GOT2_END_ = .);
+    
+    PROVIDE (__FIXUP_START__ = .);
+    PROVIDE (_FIXUP_START_ = .);
+    .fixup	  : { *(.fixup) 	} >ram
+    PROVIDE (_FIXUP_END_ = .);
+    PROVIDE (__FIXUP_END__ = .);
+ 
+    .rel.dyn : {
+      *(.rel.init)
+      *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*)
+      *(.rel.fini)
+      *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*)
+      *(.rel.data.rel.ro* .rel.gnu.linkonce.d.rel.ro.*)
+      *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*)
+      *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*)
+      *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*)
+      *(.rel.ctors)
+      *(.rel.dtors)
+      *(.rel.got)
+      *(.rel.sdata .rel.sdata.* .rel.gnu.linkonce.s.*)
+      *(.rel.sbss .rel.sbss.* .rel.gnu.linkonce.sb.*)
+      *(.rel.sdata2 .rel.sdata2.* .rel.gnu.linkonce.s2.*)
+      *(.rel.sbss2 .rel.sbss2.* .rel.gnu.linkonce.sb2.*)
+      *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*)
+    } >ram
+    .rela.dyn : {
+      *(.rela.init)
+      *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*)
+      *(.rela.fini)
+      *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*)
+      *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*)
+      *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*)
+      *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*)
+      *(.rela.ctors)
+      *(.rela.dtors)
+      *(.rela.got)
+      *(.rela.got1)
+      *(.rela.got2)
+      *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*)
+      *(.rela.sbss .rela.sbss.* .rela.gnu.linkonce.sb.*)
+      *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*)
+      *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*)
+      *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*)
+    } >ram
+
+    PROVIDE (__SDATA2_START__ = .);
+    .sdata2   	  : { *(.sdata2) *(.gnu.linkonce.s2.*)	} >ram
+    .sbss2   	  : { *(.sbss2) *(.gnu.linkonce.sb2.*)	} >ram
+    PROVIDE (__SBSS2_END__ = .);
+	
+    .sbss2   	  : { *(.sbss2) 	} >ram
+    PROVIDE (__SBSS2_END__ = .);
+	
+    __SBSS_START__ = .;
+    .bss :
+    {
+      bss.start = .;
+      *(.bss .bss* .gnu.linkonce.b*)
+      *(.sbss*) *(COMMON)
+      . = ALIGN(4);
+      bss.end = .;
+    } > ram
+    __SBSS_END__ = .;
+
+
+
+
+
+    /* R/W Data */
+    .data ( . ) :
+    {
+      . = ALIGN (4);
+
+      data.start = .;
+
+      *(.data)
+      *(.data.rel.*)
+      *(.data1)
+      *(.data.* .gnu.linkonce.d.*)
+      PROVIDE (__SDATA_START__ = .);
+      *(.sdata*)
+      *(.gnu.linkonce.s.*)
+      data.end = .;
+    } > ram
+
+    data.size = data.end - data.start;
+    bss.size = bss.end - bss.start;
+    text.size = text.end - text.start;
+
+    PROVIDE(_bss_start   = ADDR(.bss));
+    PROVIDE(_bss_size    = SIZEOF(.bss));
+    PROVIDE(_data_start  = ADDR(.data));
+    PROVIDE(_data_size   = SIZEOF(.data));
+    PROVIDE(_text_start  = ADDR(.text));
+    PROVIDE(_text_size   = SIZEOF(.text));
+    PROVIDE(_end = data.end);
+
+    .gzipmalloc : {
+	. = ALIGN (16);
+        _startmalloc = .;
+     } >ram
+          	
+
+    /*
+     * Interrupt stack setup
+     */
+    IntrStack_start = ALIGN(0x10);
+    . += 0x4000;
+    intrStack = .;
+    PROVIDE(intrStackPtr = intrStack);
+
+
+
+    _WorkspaceBase = .;
+    __WorkspaceBase = .;
+    . += WorkSpaceSize;
+
+    _RamDiskBase = .;
+    __RamDiskBase = .;
+    . += RamDiskSize;
+    _RamDiskEnd  = .;
+    __RamDiskEnd = .;
+    PROVIDE( _RamDiskSize = _RamDiskEnd - _RamDiskBase );
+
+    _HeapStart = .;
+    __HeapStart = .;
+    . += HeapSize;
+    _HeapEnd = .;
+    __HeapEnd = .;
+
+    clear_end = .;
+
+    /* Sections for compressed .text and .data         */
+    /* after the .datarom section is an int specifying */
+    /* the length of the following compressed image    */
+    /* Executes once then could get overwritten        */
+    .textrom 0x100000 :
+    {
+    	*(.textrom)
+    	_endloader = .;
+    } > ram
+
+    .datarom :
+    {
+    	_dr_start = .;
+    	*(.datarom)
+    	_dr_end = .;
+    } > ram
+    dr_len = _dr_end - _dr_start;
+
+    mpc5200_regs :
+    { 
+    MBAR = .;
+    mpc5200 = .;
+    _mpc5200 = .;
+    . += (0x6000);
+    } > mpc5200_regs
+
+
+     /* the reset vector is at 0xfff00000 which is */
+     /* located at offset 0x400000 from the base   */
+     /* of flash                                   */
+    .bootrom 0xFFE00000 :
+    {
+      *(.bootrom)
+      _endboot = .;
+    } > flash
+
+
+    .line 0 : { *(.line) }
+    .debug 0 : { *(.debug) }
+    .debug_sfnames 0 : { *(.debug_sfnames) }
+    .debug_srcinfo 0 : { *(.debug_srcinfo) }
+    .debug_pubnames 0 : { *(.debug_pubnames) }
+    .debug_aranges 0 : { *(.debug_aranges) }
+    .debug_aregion 0 : { *(.debug_aregion) }
+    .debug_macinfo 0 : { *(.debug_macinfo) }
+    .stab 0 : { *(.stab) }
+    .stabstr 0 : { *(.stabstr) }
+}
Index: c/src/lib/libbsp/powerpc/gen5200/vectors/vectors.S
===================================================================
--- c/src/lib/libbsp/powerpc/gen5200/vectors/vectors.S	(revision 18481be37d418fc713ee411f34e329266d60985f)
+++ c/src/lib/libbsp/powerpc/gen5200/vectors/vectors.S	(revision 7da34053e781f749be7e05b29c2e008d55b98e12)
@@ -67,4 +67,5 @@
 
 #include <rtems/asm.h>
+#include <bspopts.h>
 #include <rtems/score/cpu.h>
 #include "vectors.h"	
@@ -198,4 +199,5 @@
 	rfi
 
+#if !defined(ep5200)
 	.section .vectors,"awx",@progbits
 
@@ -262,3 +264,3 @@
 	.long 0x04000400
 	.endr
-
+#endif
