2008-09-14 Joel Sherrill <joel.sherrill@oarcorp.com>

	* Makefile.am, configure.ac, startup/bspstart.c: Split out
	bsp_get_work_area() into its own file and user BSP Framework to
	perform more initialization. Use same shared implementation as
	edb7312 and csb336.

4 files changed, 116 insertions, 170 deletions

diff --git a/c/src/lib/libbsp/arm/gp32/ChangeLog b/c/src/lib/libbsp/arm/gp32/ChangeLog
index f61c15d41c..7861da2700 100644
--- a/c/src/lib/libbsp/arm/gp32/ChangeLog
+++ b/c/src/lib/libbsp/arm/gp32/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-14	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* Makefile.am, configure.ac, startup/bspstart.c: Split out
+	bsp_get_work_area() into its own file and user BSP Framework to
+	perform more initialization. Use same shared implementation as
+	edb7312 and csb336.
+
 2008-08-21	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* Makefile.am: No BSP should use exit.c as a file name. exit() is POSIX
diff --git a/c/src/lib/libbsp/arm/gp32/Makefile.am b/c/src/lib/libbsp/arm/gp32/Makefile.am
index f8247300d6..a978b2de91 100644
--- a/c/src/lib/libbsp/arm/gp32/Makefile.am
+++ b/c/src/lib/libbsp/arm/gp32/Makefile.am
@@ -27,9 +27,9 @@ project_lib_DATA = start.$(OBJEXT)
 dist_project_lib_DATA += startup/linkcmds
 
 startup_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \
-    ../../shared/bsppredriverhook.c \
-    startup/bspstart.c startup/bspclean.c startup/memmap.c \
-    ../../shared/bootcard.c ../../shared/sbrk.c \
+    ../../shared/bsppredriverhook.c ../shared/bspgetworkarea.c \
+    ../../shared/bsppretaskinghook.c startup/bspstart.c startup/bspclean.c \
+    startup/memmap.c ../../shared/bootcard.c ../../shared/sbrk.c \
     ../../shared/gnatinstallhandler.c
 console_SOURCES = console/uart.c ../../shared/console.c
 abort_SOURCES = ../shared/abort/abort.c
diff --git a/c/src/lib/libbsp/arm/gp32/configure.ac b/c/src/lib/libbsp/arm/gp32/configure.ac
index 6e60ea9a1a..1e346815af 100644
--- a/c/src/lib/libbsp/arm/gp32/configure.ac
+++ b/c/src/lib/libbsp/arm/gp32/configure.ac
@@ -18,6 +18,8 @@ RTEMS_PROG_CCAS
 RTEMS_CHECK_NETWORKING 
 AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
 
+RTEMS_BSP_BOOTCARD_HANDLES_RAM_ALLOCATION
+
 # Explicitly list all Makefiles here
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/arm/gp32/startup/bspstart.c b/c/src/lib/libbsp/arm/gp32/startup/bspstart.c
index 7a226cb882..6eba665385 100644
--- a/c/src/lib/libbsp/arm/gp32/startup/bspstart.c
+++ b/c/src/lib/libbsp/arm/gp32/startup/bspstart.c
@@ -1,17 +1,17 @@
-/*-------------------------------------------------------------------------+
-| This file contains the ARM BSP startup package. It includes application,
-| board, and monitor specific initialization and configuration. The generic CPU
-| dependent initialization has been performed before this routine is invoked. 
-+--------------------------------------------------------------------------+
-|
-| Copyright (c) 2000 Canon Research Centre France SA.
-| Emmanuel Raguet, mailto:raguet@crf.canon.fr
-|
-|   The license and distribution terms for this file may be
-|   found in found in the file LICENSE in this distribution or at
-|   http://www.rtems.com/license/LICENSE.
-|
-+--------------------------------------------------------------------------*/
+/*
+ * This file contains the ARM BSP startup package. It includes application,
+ * board, and monitor specific initialization and configuration. The generic CPU
+ * dependent initialization has been performed before this routine is invoked. 
+ *
+ *
+ * Copyright (c) 2000 Canon Research Centre France SA.
+ * Emmanuel Raguet, mailto:raguet@crf.canon.fr
+ *
+ *   The license and distribution terms for this file may be
+ *   found in found in the file LICENSE in this distribution or at
+ *   http://www.rtems.com/license/LICENSE.
+ *
+ */ 
 
 
 #include <bsp.h>
@@ -20,49 +20,14 @@
 #include <rtems/bspIo.h>
 #include <s3c24xx.h>
 
