]> rtime.felk.cvut.cz Git - rtems-devel.git/blobdiff - rtems-patches/current/rtems-mo376-m68376-updates.patch
projects / rtems-devel.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
rtems patches updated for rtems-4.9.3
[rtems-devel.git] / rtems-patches / current / rtems-mo376-m68376-updates.patch
diff --git a/rtems-patches/current/rtems-mo376-m68376-updates.patch b/rtems-patches/current/rtems-mo376-m68376-updates.patch
index 22ea2ff29ac131faffeb2c1062a316d8c680b301..aa38e2a89e6737ef7a6763cd165e1ca5641b178d 100644 (file)
--- a/rtems-patches/current/rtems-mo376-m68376-updates.patch
+++ b/rtems-patches/current/rtems-mo376-m68376-updates.patch
@@ -10,10 +10,10 @@
  make/custom/mo376.cfg                            |   10 
  9 files changed, 455 insertions(+), 48 deletions(-)
 
-Index: rtems/c/src/lib/libbsp/m68k/mo376/include/bsp.h
+Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/include/bsp.h
 ===================================================================
---- rtems.orig/c/src/lib/libbsp/m68k/mo376/include/bsp.h       2007-08-14 17:24:09.000000000 +0200
-+++ rtems/c/src/lib/libbsp/m68k/mo376/include/bsp.h    2007-08-14 17:36:35.000000000 +0200
+--- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/include/bsp.h 2009-11-29 01:23:46.804588750 +0100
++++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/include/bsp.h      2009-11-29 01:36:40.412590325 +0100
 @@ -1,6 +1,6 @@
  /*  bsp.h
   *
@@ -22,8 +22,8 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/include/bsp.h
   *
   *  COPYRIGHT (c) 1989-1999.
   *  On-Line Applications Research Corporation (OAR).
-@@ -41,6 +41,30 @@
- /* #define CONFIGURE_INTERRUPT_STACK_MEMORY  (TBD * 1024) */
+@@ -40,6 +40,30 @@
+ /* #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 */
  
  /*
 + * Network driver configuration
@@ -53,10 +53,10 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/include/bsp.h
   *  Simple spin delay in microsecond units for device drivers.
   *  This is very dependent on the clock speed of the target.
   */
-Index: rtems/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c
+Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c
 ===================================================================
---- rtems.orig/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c      2007-08-14 17:24:09.000000000 +0200
-+++ rtems/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c   2007-08-14 17:36:35.000000000 +0200
+--- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c        2009-11-29 01:23:46.808556503 +0100
++++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c     2009-11-29 01:36:40.412590325 +0100
 @@ -60,7 +60,7 @@
    Old_ticker = (rtems_isr_entry) set_vector( clock_isr, CLOCK_VECTOR, 1 );
  
@@ -66,10 +66,10 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c
    *PICR = (unsigned short int)                     /* enable interrupt */
      ( SAM(ISRL_PIT,8,PIRQL) | SAM(CLOCK_VECTOR,0,PIV) );
  
-Index: rtems/c/src/lib/libbsp/m68k/mo376/misc/gdbinit68
+Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/misc/gdbinit68
 ===================================================================
---- rtems.orig/c/src/lib/libbsp/m68k/mo376/misc/gdbinit68      2007-08-14 17:20:30.000000000 +0200
-+++ rtems/c/src/lib/libbsp/m68k/mo376/misc/gdbinit68   2007-08-14 17:36:35.000000000 +0200
+--- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/misc/gdbinit68        2009-11-29 01:11:56.471556761 +0100
++++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/misc/gdbinit68     2009-11-29 01:36:40.412590325 +0100
 @@ -1,16 +1,399 @@
  #
  #  $Id: gdbinit68,v 1.1 2001/05/25 16:28:46 joel Exp $
@@ -476,10 +476,10 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/misc/gdbinit68
 +#b main
 +
 +run
-Index: rtems/c/src/lib/libbsp/m68k/mo376/include/mo376.h
+Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/include/mo376.h
 ===================================================================
---- rtems.orig/c/src/lib/libbsp/m68k/mo376/include/mo376.h     2007-08-14 17:24:09.000000000 +0200
-+++ rtems/c/src/lib/libbsp/m68k/mo376/include/mo376.h  2007-08-14 17:36:35.000000000 +0200
+--- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/include/mo376.h       2009-11-29 01:23:46.816556473 +0100
++++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/include/mo376.h    2009-11-29 01:36:40.416589786 +0100
 @@ -26,31 +26,22 @@
  #define EFI_INT1 25           /* CTS interrupt */
  #define ISRL_SCI 6
@@ -521,10 +521,10 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/include/mo376.h
  #define SCI_BAUD 19200                /* RS232 Baud Rate */
  
  /* macros/functions */
