The second round of MARS8 project reshaping.

darcs-hash:20051125224145-01e10-dc43e6a2433d138d7e4b2a7c5dbf2abc04954acd.gz

diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
new file mode 100644 (file)
index 0000000..142cc88
--- /dev/null
+++ b/arch/m68k/Makefile
@@ -0,0 +1,14 @@
+# Generic directory or leaf node makefile for OCERA make framework
+
+ifndef MAKERULES_DIR
+MAKERULES_DIR := $(shell ( old_pwd="" ;  while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd`  ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) )
+endif
+
+ifeq ($(MAKERULES_DIR),)
+all : default
+.DEFAULT::
+       @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n"
+else
+include $(MAKERULES_DIR)/Makefile.rules
+endif
+

diff --git a/arch/m68k/Makefile.omk b/arch/m68k/Makefile.omk
new file mode 100644 (file)
index 0000000..3f99071
--- /dev/null
+++ b/arch/m68k/Makefile.omk
@@ -0,0 +1 @@
+SUBDIRS = generic mach-$(MACH)

diff --git a/arch/m68k/generic/Makefile b/arch/m68k/generic/Makefile
new file mode 100644 (file)
index 0000000..142cc88
--- /dev/null
+++ b/arch/m68k/generic/Makefile
@@ -0,0 +1,14 @@
+# Generic directory or leaf node makefile for OCERA make framework
+
+ifndef MAKERULES_DIR
+MAKERULES_DIR := $(shell ( old_pwd="" ;  while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd`  ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) )
+endif
+
+ifeq ($(MAKERULES_DIR),)
+all : default
+.DEFAULT::
+       @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n"
+else
+include $(MAKERULES_DIR)/Makefile.rules
+endif
+

diff --git a/arch/m68k/generic/Makefile.omk b/arch/m68k/generic/Makefile.omk
new file mode 100644 (file)
index 0000000..81bac75
--- /dev/null
+++ b/arch/m68k/generic/Makefile.omk
@@ -0,0 +1,3 @@
+# -*- makefile -*-
+
+SUBDIRS = defines libs drivers

diff --git a/arch/m68k/generic/defines/Makefile b/arch/m68k/generic/defines/Makefile
new file mode 100644 (file)
index 0000000..142cc88
--- /dev/null
+++ b/arch/m68k/generic/defines/Makefile
@@ -0,0 +1,14 @@
+# Generic directory or leaf node makefile for OCERA make framework
+
+ifndef MAKERULES_DIR
+MAKERULES_DIR := $(shell ( old_pwd="" ;  while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd`  ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) )
+endif
+
+ifeq ($(MAKERULES_DIR),)
+all : default
+.DEFAULT::
+       @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n"
+else
+include $(MAKERULES_DIR)/Makefile.rules
+endif
+

diff --git a/arch/m68k/generic/defines/Makefile.omk b/arch/m68k/generic/defines/Makefile.omk
new file mode 100644 (file)
index 0000000..176b8a6
--- /dev/null
+++ b/arch/m68k/generic/defines/Makefile.omk
@@ -0,0 +1,2 @@
+# -*- makefile -*-
+include_HEADERS = $(notdir $(wildcard $(SOURCES_DIR)/*.h))

diff --git a/arch/m68k/generic/drivers/Makefile b/arch/m68k/generic/drivers/Makefile
new file mode 100644 (file)
index 0000000..142cc88
--- /dev/null
+++ b/arch/m68k/generic/drivers/Makefile
@@ -0,0 +1,14 @@
+# Generic directory or leaf node makefile for OCERA make framework
+
+ifndef MAKERULES_DIR
+MAKERULES_DIR := $(shell ( old_pwd="" ;  while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd`  ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) )
+endif
+
+ifeq ($(MAKERULES_DIR),)
+all : default
+.DEFAULT::
+       @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n"
+else
+include $(MAKERULES_DIR)/Makefile.rules
+endif
+

diff --git a/arch/m68k/generic/drivers/Makefile.omk b/arch/m68k/generic/drivers/Makefile.omk
new file mode 100644 (file)
index 0000000..49687e1
--- /dev/null
+++ b/arch/m68k/generic/drivers/Makefile.omk
@@ -0,0 +1,6 @@
+# -*- makefile -*-
+
+lib_LIBRARIES=arch_drivers
+arch_drivers_SOURCES = qsm_rs232.c
+
+nobase_include_HEADERS = periph/tpu_sup.h periph/qsm_rs232.h