-/*-------------------------------------------------------------------------+
-| Global Variables
-+--------------------------------------------------------------------------*/
-
-extern void            *_sdram_size;
-extern void            *_sdram_base;
-extern void            *_bss_free_start;
-
-unsigned long           free_mem_start;
-unsigned long           free_mem_end;
-
-/*-------------------------------------------------------------------------+
-| External Prototypes
-+--------------------------------------------------------------------------*/
+/*
+ * External Prototypes
+ */
 extern void rtems_irq_mngt_init(void);
-void bsp_libc_init( void *, uint32_t, int );
-
-/*-------------------------------------------------------------------------+
-|         Function: bsp_pretasking_hook
-|      Description: BSP pretasking hook.  Called just before drivers are
-|                   initialized. Used to setup libc and install any BSP
-|                   extensions. NOTE: Must not use libc (to do io) from here,
-|                   since drivers are not yet initialized.
-| Global Variables: None.
-|        Arguments: None.
-|          Returns: Nothing. 
-+--------------------------------------------------------------------------*/
-void bsp_pretasking_hook(void)
-{
-    uint32_t heap_start;
-    uint32_t heap_size;
-
-    /* 
-     * Set up the heap. 
-     */
-    heap_start =  free_mem_start;
-    heap_size = free_mem_end - free_mem_start;
-
-    /* call rtems lib init - malloc stuff */
-    bsp_libc_init((void *)heap_start, heap_size, 0);
-
-} /* bsp_pretasking_hook */
 
+/*
+ *  BSP specific Idle task
+ */
 Thread bsp_idle_task(uint32_t ignored)
 {
   while(1) {
@@ -70,95 +35,67 @@ Thread bsp_idle_task(uint32_t ignored)
   }
 }
  
