Changeset 2d354ea6 in rtems

Timestamp:

07/27/00 06:17:44 (23 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

93d31be

Parents:

08330bf

Message:

Minor problems addressed with the merger and with the arm_bare_bsp.
That BSP now has a stub clock driver so the tests can link even
if they won't execute. A handful of Makefiles had to be updated
and we had to account for printk.c being a shared file now.

Files:

• c/src/exec/librpc/src/xdr/xdr_float.c (modified) (1 diff)
• c/src/lib/libbsp/arm/arm_bare_bsp/clock/.cvsignore (moved) (moved from c/src/lib/libbsp/arm/shared/io/.cvsignore)
• c/src/lib/libbsp/arm/arm_bare_bsp/clock/Makefile.am (added)
• c/src/lib/libbsp/arm/arm_bare_bsp/clock/clockdrv.c (added)
• c/src/lib/libbsp/arm/arm_bare_bsp/console/Makefile.am (modified) (1 diff)
• c/src/lib/libbsp/arm/arm_bare_bsp/irq/Makefile.am (modified) (1 diff)
• c/src/lib/libbsp/arm/arm_bare_bsp/irq/irq.c (modified) (2 diffs)
• c/src/lib/libbsp/arm/arm_bare_bsp/start/Makefile.am (modified) (3 diffs)
• c/src/lib/libbsp/arm/arm_bare_bsp/startup/bspstart.c (modified) (1 diff)
• c/src/lib/libbsp/arm/arm_bare_bsp/startup/exit.c (modified) (1 diff)
• c/src/lib/libbsp/arm/arm_bare_bsp/wrapup/Makefile.am (modified) (1 diff)
• c/src/lib/libbsp/arm/shared/Makefile.am (modified) (1 diff)
• c/src/lib/libbsp/arm/shared/comm/console.c (modified) (1 diff)
• c/src/lib/libbsp/arm/shared/io/Makefile.am (deleted)
• c/src/lib/libbsp/arm/shared/io/bspio.h (deleted)
• c/src/lib/libbsp/arm/shared/io/printk.c (deleted)
• c/src/lib/libbsp/arm/shared/irq/irq_init.c (modified) (2 diffs)
• c/src/librpc/src/xdr/xdr_float.c (modified) (1 diff)
• cpukit/librpc/src/xdr/xdr_float.c (modified) (1 diff)

c/src/exec/librpc/src/xdr/xdr_float.c

@@ -56 +56 @@
 
 #if defined(__alpha__) || \
-    defined(__arm32__) || \
+    defined(__arm__) || \
     defined(__H8300__) || defined(__H8300H__) || defined(__H8300S__) || \
     defined(__hppa__) || \

c/src/lib/libbsp/arm/arm_bare_bsp/console/Makefile.am

@@ -9 +9 @@
 PGM = $(ARCH)/console.rel
 
-C_FILES = uart.c console.c printk.c
+C_FILES = uart.c console.c
 C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
-H_FILES = uart.h bspio.h
+H_FILES = uart.h
 
 console_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o)

c/src/lib/libbsp/arm/arm_bare_bsp/irq/Makefile.am

@@ -33 +33 @@
 #
 
-$(PGM): $(startup_rel_OBJECTS)
+$(PGM): $(irq_rel_OBJECTS)
         $(make-rel)
 

c/src/lib/libbsp/arm/arm_bare_bsp/irq/irq.c

@@ -40 +40 @@
 {
     rtems_irq_hdl *HdlTable;
+    rtems_interrupt_level level;
     
     if (!isValidInterrupt(irq->name)) {
@@ -73 +74 @@
 {
     rtems_irq_hdl *HdlTable;
+    rtems_interrupt_level level;
   
     if (!isValidInterrupt(irq->name)) {

c/src/lib/libbsp/arm/arm_bare_bsp/start/Makefile.am

@@ -1 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGMS = $(ARCH)/start.o
+PGM = $(ARCH)/start.o
 
 S_FILES = start.S
@@ -11 +11 @@
 
 OBJS = $(S_O_FILES)
-
-TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
@@ -21 +19 @@
 #
 
-LINKCMDS = $(top_srcdir)/startup/linkcmds
-
-$(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o: $(ARCH)/start.o
+$(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o: $(PGM)
         $(INSTALL_DATA) $< $@
 
+TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o
 
-all: $(ARCH) $(OBJS) $(TMPINSTALL_FILES)
+all-local: $(ARCH) $(OBJS) $(PGM) $(TMPINSTALL_FILES)
+
+.PRECIOUS: $(PGM)
 
 EXTRA_DIST = start.S

c/src/lib/libbsp/arm/arm_bare_bsp/startup/bspstart.c

@@ -119 +119 @@
    rtemsFreeMemStart += BSP_Configuration.work_space_size;
 
-  console_reserve_resources(&BSP_Configuration);
-
   /*
    * Init rtems exceptions management

c/src/lib/libbsp/arm/arm_bare_bsp/startup/exit.c

@@ -17 +17 @@
 #include <stdio.h>
 #include <bsp.h>
-#include <bspio.h>
+#include <bspIo.h>
 #include <rtems/libio.h>
 

c/src/lib/libbsp/arm/arm_bare_bsp/wrapup/Makefile.am

@@ -5 +5 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
-BSP_PIECES = console startup irq
+BSP_PIECES = clock console startup irq
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x

c/src/lib/libbsp/arm/shared/Makefile.am

@@ -5 +5 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
-SUBDIRS = comm io irq
+SUBDIRS = comm irq
 
 include $(top_srcdir)/../../../../../automake/subdirs.am

c/src/lib/libbsp/arm/shared/comm/console.c

@@ -22 +22 @@
 
 #include <bsp.h>
-#include <bspio.h>
+#include <bspIo.h>
 #include <irq.h>
 #include <rtems/libio.h>

c/src/lib/libbsp/arm/shared/irq/irq_init.c

@@ -16 +16 @@
 #include <irq.h>
 #include <bsp.h>
-#include <bspio.h>
+#include <bspIo.h>
 #include <registers.h>
 
@@ -33 +33 @@
     int                         i;
     long                        *vectorTable;
+    rtems_interrupt_level       level;
     
     vectorTable = VECTOR_TABLE;

c/src/librpc/src/xdr/xdr_float.c

@@ -56 +56 @@
 
 #if defined(__alpha__) || \
-    defined(__arm32__) || \
+    defined(__arm__) || \
     defined(__H8300__) || defined(__H8300H__) || defined(__H8300S__) || \
     defined(__hppa__) || \

cpukit/librpc/src/xdr/xdr_float.c

@@ -56 +56 @@
 
 #if defined(__alpha__) || \
-    defined(__arm32__) || \
+    defined(__arm__) || \
     defined(__H8300__) || defined(__H8300H__) || defined(__H8300S__) || \
     defined(__hppa__) || \