]> rtime.felk.cvut.cz Git - rtems-devel.git/blobdiff - rtems-patches/current/rtems-update-mrm332-to-mo376.patch
projects / rtems-devel.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Lower resources demands of OMK LwIP test fit in internal eSRAM for such TMS570 link...
[rtems-devel.git] / rtems-patches / current / rtems-update-mrm332-to-mo376.patch
diff --git a/rtems-patches/current/rtems-update-mrm332-to-mo376.patch b/rtems-patches/current/rtems-update-mrm332-to-mo376.patch
index 330d95b2622218393c462c9908da3f9a7c8fdcbf..4fff5d7bd23b5ae67a2c4cf2cc060c2c395fb735 100644 (file)
--- a/rtems-patches/current/rtems-update-mrm332-to-mo376.patch
+++ b/rtems-patches/current/rtems-update-mrm332-to-mo376.patch
@@ -1,7 +1,24 @@
-Index: rtems/c/src/lib/libbsp/m68k/mo376/start/start.S
+---
+ c/src/lib/libbsp/m68k/mo376/ChangeLog         |    5 +
+ c/src/lib/libbsp/m68k/mo376/Makefile.am       |    2 
+ c/src/lib/libbsp/m68k/mo376/README            |   25 ++++-----
+ c/src/lib/libbsp/m68k/mo376/clock/ckinit.c    |    2 
+ c/src/lib/libbsp/m68k/mo376/configure.ac      |    2 
+ c/src/lib/libbsp/m68k/mo376/console/sci.c     |    4 -
+ c/src/lib/libbsp/m68k/mo376/include/bsp.h     |    2 
+ c/src/lib/libbsp/m68k/mo376/include/mo376.h   |   70 ++++++++++++++++++++++++++
+ c/src/lib/libbsp/m68k/mo376/include/mrm332.h  |   70 --------------------------
+ c/src/lib/libbsp/m68k/mo376/preinstall.am     |    6 +-
+ c/src/lib/libbsp/m68k/mo376/start/start.S     |    2 
+ c/src/lib/libbsp/m68k/mo376/startup/start_c.c |    2 
+ c/src/lib/libbsp/m68k/mo376/times             |    6 +-
+ make/custom/mo376.cfg                         |    8 +-
+ 14 files changed, 106 insertions(+), 100 deletions(-)
+
+Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/start/start.S
 ===================================================================
---- rtems.orig/c/src/lib/libbsp/m68k/mo376/start/start.S
-+++ rtems/c/src/lib/libbsp/m68k/mo376/start/start.S
+--- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/start/start.S 2009-11-29 01:11:56.463558538 +0100
++++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/start/start.S      2009-11-29 01:23:46.804588750 +0100
 @@ -2,7 +2,7 @@
   *  $Id
   */
@@ -11,11 +28,11 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/start/start.S
  #include <rtems/asm.h>
  #include <rtems/m68k/sim.h>
  