diff --git a/arch/m68k/generic/libs/Makefile b/arch/m68k/generic/libs/Makefile
new file mode 100644 (file)
index 0000000..142cc88
--- /dev/null
+++ b/arch/m68k/generic/libs/Makefile
@@ -0,0 +1,14 @@
+# Generic directory or leaf node makefile for OCERA make framework
+
+ifndef MAKERULES_DIR
+MAKERULES_DIR := $(shell ( old_pwd="" ;  while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd`  ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) )
+endif
+
+ifeq ($(MAKERULES_DIR),)
+all : default
+.DEFAULT::
+       @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n"
+else
+include $(MAKERULES_DIR)/Makefile.rules
+endif
+

diff --git a/arch/m68k/generic/libs/Makefile.omk b/arch/m68k/generic/libs/Makefile.omk
new file mode 100644 (file)
index 0000000..bf84605
--- /dev/null
+++ b/arch/m68k/generic/libs/Makefile.omk
@@ -0,0 +1,3 @@
+# -*- makefile -*-
+
+SUBDIRS = boot misc gdbstub

diff --git a/arch/m68k/generic/libs/boot/Makefile b/arch/m68k/generic/libs/boot/Makefile
new file mode 100644 (file)
index 0000000..142cc88
--- /dev/null
+++ b/arch/m68k/generic/libs/boot/Makefile
@@ -0,0 +1,14 @@
+# Generic directory or leaf node makefile for OCERA make framework
+
+ifndef MAKERULES_DIR
+MAKERULES_DIR := $(shell ( old_pwd="" ;  while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd`  ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) )
+endif
+
+ifeq ($(MAKERULES_DIR),)
+all : default
+.DEFAULT::
+       @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n"
+else
+include $(MAKERULES_DIR)/Makefile.rules
+endif
+

diff --git a/arch/m68k/generic/libs/boot/Makefile.omk b/arch/m68k/generic/libs/boot/Makefile.omk
new file mode 100644 (file)
index 0000000..d4603b7
--- /dev/null
+++ b/arch/m68k/generic/libs/boot/Makefile.omk
@@ -0,0 +1,3 @@
+# -*- makefile -*-
+
+lib_obj_SOURCES = crt0.S

diff --git a/arch/m68k/generic/libs/gdbstub/Makefile b/arch/m68k/generic/libs/gdbstub/Makefile
new file mode 100644 (file)
index 0000000..142cc88
--- /dev/null
+++ b/arch/m68k/generic/libs/gdbstub/Makefile
@@ -0,0 +1,14 @@
+# Generic directory or leaf node makefile for OCERA make framework
+
+ifndef MAKERULES_DIR
+MAKERULES_DIR := $(shell ( old_pwd="" ;  while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd`  ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) )
+endif
+
+ifeq ($(MAKERULES_DIR),)
+all : default
+.DEFAULT::
+       @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n"
+else
+include $(MAKERULES_DIR)/Makefile.rules
+endif
+

diff --git a/arch/m68k/generic/libs/gdbstub/Makefile.omk b/arch/m68k/generic/libs/gdbstub/Makefile.omk
new file mode 100644 (file)
index 0000000..93634cc
--- /dev/null
+++ b/arch/m68k/generic/libs/gdbstub/Makefile.omk
@@ -0,0 +1,6 @@
+# -*- makefile -*-
+
+lib_LIBRARIES = gdbstub
+
+gdbstub_SOURCES = m68k-stub.c
+

diff --git a/arch/m68k/generic/libs/misc/Makefile b/arch/m68k/generic/libs/misc/Makefile
new file mode 100644 (file)
index 0000000..142cc88
--- /dev/null
+++ b/arch/m68k/generic/libs/misc/Makefile
@@ -0,0 +1,14 @@
+# Generic directory or leaf node makefile for OCERA make framework
+
+ifndef MAKERULES_DIR
+MAKERULES_DIR := $(shell ( old_pwd="" ;  while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd`  ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) )
+endif
+
+ifeq ($(MAKERULES_DIR),)
+all : default
+.DEFAULT::
+       @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n"
+else
+include $(MAKERULES_DIR)/Makefile.rules
+endif
+

diff --git a/arch/m68k/generic/libs/misc/Makefile.omk b/arch/m68k/generic/libs/misc/Makefile.omk
new file mode 100644 (file)
index 0000000..b694248
--- /dev/null
+++ b/arch/m68k/generic/libs/misc/Makefile.omk
@@ -0,0 +1,9 @@
+# -*- makefile -*-
+
+include_HEADERS=system_sup.h
+
+lib_LIBRARIES=system_stub
+
+system_stub_SOURCES = system_stub.c system_sup.c
+
+lib_obj_SOURCES = system_stub.o
\ No newline at end of file

