Skip to content

Changes on libbspext on rtems5 for MVME6100 (at least) #3

@hjunkes

Description

@hjunkes

1.) In Makefile change path to lib.cfg

diff --git a/Makefile b/Makefile
index 9cee926..baacf82 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
 include $(RTEMS_MAKEFILE_PATH)/Makefile.inc

 include $(RTEMS_CUSTOM)
-include $(RTEMS_ROOT)/make/lib.cfg
+include $(RTEMS_SHARE_PATH)/make/lib.cfg

2.) Add some header files to bspExt.h to resolve PPC_DAR

diff --git a/bspExt.h b/bspExt.h
index 079bf9e..73bc542 100644
--- a/bspExt.h
+++ b/bspExt.h
@@ -54,6 +54,15 @@
 #include <rtems.h>
 #include <bsp.h>

+#include <rtems/bspIo.h>
+
+#include <sys/param.h>
+#include <sys/types.h>
+#include <libcpu/spr.h>
+//#include "bootldr.h"
+#include <libcpu/mmu.h>
+#include <limits.h>
+
 /* Macro to detect RTEMS version */
 #include <rtems/system.h>

3.) change registers in dabrBpnt.c

diff --git a/dabrBpnt.c b/dabrBpnt.c
index 75dd6b4..a9ebf0f 100644
--- a/dabrBpnt.c
+++ b/dabrBpnt.c
@@ -204,6 +204,7 @@ bspExtRemoveBreakpoint(void *addr)
 #define PHASE(cause)   ((cause)&2)
 #define TYPE(cause)            ((cause)&1)

+SPR_RO(PPC_DAR)

 int
 _bspExtCatchBreakpoint(BSP_Exception_frame *fp)
@@ -216,8 +217,8 @@ int                         cause = -1;
 /* check for catch condition */
        if ( 3==fp->_EXC_number &&
          (BPNTS[DBPNT].mode & DABR_MODE_COARSE ?
-           !(((long)BPNTS[DBPNT].addr ^ (long)fp->EXC_DAR) & ~DABR_FLGS) :
-           (long)BPNTS[DBPNT].addr == (long)fp->EXC_DAR
+           !(((long)BPNTS[DBPNT].addr ^ (long)_read_PPC_DAR) & ~DABR_FLGS) :
+           (long)BPNTS[DBPNT].addr == (long)_read_PPC_DAR
          ) )
                cause = CAUSE_DABR_PHASE1;
        else if ( 0x13 == fp->_EXC_number &&

4.) in memProbe BSP_panic -> rtems_panic

diff --git a/memProbe.c b/memProbe.c
index b12a44f..6cfa67b 100644
--- a/memProbe.c
+++ b/memProbe.c
@@ -204,7 +204,7 @@ int                     mcp_hid = -1;
                                } else if ( 0 == mcp_hid ) {
                                        _write_HID0( _read_HID0() | HID0_EMCP );/* enable MCP */
                                } else {
-                                       BSP_panic(__FILE__" bad value for mcp_hid");
+                                       rtems_panic(__FILE__" bad value for mcp_hid");
                                }
                        }
                }

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions