Changeset 7da3405 in rtems

Timestamp:

06/20/07 21:42:00 (16 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

19b4789

Parents:

18481be3

Message:

2007-06-20 Joel Sherrill <joel.sherrill@…>

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.

Location:

c/src/lib/libbsp/powerpc/gen5200

Files:

• ChangeLog (modified) (1 diff)
• Makefile.am (modified) (3 diffs)
• clock/clock.c (modified) (1 diff)
• console/console.c (modified) (1 diff)
• include/bsp.h (modified) (4 diffs)
• include/mpc5200.h (modified) (1 diff)
• preinstall.am (modified) (1 diff)
• startup/bspstart.c (modified) (3 diffs)
• startup/linkcmds.icecube (added)
• vectors/vectors.S (modified) (3 diffs)

c/src/lib/libbsp/powerpc/gen5200/ChangeLog

@@ +1 @@
+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>
 

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

@@ -32 +32 @@
 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 +53 @@
     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 +113 @@
 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)

c/src/lib/libbsp/powerpc/gen5200/clock/clock.c

@@ -171 +171 @@
   {
   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;
 
   }

c/src/lib/libbsp/powerpc/gen5200/console/console.c

@@ -498 +498 @@
   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;
-
 
   /*

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

@@ -91 +91 @@
 #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 +129 @@
 
 #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 +210 @@
 #define SINGLE_CHAR_MODE
 #define UARTS_USE_TERMIOS_INT   1
+/* #define SHOW_MORE_INIT_SETTINGS 1 */
 
 /* ata modes */
@@ -206 +227 @@
 #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

c/src/lib/libbsp/powerpc/gen5200/include/mpc5200.h

@@ -700 +700 @@
 
 #endif
-        /*
+    /*
      * programmable serial controller 1 (MBAR + 0x2000)
      */

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

@@ -86 +86 @@
 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

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

@@ -245 +245 @@
 }
 
-
-
 void bsp_start(void)
 {
@@ -258 +256 @@
    * 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 +263 @@
   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();
 

c/src/lib/libbsp/powerpc/gen5200/vectors/vectors.S

@@ -67 +67 @@
 
 #include <rtems/asm.h>
+#include <bspopts.h>
 #include <rtems/score/cpu.h>
 #include "vectors.h"    
@@ -198 +199 @@
         rfi
 
+#if !defined(ep5200)
         .section .vectors,"awx",@progbits
 
@@ -262 +264 @@
         .long 0x04000400
         .endr
-
+#endif