diff --git a/arch/m68k/mach-68376/Makefile b/arch/m68k/mach-68376/Makefile
new file mode 100644 (file)
index 0000000..142cc88
--- /dev/null
+++ b/arch/m68k/mach-68376/Makefile
@@ -0,0 +1,14 @@
+# Generic directory or leaf node makefile for OCERA make framework
+
+ifndef MAKERULES_DIR
+MAKERULES_DIR := $(shell ( old_pwd="" ;  while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd`  ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) )
+endif
+
+ifeq ($(MAKERULES_DIR),)
+all : default
+.DEFAULT::
+       @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n"
+else
+include $(MAKERULES_DIR)/Makefile.rules
+endif
+

diff --git a/arch/m68k/mach-68376/Makefile.omk b/arch/m68k/mach-68376/Makefile.omk
new file mode 100644 (file)
index 0000000..150a20f
--- /dev/null
+++ b/arch/m68k/mach-68376/Makefile.omk
@@ -0,0 +1 @@
+SUBDIRS = 

diff --git a/board/m68k/Makefile b/board/m68k/Makefile
new file mode 100644 (file)
index 0000000..142cc88
--- /dev/null
+++ b/board/m68k/Makefile
@@ -0,0 +1,14 @@
+# Generic directory or leaf node makefile for OCERA make framework
+
+ifndef MAKERULES_DIR
+MAKERULES_DIR := $(shell ( old_pwd="" ;  while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd`  ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) )
+endif
+
+ifeq ($(MAKERULES_DIR),)
+all : default
+.DEFAULT::
+       @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n"
+else
+include $(MAKERULES_DIR)/Makefile.rules
+endif
+

diff --git a/board/m68k/Makefile.omk b/board/m68k/Makefile.omk
new file mode 100644 (file)
index 0000000..deeeeb7
--- /dev/null
+++ b/board/m68k/Makefile.omk
@@ -0,0 +1,3 @@
+# -*- makefile -*-
+
+SUBDIRS = $(BOARD)

diff --git a/board/m68k/mo_cpu1/Makefile b/board/m68k/mo_cpu1/Makefile
new file mode 100644 (file)
index 0000000..142cc88
--- /dev/null
+++ b/board/m68k/mo_cpu1/Makefile
@@ -0,0 +1,14 @@
+# Generic directory or leaf node makefile for OCERA make framework
+
+ifndef MAKERULES_DIR
+MAKERULES_DIR := $(shell ( old_pwd="" ;  while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd`  ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) )
+endif
+
+ifeq ($(MAKERULES_DIR),)
+all : default
+.DEFAULT::
+       @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n"
+else
+include $(MAKERULES_DIR)/Makefile.rules
+endif
+

diff --git a/board/m68k/mo_cpu1/Makefile.omk b/board/m68k/mo_cpu1/Makefile.omk
new file mode 100644 (file)
index 0000000..dba8475
--- /dev/null
+++ b/board/m68k/mo_cpu1/Makefile.omk
@@ -0,0 +1,3 @@
+# -*- makefile -*-
+
+SUBDIRS = defines libs

diff --git a/board/m68k/mo_cpu1/config.mo_cpu1 b/board/m68k/mo_cpu1/config.mo_cpu1
new file mode 100644 (file)
index 0000000..1e523f3
--- /dev/null
+++ b/board/m68k/mo_cpu1/config.mo_cpu1
@@ -0,0 +1,31 @@
+# -*- makefile -*-
+
+ARCH=m68k
+MACH=68376
+BOARD=mo_cpu1
+
+#PREFIX_DIR=$(ARCH)
+
+CROSS_COMPILE = m68k-coff-
+TARGET_ARCH = -m68332
+
+# Set default C flags. If theese are set elsewhere (e.g. on a command
+# line), these default flags are not used.
+DEBUG ?= -g
+OPTIMIZE ?= -O2
+CFLAGS += -Wa,--bitwise-or
+
+BDMLOAD = m68k-coff-bdm-load
+
+LOAD_CMD-ram = $BDMLOAD -r
+LOAD_CMD-boot = echo LOAD_CMD-boot
+LOAD_CMD-bload = echo LOAD_CMD-bload
+LOAD_CMD-flash = $(BDMLOAD) --flash=auto@csboot -r -c $(bin_PROGRAMS)/mo_flashbb
+RUN_CMD-ram = echo RUN_CMD-ram
+RUN_CMD-flash = echo RUN_CMD-flash
+
+# This selects linker script
+LD_SCRIPT = mo_cpu1
+DEFAULT_LD_SCRIPT_VARIANT = ram
+
+OUTPUT_FORMATS = bin

diff --git a/board/m68k/mo_cpu1/defines/Makefile b/board/m68k/mo_cpu1/defines/Makefile
new file mode 100644 (file)
index 0000000..142cc88
--- /dev/null
+++ b/board/m68k/mo_cpu1/defines/Makefile
@@ -0,0 +1,14 @@
+# Generic directory or leaf node makefile for OCERA make framework
+
+ifndef MAKERULES_DIR
+MAKERULES_DIR := $(shell ( old_pwd="" ;  while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd`  ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) )
+endif
+
+ifeq ($(MAKERULES_DIR),)
+all : default
+.DEFAULT::
+       @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n"
+else
+include $(MAKERULES_DIR)/Makefile.rules
+endif
+