-Index: rtems/c/src/lib/libbsp/m68k/mo376/startup/linkcmds_ROM
+Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/startup/linkcmds_ROM
 ===================================================================
---- rtems.orig/c/src/lib/libbsp/m68k/mo376/startup/linkcmds_ROM        2007-08-14 17:20:30.000000000 +0200
-+++ rtems/c/src/lib/libbsp/m68k/mo376/startup/linkcmds_ROM     2007-08-14 17:36:35.000000000 +0200
+--- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/startup/linkcmds_ROM  2008-03-04 00:06:30.000000000 +0100
++++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/startup/linkcmds_ROM       2009-11-29 01:36:40.416589786 +0100
 @@ -4,7 +4,8 @@
   */
  
@@ -561,10 +561,10 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/startup/linkcmds_ROM
  
  /*
   * 
-Index: rtems/c/src/lib/libbsp/m68k/mo376/spurious/spinit.c
+Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/spurious/spinit.c
 ===================================================================
---- rtems.orig/c/src/lib/libbsp/m68k/mo376/spurious/spinit.c   2007-08-14 17:20:30.000000000 +0200
-+++ rtems/c/src/lib/libbsp/m68k/mo376/spurious/spinit.c        2007-08-14 17:45:18.000000000 +0200
+--- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/spurious/spinit.c     2009-11-29 01:11:56.479557220 +0100
++++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/spurious/spinit.c  2009-11-29 01:36:40.416589786 +0100
 @@ -33,8 +33,8 @@
    rtems_vector_number vector
  )
@@ -606,10 +606,10 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/spurious/spinit.c
  
        default:
          (void) set_vector( Spurious_Isr, vector, 1 );
-Index: rtems/c/src/lib/libbsp/m68k/mo376/startup/linkcmds
+Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/startup/linkcmds
 ===================================================================
---- rtems.orig/c/src/lib/libbsp/m68k/mo376/startup/linkcmds    2007-08-14 17:20:30.000000000 +0200
-+++ rtems/c/src/lib/libbsp/m68k/mo376/startup/linkcmds 2007-08-14 17:36:35.000000000 +0200
+--- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/startup/linkcmds      2008-03-04 00:06:30.000000000 +0100
++++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/startup/linkcmds   2009-11-29 01:36:40.416589786 +0100
 @@ -33,15 +33,15 @@
  /*
   * Declare some sizes.
@@ -631,13 +631,13 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/startup/linkcmds
  }
  
  _copy_data_from_rom = 0;
-Index: rtems/make/custom/mo376.cfg
+Index: rtems-4.9.3/make/custom/mo376.cfg
 ===================================================================
---- rtems.orig/make/custom/mo376.cfg   2007-08-14 17:24:09.000000000 +0200
-+++ rtems/make/custom/mo376.cfg        2007-08-14 17:41:03.000000000 +0200
+--- rtems-4.9.3.orig/make/custom/mo376.cfg     2009-11-29 01:25:58.227563597 +0100
++++ rtems-4.9.3/make/custom/mo376.cfg  2009-11-29 01:36:40.416589786 +0100
 @@ -16,8 +16,14 @@
  #  and (hopefully) optimize for it. 
- CPU_CFLAGS = -mcpu32
+ CPU_CFLAGS = -mcpu=cpu32
  
 -# optimize flag: typically -O2
 -CFLAGS_OPTIMIZE_V = -O2 -g -fomit-frame-pointer
@@ -650,12 +650,12 @@ Index: rtems/make/custom/mo376.cfg
 +CFLAGS_OPTIMIZE_V=-O2 -fomit-frame-pointer -ggdb
 +CXXFLAGS_OPTIMIZE_V=-O2 -ggdb
  
- # The following are definitions of make-exe which will work using ld as
- # is currently required.
-Index: rtems/c/src/lib/libbsp/m68k/mo376/startup/start_c.c
+ ifeq ($(MRM_IN_ROM),yes)
+ # Build a rommable image - move the .data section after the .text section
+Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/startup/start_c.c
 ===================================================================
---- rtems.orig/c/src/lib/libbsp/m68k/mo376/startup/start_c.c   2007-08-14 17:24:09.000000000 +0200
-+++ rtems/c/src/lib/libbsp/m68k/mo376/startup/start_c.c        2007-08-14 17:36:35.000000000 +0200
+--- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/startup/start_c.c     2009-11-29 01:23:46.812556872 +0100
++++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/startup/start_c.c  2009-11-29 01:36:40.432570032 +0100
 @@ -60,12 +60,12 @@
  
    /* Port E and F Data Direction Register */
Patches, tools, templates and OMK support for RTEMS executive.