First integration step:

Included in linux kernel tree hrt, gensched and rtlinux patches.
Included in rtlinux tree dynmem,psignals,ptimers,ptrace,pmqueue,pbarriers
and rtlcbs patches

Many fixes to the linux kernel build process.
Many fixes to the rtlinux module build process.

Even more fixes to the makefiles and tree structure of the components tree.

This is the first step on integration path, please, report standing problems.

diff --git a/lincan/Makefile b/lincan/Makefile
index 28722b9fcbe55aef5ecfd5ed033dff175238a621..8978872505887a53fbcd92a003ce64b84451d31b 100644 (file)
--- a/lincan/Makefile
+++ b/lincan/Makefile
@@ -1,3 +1,4 @@
+#
 # Makefile for the Linux CAN-bus driver.
 # Written by Arnaud Westenberg email:arnaud@wanadoo.nl
 # This software is released under the GPL-License.
@@ -8,16 +9,14 @@
 #
 ########## The following options can be changed ##########
 
-# Compiler
-CC = gcc
-# Enable debugging messages
-DEBUG = y 
-
-all: default
+TOPDIR = $(LINUX_DIR)
 
-.PHONY: dep default subdirs clean cleandepend
+SUBDIRS = src utils
 
-dirs = src utils
+ifneq ($(wildcard ../../../../ocera.mk),)
+include ../../../../ocera.mk
+else
+all: 
+       @echo -e "You should go to the ocera/ directory and do 'make' to generate the ocera.mk file first.\nThanks."
+endif
 
-default dep clean install:
-       $(foreach dir, $(dirs), $(MAKE) -C $(dir) $@ ; )

diff --git a/lincan/src/Makefile b/lincan/src/Makefile
index 01c6d09bf3317bb3f8092905444ff47c421770a9..7f2b82077b5b1cf7ea321a30d67e90e99ef938fd 100644 (file)
--- a/lincan/src/Makefile
+++ b/lincan/src/Makefile
@@ -8,6 +8,22 @@
 #
 #*****************************************************************
 
+ifdef SUBDIRS
+SUBDIRS =
+endif
+
+ifneq ($(wildcard ../../../../../ocera.mk),)
+ifndef TOPDIR
+include ../../../../../ocera.mk
+else
+LINUX_DIR = ../../../../../kernel/linux/
+endif
+else
+OCERA_NOTDEF = 1
+all: 
+       @echo -e "You should go to the ocera/ directory and do 'make' to generate the ocera.mk file first.\nThanks."
+endif
+
 # Where to look for kernel
 # if not defined, sources of current running kernel are found
 #KERNEL_LOCATION=/usr/src/linux
@@ -16,6 +32,10 @@
 #KERNEL_LOCATION=/usr/src/linux-2.6.0-test4
 #KERNEL_LOCATION=/home/cvs/ocera/ocera-build/kernel/linux
 
+ifdef LINUX_DIR
+KERNEL_LOCATION = $(LINUX_DIR)
+endif
+
 # Enable debugging messages
 #DEBUG = y
 
@@ -53,6 +73,9 @@ MODULE_CHAR_LOC=/lib/modules/$(CURRENT)/misc
 endif
 endif
 
+TOPDIR = $(KERNEL_LOCATION)
+CONFIG_SHELL = TOPDIR=$(TOPDIR)
+
 KERNEL_VERSION := $(shell awk -F\" '/REL/ {print $$2}' \
        $(KERNEL_LOCATION)/include/linux/version.h | awk -F\- '{print $$1}')
 
@@ -93,7 +116,7 @@ endif
 O_OBJS      += $(SUPPORTED_CARDS:%=%.o)
 O_OBJS       += can_queue.o devcommon.o main.o modparms.o setup.o \
                sja1000p.o sja1000.o i82527.o irq.o boardlist.o \
-               open.o close.o write.o read.o ioctl.o select.o
+               open.o proc.o close.o write.o read.o ioctl.o select.o
 # Objects with exported symbols (-DEXPORT_SYMTAB)
 OX_OBJS      = 
 # Module objects 
@@ -108,9 +131,9 @@ LX_OBJS      =
 EXTRA_CFLAGS +=
 
 # Linux 2.4.2 build system needs next
-can-objs := $(O_OBJS)
-obj-y := $(O_OBJS)
-obj-m := can.o
+can-objs = $(O_OBJS)
+obj-y = $(O_OBJS)
+obj-m = can.o
 
 ifndef KERNEL_MODULE_V26
 FINAL_MODULE_OBJS=$(obj-m)
@@ -120,7 +143,9 @@ endif
 
 ########## Source/target independent buil of module #############
 
+#ifndef OCERA_NOTDEF
 all : default
+#endif
 
 default : make_this_module
        cp $(FINAL_MODULE_OBJS) ../$(FINAL_MODULE_OBJS)
@@ -147,10 +172,20 @@ make_this_module_dep:
 install_this_module: make_this_module
        su -c "mkdir -v -p $(MODULE_CHAR_LOC) && cp -v $(FINAL_MODULE_OBJS) $(MODULE_CHAR_LOC)"
 
-clean:
-       rm -f $(M_OBJS) $(MX_OBJS) $(O_OBJS) $(OX_OBJS) $(obj-m) $(obj-m:%.o=%.ko) \
-             $(obj-m:%.o=%.mod.o) .*.o.flags .*.o.cmd .*.ko.cmd .depend .supported_cards.h *~
-
 ifndef KERNEL_MODULE_V26
 include $(KERNEL_LOCATION)/Rules.make
+clean:
+       rm -f $(M_OBJS) $(MX_OBJS) $(O_OBJS) $(OX_OBJS) $(obj-m) \
+             .*.o.flags .*.o.cmd .*.ko.cmd .depend .supported_cards.h *~ \
+             ../$(FINAL_MODULE_OBJS)
+
+distclean: clean
+else
+clean:
+       rm -f $(M_OBJS) $(MX_OBJS) $(O_OBJS) $(OX_OBJS) $(obj-m:%.o=%.ko) \
+             $(obj-m:%.o=%.mod.o) .*.o.flags .*.o.cmd .*.ko.cmd .depend .supported_cards.h *~ \
+             ../$(FINAL_MODULE_OBJS)
+
+distclean: clean
 endif
+

diff --git a/lincan/utils/Makefile b/lincan/utils/Makefile
index 09ad3028a1d0de78ce7cb765662ab445b3290aa1..0fbdc44a06c55f5d807d81d6abde16a380839858 100644 (file)
--- a/lincan/utils/Makefile
+++ b/lincan/utils/Makefile
@@ -9,7 +9,9 @@
 ########## The following options can be changed ##########
 
 # Compiler
+ifndef CC
 CC = gcc
+endif
 
 CFLAGS = -I../include -O2
 
@@ -36,5 +38,7 @@ send: send.o
 clean :
        rm -f rxtx sendburst readburst send can-proxy *.o .depend
 
+distclean : clean
+
 -include .depend