diff --git a/board/m68k/mo_cpu1/defines/Makefile.omk b/board/m68k/mo_cpu1/defines/Makefile.omk
new file mode 100644 (file)
index 0000000..176b8a6
--- /dev/null
+++ b/board/m68k/mo_cpu1/defines/Makefile.omk
@@ -0,0 +1,2 @@
+# -*- makefile -*-
+include_HEADERS = $(notdir $(wildcard $(SOURCES_DIR)/*.h))

diff --git a/arch/m68k/generic/libs/misc/system_def.h b/board/m68k/mo_cpu1/defines/system_def.h
similarity index 100%
rename from arch/m68k/generic/libs/misc/system_def.h
rename to board/m68k/mo_cpu1/defines/system_def.h

diff --git a/board/m68k/mo_cpu1/libs/Makefile b/board/m68k/mo_cpu1/libs/Makefile
new file mode 100644 (file)
index 0000000..142cc88
--- /dev/null
+++ b/board/m68k/mo_cpu1/libs/Makefile
@@ -0,0 +1,14 @@
+# Generic directory or leaf node makefile for OCERA make framework
+
+ifndef MAKERULES_DIR
+MAKERULES_DIR := $(shell ( old_pwd="" ;  while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd`  ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) )
+endif
+
+ifeq ($(MAKERULES_DIR),)
+all : default
+.DEFAULT::
+       @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n"
+else
+include $(MAKERULES_DIR)/Makefile.rules
+endif
+

diff --git a/board/m68k/mo_cpu1/libs/Makefile.omk b/board/m68k/mo_cpu1/libs/Makefile.omk
new file mode 100644 (file)
index 0000000..471d841
--- /dev/null
+++ b/board/m68k/mo_cpu1/libs/Makefile.omk
@@ -0,0 +1,4 @@
+# -*- makefile -*-
+lib_LDSCRIPTS = $(notdir $(wildcard $(SOURCES_DIR)/*.ld*))
+
+#SUBDIRS = bspbase

diff --git a/board/m68k/mo_cpu1/libs/mo_cpu1.ld-flash b/board/m68k/mo_cpu1/libs/mo_cpu1.ld-flash
index 5cc913e4e2b5aba3c65584f5efc2646e10333e13..d9ea3190c1dcfcfbe05e7689e9895d1bd3fd48e2 100644 (file)
--- a/board/m68k/mo_cpu1/libs/mo_cpu1.ld-flash
+++ b/board/m68k/mo_cpu1/libs/mo_cpu1.ld-flash
@@ -12,6 +12,8 @@
 
 INCLUDE "mo_cpu1.ld-cfg"
 
+STARTUP(crt0.o)
+
 PROVIDE( __stack_top = (__ram_end & ~ 3 ) - 0x100 );
 
 SECTIONS
@@ -25,8 +27,7 @@ SECTIONS
        .text :
        {
          text_start = . ;
-         boot/crt0*(.text)
-         /* *crt0.o(.text) */
+         crt0.o(.text)
           *(.text .stub .text.* .gnu.linkonce.t.*)
          *(.rodata .rodata.* .gnu.linkonce.r.*)
          *(.rodata1)

diff --git a/board/m68k/mo_cpu1/libs/mo_cpu1.ld-ram b/board/m68k/mo_cpu1/libs/mo_cpu1.ld-ram
index 0f93bb00fe5e4d5e7c71acbc0ff235f25be8957c..974dda2c2dd747a4840df464a5fd9e5205503834 100644 (file)
--- a/board/m68k/mo_cpu1/libs/mo_cpu1.ld-ram
+++ b/board/m68k/mo_cpu1/libs/mo_cpu1.ld-ram
@@ -12,6 +12,8 @@
 
 INCLUDE "mo_cpu1.ld-cfg"
 
+STARTUP(crt0.o)
+
 PROVIDE( __stack_top = (__ram_end & ~ 3 ) - 0x100 );
 
 _start = _crt_start ;
@@ -28,8 +30,7 @@ SECTIONS
        .text :
        { 
          text_start = . ;
-         boot/crt0.o(.text)
-         /* *crt0.o(.text) */
+         crt0.o(.text)
           *(.text .stub .text.* .gnu.linkonce.t.*)
          *(.rodata .rodata.* .gnu.linkonce.r.*)
          *(.rodata1)