-/*-------------------------------------------------------------------------+
-|         Function: bsp_start
-|      Description: Called before main is invoked.
-| Global Variables: None.
-|        Arguments: None.
-|          Returns: Nothing. 
-+--------------------------------------------------------------------------*/
+/*
+ *  BSP Specific Initialization in C
+ */
 void bsp_start_default( void )
 {
-    uint32_t cr;
-    uint32_t pend,last;
-    uint32_t REFCNT;
-    int i;
-
-    /* stop RTC */
-#ifdef CPU_S3C2400
-    rTICINT=0x0;
-#else
-    rTICNT=0x0;
-#endif
-    /* stop watchdog,ADC and timers */
-    rWTCON=0x0;
-    rTCON=0x0;
-    rADCCON=0x0;
-
-    /* disable interrupts */
-    rINTMOD=0x0;
-    rINTMSK=BIT_ALLMSK; /* unmasked by drivers */
-
-    last=0;
-    for(i=0; i<4; i++) {
-	pend=rSRCPND;
-	if(pend == 0 || pend == last)
-	    break;
-	rSRCPND=pend;
-	rINTPND=pend;
-	last=pend;
-    }
-
-    /* setup clocks */
-    rCLKDIVN=M_CLKDIVN;
-    rMPLLCON=((M_MDIV<<12)+(M_PDIV<<4)+M_SDIV);
-    /* setup rREFRESH */
-    REFCNT=2048+1-(15.6*get_HCLK()/1000000); /* period=15.6 us, HCLK=66Mhz, (2048+1-15.6*66) */
-    rREFRESH=((REFEN<<23)+(TREFMD<<22)+(Trp<<20)+(Trc<<18)+(Tchr<<16)+REFCNT);
-
-    /* set prescaler for timers 2,3,4 to 16(15+1) */
-    cr=rTCFG0 & 0xFFFF00FF;
-    rTCFG0=(cr | (15<<8));
-
-    /* set prescaler for timers 0,1 to 1(0+1) */
-    cr=rTCFG0 & 0xFFFFFF00;
-    rTCFG0=(cr | (0<<0));
-
-    /* Place RTEMS workspace at beginning of free memory. */
-    Configuration.work_space_start = (void *)&_bss_free_start;
-
-    free_mem_start = ((uint32_t)&_bss_free_start + rtems_configuration_get_work_space_size());
-    
-    free_mem_end = ((uint32_t)&_sdram_base + (uint32_t)&_sdram_size);
-
-    /*
-     * Init rtems exceptions management
-     */
-    rtems_exception_init_mngt();
-
-    /*
-     * Init rtems interrupt management
-     */
-    rtems_irq_mngt_init();
-    /*
-     *  The following information is very useful when debugging.
-     */
-
-#if 0
-    printk( "work_space_size = 0x%x\n",
-             rtems_configuration_get_work_space_size() );
-    printk( "microseconds_per_tick = 0x%x\n",
-            rtems_configuration_get_microseconds_per_tick() );
-    printk( "ticks_per_timeslice = 0x%x\n",
-            rtems_configuration_get_ticks_per_timeslice() );
-    
-    printk( "_heap_size = 0x%x\n", _heap_size );
-    /*  printk( "_stack_size = 0x%x\n", _stack_size );*/
-    printk( "rtemsFreeMemStart = 0x%x\n", rtemsFreeMemStart );
-    printk( "work_space_start = 0x%x\n", Configuration.work_space_start );
-    printk( "work_space_size = 0x%x\n", rtems_configuration_get_work_space_size() );
-#endif
+  uint32_t cr;
+  uint32_t pend,last;
+  uint32_t REFCNT;
+  int i;
+
+  /* stop RTC */
+  #ifdef CPU_S3C2400
+    rTICINT = 0x0;
+  #else
+    rTICNT = 0x0;
+  #endif
+  /* stop watchdog,ADC and timers */
+  rWTCON = 0x0;
+  rTCON = 0x0;
+  rADCCON = 0x0;
+
+  /* disable interrupts */
+  rINTMOD = 0x0;
+  rINTMSK = BIT_ALLMSK; /* unmasked by drivers */
+
+  last = 0;
+  for(i=0; i<4; i++) {
+    pend = rSRCPND;
+    if(pend == 0 || pend == last)
+      break;
+    rSRCPND = pend;
+    rINTPND = pend;
+    last    = pend;
+  }
 
+  /* setup clocks */
+  rCLKDIVN = M_CLKDIVN;
+  rMPLLCON = ((M_MDIV<<12)+(M_PDIV<<4)+M_SDIV);
+  /* setup rREFRESH
+   * period = 15.6 us, HCLK=66Mhz, (2048+1-15.6*66)
+   */
+  REFCNT   = 2048+1-(15.6*get_HCLK()/1000000);
+  rREFRESH = ((REFEN<<23)+(TREFMD<<22)+(Trp<<20)+(Trc<<18)+(Tchr<<16)+REFCNT);
+
+  /* set prescaler for timers 2,3,4 to 16(15+1) */
+  cr = rTCFG0 & 0xFFFF00FF;
+  rTCFG0 = (cr | (15<<8));
+
+  /* set prescaler for timers 0,1 to 1(0+1) */
+  cr = rTCFG0 & 0xFFFFFF00;
+  rTCFG0 = (cr | (0<<0));
+
+  /*
+   * Init rtems exceptions management
+   */
+  rtems_exception_init_mngt();
+
+  /*
+   * Init rtems interrupt management
+   */
+  rtems_irq_mngt_init();
 }
 
 /*
@@ -170,30 +107,30 @@ void bsp_start (void) __attribute__ ((weak, alias("bsp_start_default")));
 
 void bsp_reset(void)
 {
-    rtems_interrupt_level level;
-    rtems_interrupt_disable(level);
-    printk("bsp_reset.....\n");
-        /* disable mmu, invalide i-cache and call swi #4 */
-        asm volatile(""
-                "mrc    p15,0,r0,c1,c0,0        \n"
-                "bic    r0,r0,#1                        \n"
-                "mcr    p15,0,r0,c1,c0,0        \n"
-                "nop                                            \n"
-                "nop                                            \n"
-                "nop                                            \n"
-                "nop                                            \n"
-                "nop                                            \n"
-                "mov    r0,#0                                   \n"
-                "MCR    p15,0,r0,c7,c5,0                        \n"
-                "nop                                            \n"
-                "nop                                            \n"
-                "nop                                            \n"
-                "nop                                            \n"
-                "nop                                            \n"
-                "swi    #4                                      "
-        :
-        :
-        : "r0"
-	);
-	/* we should be back in bios now */
+  rtems_interrupt_level level;
+  rtems_interrupt_disable(level);
+  printk("bsp_reset.....\n");
+  /* disable mmu, invalide i-cache and call swi #4 */
+  asm volatile(""
+    "mrc    p15,0,r0,c1,c0,0  \n"
+    "bic    r0,r0,#1          \n"
+    "mcr    p15,0,r0,c1,c0,0  \n"
+    "nop                      \n"
+    "nop                      \n"
+    "nop                      \n"
+    "nop                      \n"
+    "nop                      \n"
+    "mov    r0,#0             \n"
+    "MCR    p15,0,r0,c7,c5,0  \n"
+    "nop                      \n"
+    "nop                      \n"
+    "nop                      \n"
+    "nop                      \n"
+    "nop                      \n"
+    "swi    #4                "
+    :
+    :
+    : "r0"
+  );
+  /* we should be back in bios now */
 }