Merged from 4.5.0-beta3a

10 files changed, 29 insertions, 21 deletions

diff --git a/c/src/lib/libbsp/sh/gensh1/Makefile.am b/c/src/lib/libbsp/sh/gensh1/Makefile.am
index 1fefc6d5a6..028ac64896 100644
--- a/c/src/lib/libbsp/sh/gensh1/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh1/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
diff --git a/c/src/lib/libbsp/sh/gensh1/bsp_specs b/c/src/lib/libbsp/sh/gensh1/bsp_specs
index 9436cdcd72..90ab779f9e 100644
--- a/c/src/lib/libbsp/sh/gensh1/bsp_specs
+++ b/c/src/lib/libbsp/sh/gensh1/bsp_specs
@@ -18,5 +18,5 @@
 %{qrtems: %{qrtems_debug: start_g.o%s} %{!qrtems_debug: start.o%s}}
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e _start}
+%(old_link) %{qrtems: -dc -dp -N -e _start}
 
diff --git a/c/src/lib/libbsp/sh/gensh1/console/Makefile.am b/c/src/lib/libbsp/sh/gensh1/console/Makefile.am
index 9be2f48a93..49f359cb06 100644
--- a/c/src/lib/libbsp/sh/gensh1/console/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh1/console/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
@@ -23,7 +23,7 @@ include $(top_srcdir)/../../../../../../automake/lib.am
 $(PGM): $(OBJS)
 	$(make-rel)
 
-# the .rel file built here will be put into libbsp.a by 
+# the .rel file built here will be put into libbsp.a by
 # 	../wrapup/Makefile
 
 all-local: $(ARCH) $(OBJS) $(PGM)
diff --git a/c/src/lib/libbsp/sh/gensh1/include/Makefile.am b/c/src/lib/libbsp/sh/gensh1/include/Makefile.am
index 43cf28d6c2..3f061aa216 100644
--- a/c/src/lib/libbsp/sh/gensh1/include/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh1/include/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
diff --git a/c/src/lib/libbsp/sh/gensh1/include/bsp.h b/c/src/lib/libbsp/sh/gensh1/include/bsp.h
index f02abe156d..b9dc3fb98c 100644
--- a/c/src/lib/libbsp/sh/gensh1/include/bsp.h
+++ b/c/src/lib/libbsp/sh/gensh1/include/bsp.h
@@ -34,6 +34,15 @@ extern "C" {
 #include <clockdrv.h>
 #include <console.h>
 
+/*
+ *  confdefs.h overrides for this BSP:
+ *   - number of termios serial ports (defaults to 1)
+ *   - Interrupt stack space is not minimum if defined.
+ */
+
+/* #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 */
+#define CONFIGURE_INTERRUPT_STACK_MEMORY  (4 * 1024)
+
 /* EDIT: To activate the sci driver, change the define below */
 #if 1
 #include <sh/null.h>
diff --git a/c/src/lib/libbsp/sh/gensh1/scitab/Makefile.am b/c/src/lib/libbsp/sh/gensh1/scitab/Makefile.am
index b885f76b71..f49f16e9d9 100644
--- a/c/src/lib/libbsp/sh/gensh1/scitab/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh1/scitab/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
diff --git a/c/src/lib/libbsp/sh/gensh1/start/Makefile.am b/c/src/lib/libbsp/sh/gensh1/start/Makefile.am
index 824d7a22c5..e5a9f26a27 100644
--- a/c/src/lib/libbsp/sh/gensh1/start/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh1/start/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
diff --git a/c/src/lib/libbsp/sh/gensh1/startup/Makefile.am b/c/src/lib/libbsp/sh/gensh1/startup/Makefile.am
index b2736e9cec..b787e61383 100644
--- a/c/src/lib/libbsp/sh/gensh1/startup/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh1/startup/Makefile.am
@@ -1,13 +1,13 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
+VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared
+
 PGM = $(ARCH)/startup.rel
 
-VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared
-   
 C_FILES = bsplibc.c bsppost.c bspstart.c bspclean.c sbrk.c bootcard.c main.c \
     gnatinstallhandler.c
 C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
diff --git a/c/src/lib/libbsp/sh/gensh1/startup/bspstart.c b/c/src/lib/libbsp/sh/gensh1/startup/bspstart.c
index 7f0d7f8436..16f59b5924 100644
--- a/c/src/lib/libbsp/sh/gensh1/startup/bspstart.c
+++ b/c/src/lib/libbsp/sh/gensh1/startup/bspstart.c
@@ -117,7 +117,6 @@ void bsp_start(void)
   _CPU_Interrupt_stack_low = &CPU_Interrupt_stack_low ;
   _CPU_Interrupt_stack_high = &CPU_Interrupt_stack_high ;
 
-  /* This isn't used anywhere */
   Cpu_table.interrupt_stack_size = 
     (unsigned32) (&CPU_Interrupt_stack_high) -
     (unsigned32) (&CPU_Interrupt_stack_low) ;
@@ -128,7 +127,7 @@ void bsp_start(void)
   Cpu_table.postdriver_hook = bsp_postdriver_hook;
   
 #if ( CPU_ALLOCATE_INTERRUPT_STACK == TRUE )
-  Cpu_table.interrupt_stack_size = 4096;
+  Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY;
 #endif
   Cpu_table.clicks_per_second = HZ ;
 }
diff --git a/c/src/lib/libbsp/sh/gensh1/wrapup/Makefile.am b/c/src/lib/libbsp/sh/gensh1/wrapup/Makefile.am
index b0699896fc..c9dc062751 100644
--- a/c/src/lib/libbsp/sh/gensh1/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh1/wrapup/Makefile.am
@@ -1,8 +1,8 @@
-## 
+##
 ## $Id$
-## 
+##
 ## build and install libbsp
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4