-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
-+++ rtems/c/src/lib/libbsp/m68k/mo376/include/bsp.h
-@@ -26,7 +26,7 @@ extern "C" {
+--- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/include/bsp.h 2007-12-11 16:49:20.000000000 +0100
++++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/include/bsp.h      2009-11-29 01:23:46.804588750 +0100
+@@ -26,7 +26,7 @@
  #include <rtems/clockdrv.h>
  #include <rtems/console.h>
  #include <rtems/iosupp.h>
@@ -24,26 +41,23 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/include/bsp.h
  #include <rtems/m68k/sim.h>
  #include <rtems/m68k/qsm.h>
  
-Index: rtems/c/src/lib/libbsp/m68k/mo376/ChangeLog
+Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/ChangeLog
 ===================================================================
---- rtems.orig/c/src/lib/libbsp/m68k/mo376/ChangeLog
-+++ rtems/c/src/lib/libbsp/m68k/mo376/ChangeLog
-@@ -11,6 +11,11 @@
- 
-       * include/bsp.h: New header guard.
- 
-+2005-04-08    Pavel Pisa <pisa@cmp.felk.cvut.cz>
+--- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/ChangeLog     2008-12-08 06:15:06.000000000 +0100
++++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/ChangeLog  2009-11-29 01:28:09.931559632 +0100
+@@ -1,3 +1,8 @@
++2009-11-27    Pavel Pisa <pisa@cmp.felk.cvut.cz>
 +
 +      * MO376 BSP for PiKRON's MO_CPU1/MO_CPU2 board started
 +      as clone of MRM332 BSP.
 +
- 2005-01-07    Ralf Corsepius <ralf.corsepius@rtems.org>
+ 2008-12-08    Ralf Corsépius <ralf.corsepius@rtems.org>
  
-       * Makefile.am: Eliminate CFLAGS_OPTIMIZE_V.
-Index: rtems/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c
+       * bsp_specs: Backport from CVS-HEAD.
+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
-+++ rtems/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c
+--- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c        2008-09-06 00:05:15.000000000 +0200
++++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c     2009-11-29 01:23:46.808556503 +0100
 @@ -20,7 +20,7 @@
  #include <stdlib.h>
  #include <bsp.h>
@@ -53,23 +67,23 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c
  
  #define CLOCK_VECTOR   MRM_PIV
  
-Index: rtems/c/src/lib/libbsp/m68k/mo376/configure.ac
+Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/configure.ac
 ===================================================================
---- rtems.orig/c/src/lib/libbsp/m68k/mo376/configure.ac
-+++ rtems/c/src/lib/libbsp/m68k/mo376/configure.ac
+--- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/configure.ac  2006-12-02 06:55:13.000000000 +0100
++++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/configure.ac       2009-11-29 01:23:46.808556503 +0100
 @@ -3,7 +3,7 @@
- ## $Id: configure.ac,v 1.14 2004/09/24 06:32:09 ralf Exp $
+ ## $Id: configure.ac,v 1.16 2006/12/02 05:55:13 ralf Exp $
  
- AC_PREREQ(2.59)
--AC_INIT([rtems-c-src-lib-libbsp-m68k-mrm332],[_RTEMS_VERSION],[rtems-bugs@rtems.com])
-+AC_INIT([rtems-c-src-lib-libbsp-m68k-mo376],[_RTEMS_VERSION],[rtems-bugs@rtems.com])
+ AC_PREREQ(2.60)
+-AC_INIT([rtems-c-src-lib-libbsp-m68k-mrm332],[_RTEMS_VERSION],[http://www.rtems.org/bugzilla])
++AC_INIT([rtems-c-src-lib-libbsp-m68k-mo376],[_RTEMS_VERSION],[http://www.rtems.org/bugzilla])
  AC_CONFIG_SRCDIR([bsp_specs])
  RTEMS_TOP(../../../../../..)
  
-Index: rtems/c/src/lib/libbsp/m68k/mo376/README
+Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/README
 ===================================================================
---- rtems.orig/c/src/lib/libbsp/m68k/mo376/README
-+++ rtems/c/src/lib/libbsp/m68k/mo376/README
+--- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/README        2009-11-29 01:11:56.471556761 +0100
++++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/README     2009-11-29 01:23:46.808556503 +0100
 @@ -2,23 +2,24 @@
  #  $Id: README,v 1.1 2001/05/25 16:28:46 joel Exp $
  #
@@ -107,45 +121,45 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/README
 -  the interrupt priority and (2) to prevent it from blocking.
 -- add a timer driver for the tmtest set.
  
-Index: rtems/c/src/lib/libbsp/m68k/mo376/Makefile.am
+Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/Makefile.am
 ===================================================================
---- rtems.orig/c/src/lib/libbsp/m68k/mo376/Makefile.am
-+++ rtems/c/src/lib/libbsp/m68k/mo376/Makefile.am
-@@ -16,7 +16,7 @@ nodist_include_HEADERS = include/bspopts
+--- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/Makefile.am   2008-09-29 03:47:41.000000000 +0200
++++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/Makefile.am        2009-11-29 01:23:46.812556872 +0100
+@@ -15,7 +15,7 @@
+ nodist_include_HEADERS = include/bspopts.h
  DISTCLEANFILES = include/bspopts.h
- noinst_PROGRAMS =
  
 -include_HEADERS += include/mrm332.h
 +include_HEADERS += include/mo376.h
  nodist_include_HEADERS += ../../shared/include/coverhd.h
  
  EXTRA_DIST = times
-Index: rtems/c/src/lib/libbsp/m68k/mo376/console/sci.c
+Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/console/sci.c
 ===================================================================
---- rtems.orig/c/src/lib/libbsp/m68k/mo376/console/sci.c
-+++ rtems/c/src/lib/libbsp/m68k/mo376/console/sci.c
-@@ -129,7 +129,7 @@
+--- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/console/sci.c 2008-08-19 12:23:15.000000000 +0200
++++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/console/sci.c      2009-11-29 01:23:46.812556872 +0100
+@@ -105,7 +105,7 @@
  
- // system clock definitions, i dont have documentation on this...
+ /* system clock definitions, i dont have documentation on this... */
  
--#if 0 // Not needed, this is provided in mrm332.h
-+#if 0 // Not needed, this is provided in mo376.h
- #define XTAL            32768.0                       // crystal frequency in Hz
- #define NUMB_W          0                             // system clock parameters
+-#if 0 /* Not needed, this is provided in mrm332.h */
++#if 0 /* Not needed, this is provided in mo376.h */
+ #define XTAL            32768.0    /* crystal frequency in Hz */
+ #define NUMB_W          0          /* system clock parameters */
  #define NUMB_X          1
-@@ -1238,7 +1238,7 @@ static void SciSetBaud(uint32_t   rate)
+@@ -1215,7 +1215,7 @@
  
-     // calculate the register value as a float and convert to an int
-     // set baud rate - you must define the system clock constant
--    // see mrm332.h for an example
-+    // see mo376.h for an example
+     /* calculate the register value as a float and convert to an int */
+     /* set baud rate - you must define the system clock constant */
+-    /* see mrm332.h for an example */
++    /* see mo376.h for an example */
  
      value = ( (uint16_t) ( SYS_CLOCK / rate / 32.0 + 0.5 ) & 0x1fff );
  
-Index: rtems/c/src/lib/libbsp/m68k/mo376/startup/start_c.c
+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
-+++ rtems/c/src/lib/libbsp/m68k/mo376/startup/start_c.c
+--- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/startup/start_c.c     2008-08-19 12:23:15.000000000 +0200
++++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/startup/start_c.c  2009-11-29 01:23:46.812556872 +0100
 @@ -2,7 +2,7 @@
   *  $Id
   */
@@ -155,10 +169,10 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/startup/start_c.c
  #include <rtems/m68k/sim.h>
  #define __START_C__
  #include "bsp.h"
-Index: rtems/c/src/lib/libbsp/m68k/mo376/times
+Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/times
 ===================================================================
---- rtems.orig/c/src/lib/libbsp/m68k/mo376/times
-+++ rtems/c/src/lib/libbsp/m68k/mo376/times
+--- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/times 2009-11-29 01:11:56.479557220 +0100
++++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/times      2009-11-29 01:23:46.816556473 +0100
 @@ -1,5 +1,5 @@
  #
 -#  Timing Test Suite Results for the MRM332 BSP
@@ -166,7 +180,7 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/times
  #
  #  $Id: times,v 1.2 2004/01/07 21:13:50 joel Exp $
  #
-@@ -8,9 +8,9 @@ NOTE:  This BSP is user submitted and no
+@@ -8,9 +8,9 @@
  
  TBD: MATT - update this with real times!
  
@@ -178,10 +192,10 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/times
  Memory Configuration: SRAM, DRAM, cache, etc
  Wait States:          
  
-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
 ===================================================================
---- /dev/null
-+++ rtems/c/src/lib/libbsp/m68k/mo376/include/mo376.h
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/include/mo376.h    2009-11-29 01:23:46.816556473 +0100
 @@ -0,0 +1,70 @@
 +/*  mo376.h
 + *
@@ -253,10 +267,10 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/include/mo376.h
 +#endif /* ASM */
 +
 +#endif /* _MRM_H_ */
-Index: rtems/c/src/lib/libbsp/m68k/mo376/include/mrm332.h
+Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/include/mrm332.h
 ===================================================================
---- rtems.orig/c/src/lib/libbsp/m68k/mo376/include/mrm332.h
-+++ /dev/null
+--- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/include/mrm332.h      2009-11-29 01:11:56.479557220 +0100
++++ /dev/null  1970-01-01 00:00:00.000000000 +0000
 @@ -1,70 +0,0 @@
 -/*  mrm332.h
 - *
@@ -328,21 +342,21 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/include/mrm332.h
 -#endif /* ASM */
 -
 -#endif /* _MRM_H_ */
-Index: rtems/make/custom/mo376.cfg
+Index: rtems-4.9.3/make/custom/mo376.cfg
 ===================================================================
---- rtems.orig/make/custom/mo376.cfg
-+++ rtems/make/custom/mo376.cfg
+--- rtems-4.9.3.orig/make/custom/mo376.cfg     2009-11-29 01:21:43.173939736 +0100
++++ rtems-4.9.3/make/custom/mo376.cfg  2009-11-29 01:25:58.227563597 +0100
 @@ -1,7 +1,7 @@
  #
 -#  Config file for the mrm332 BSP
 +#  Config file for the mo376 BSP
  #
--#  $Id: mrm332.cfg,v 1.8 2004/02/04 16:50:30 ralf Exp $
-+#  $Id: mo376.cfg,v 1.8 2004/02/04 16:50:30 ralf Exp $
+-#  $Id: mrm332.cfg,v 1.18 2008/06/11 08:17:27 ccj Exp $
++#  $Id: mo376.cfg,v 1.18 2008/06/11 08:17:27 ccj Exp $
  #
  
  include $(RTEMS_ROOT)/make/custom/default.cfg
-@@ -10,7 +10,7 @@ RTEMS_CPU=m68k
+@@ -10,7 +10,7 @@
  RTEMS_CPU_MODEL=m68332
  
  # This is the actual bsp directory used during the build process.
@@ -351,20 +365,20 @@ Index: rtems/make/custom/mo376.cfg
  
  #  This contains the compiler options necessary to select the CPU model
  #  and (hopefully) optimize for it. 
-@@ -26,7 +26,7 @@ CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-point
+@@ -22,7 +22,7 @@
  ifeq ($(MRM_IN_ROM),yes)
  # Build a rommable image - move the .data section after the .text section
  # in the image.
 -CPU_CFLAGS += -qnolinkcmds -T $(exec_prefix)/mrm332/lib/linkcmds_ROM
 +CPU_CFLAGS += -qnolinkcmds -T $(exec_prefix)/mo376/lib/linkcmds_ROM
+ endif
  
- #  This is a good way to get debug information.  The output file is large
- #  though and greatly slows the build process so only do this if needed.
-Index: rtems/c/src/lib/libbsp/m68k/mo376/preinstall.am
+ ifeq ($(MRM_IN_ROM),yes)
+Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/preinstall.am
 ===================================================================
---- rtems.orig/c/src/lib/libbsp/m68k/mo376/preinstall.am
-+++ rtems/c/src/lib/libbsp/m68k/mo376/preinstall.am
-@@ -44,9 +44,9 @@ $(PROJECT_INCLUDE)/bspopts.h: include/bs
+--- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/preinstall.am 2009-11-29 01:11:56.483556820 +0100
++++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/preinstall.am      2009-11-29 01:23:46.816556473 +0100
+@@ -44,9 +44,9 @@
        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
  PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
  
Patches, tools, templates and OMK support for RTEMS executive.