From: jcar <devnull@localhost>
Date: Tue, 24 Aug 2010 11:19:28 +0000 (+0200)
Subject: Merge with c40862b2536786becf4172ec2b16eab166952161
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/arc.git/commitdiff_plain/963c462abb0efecf8d974137d0683ed28932e07a

Merge with c40862b2536786becf4172ec2b16eab166952161
---

963c462abb0efecf8d974137d0683ed28932e07a
diff --cc examples/blinker_node/makefile
index 7775e8e2,a64521f1..ee696f67
--- a/examples/blinker_node/makefile
+++ b/examples/blinker_node/makefile
@@@ -1,47 -1,42 +1,42 @@@
 -
 -# Our object files
 -obj-y += blinker_main.o
 -obj-y += Tasks.o
 -obj-y += Hooks.o
 -obj-y += Rte.o
 -
 -# OS object files.
 -obj-y += Os_Cfg.o
 -# Board object files
 -include $(ROOTDIR)/boards/board_common.mk
 -
 -ABSDIR := $(subst $(TOPDIR)/,,$(CURDIR))
 -
 -# The more precise configuration, the higher preceedance.
 -VPATH := ../config/$(BOARDDIR) ../config $(VPATH)
 -inc-y := ../config/$(BOARDDIR) ../config $(inc-y)
 -
 -inc-y += $(ROOTDIR)/system/kernel/$(objdir)
 -inc-y += $(ROOTDIR)/system/kernel/include
 -
 -#TODO: Remove?, Build other way?
 -VPATH += $(ROOTDIR)/$(SUBDIR)/Rte
 -inc-y += $(ROOTDIR)/$(SUBDIR)/Rte
 -VPATH += $(ROOTDIR)/components/blinker
 -inc-y += $(ROOTDIR)/components/blinker
 -
 -
 -# libs needed by us 
 -#libitem-y +=
 -
 -#linkfile
 -ldcmdfile-y = linkscript_gcc.ldp
 -vpath %.ldf $(ROOTDIR)/$(ARCH_PATH-y)/scripts
 -
 -# What I want to build
 -build-exe-y = blinker_node.elf
 -
 -
 -
 -
 -
 +
 +# Our object files
 +obj-y += blinker_main.o
 +obj-y += Tasks.o
 +obj-y += Hooks.o
 +obj-y += Rte.o
 +
- VPATH += ..
- 
 +# OS object files.
 +obj-y += Os_Cfg.o
 +# Board object files
 +include $(ROOTDIR)/boards/board_common.mk
 +
 +ABSDIR := $(subst $(TOPDIR)/,,$(CURDIR))
 +
 +# The more precise configuration, the higher preceedance.
 +VPATH := ../config/$(BOARDDIR) ../config $(VPATH)
 +inc-y := ../config/$(BOARDDIR) ../config $(inc-y)
 +
 +inc-y += $(ROOTDIR)/system/kernel/$(objdir)
 +inc-y += $(ROOTDIR)/system/kernel/include
 +
 +#TODO: Remove?, Build other way?
- VPATH += ../Rte
- inc-y += ../Rte
++VPATH += $(ROOTDIR)/$(SUBDIR)/Rte
++inc-y += $(ROOTDIR)/$(SUBDIR)/Rte
 +VPATH += $(ROOTDIR)/components/blinker
 +inc-y += $(ROOTDIR)/components/blinker
 +
- $(warning ROOTDIR: $(ROOTDIR))
- $(warning SUBDIR: $(SUBDIR))
- $(warning VPATH: $(VPATH))
 +
 +# libs needed by us 
 +#libitem-y +=
 +
 +#linkfile
 +ldcmdfile-y = linkscript_gcc.ldp
 +vpath %.ldf $(ROOTDIR)/$(ARCH_PATH-y)/scripts
 +
 +# What I want to build
 +build-exe-y = blinker_node.elf
 +
 +
 +
 +
 +
diff --cc examples/pwm_node/build_config.mk
index 53c679dc,ddc3e4e1..067f3d9f
--- a/examples/pwm_node/build_config.mk
+++ b/examples/pwm_node/build_config.mk
@@@ -1,7 -1,5 +1,7 @@@
 +-include ../config/*.mk
 +-include ../config/$(BOARDDIR)/*.mk
  
- MOD_USE+=KERNEL MCU PORT PWM
+ -include ../config/*.mk
+ -include ../config/$(BOARDDIR)/*.mk
  
- SELECT_CONSOLE = RAMLOG
- SELECT_OS_CONSOLE = RAMLOG
+ MOD_USE+=KERNEL MCU ECUM NEWLIB COMMON DET PORT PWM RAMLOG
diff --cc examples/pwm_node/makefile
index 1135c7f4,2260be0c..195b735a
--- a/examples/pwm_node/makefile
+++ b/examples/pwm_node/makefile
@@@ -1,46 -1,44 +1,44 @@@
 -
 -# Our object files
 -obj-y += pwm_sine_main.o
 -obj-y += Tasks.o
 -obj-y += Hooks.o
 -obj-y += Rte.o
 -
 -# OS object files.
 -obj-y += Os_Cfg.o
 -# Board object files
 -include $(ROOTDIR)/boards/board_common.mk
 -
 -ABSDIR := $(subst $(TOPDIR)/,,$(CURDIR))
 -
 -# The more precise configuration, the higher preceedance.
 -VPATH := ../config/$(BOARDDIR) ../config $(VPATH)
 -inc-y := ../config/$(BOARDDIR) ../config $(inc-y)
 -
 -
 -
 -inc-y += $(ROOTDIR)/system/kernel/$(objdir)
 -inc-y += $(ROOTDIR)/system/kernel/include
 -
 -#TODO: Remove?, Build other way?
 -VPATH += $(ROOTDIR)/$(SUBDIR)/Rte
 -inc-y += $(ROOTDIR)/$(SUBDIR)/Rte
 -VPATH += $(ROOTDIR)/components/pwm_sine
 -inc-y += $(ROOTDIR)/components/pwm_sine
 -
 -
 -# libs needed by us 
 -#libitem-y +=
 -
 -#linkfile
 -ldcmdfile-y = linkscript_gcc.ldp
 -vpath %.ldf $(ROOTDIR)/$(ARCH_PATH-y)/scripts
 -
 -# What I want to build
 -build-exe-y = pwm_node.elf
 -
 -
 -
 -
 -
 +
 +# Our object files
 +obj-y += pwm_sine_main.o
 +obj-y += Tasks.o
 +obj-y += Hooks.o
 +obj-y += Rte.o
 +
- VPATH += ..
- 
 +# OS object files.
 +obj-y += Os_Cfg.o
 +# Board object files
 +include $(ROOTDIR)/boards/board_common.mk
 +
 +ABSDIR := $(subst $(TOPDIR)/,,$(CURDIR))
 +
 +# The more precise configuration, the higher preceedance.
 +VPATH := ../config/$(BOARDDIR) ../config $(VPATH)
 +inc-y := ../config/$(BOARDDIR) ../config $(inc-y)
 +
 +
 +
 +inc-y += $(ROOTDIR)/system/kernel/$(objdir)
 +inc-y += $(ROOTDIR)/system/kernel/include
 +
 +#TODO: Remove?, Build other way?
- VPATH += ../Rte
- inc-y += ../Rte
++VPATH += $(ROOTDIR)/$(SUBDIR)/Rte
++inc-y += $(ROOTDIR)/$(SUBDIR)/Rte
 +VPATH += $(ROOTDIR)/components/pwm_sine
 +inc-y += $(ROOTDIR)/components/pwm_sine
 +
 +
 +# libs needed by us 
 +#libitem-y +=
 +
 +#linkfile
 +ldcmdfile-y = linkscript_gcc.ldp
 +vpath %.ldf $(ROOTDIR)/$(ARCH_PATH-y)/scripts
 +
 +# What I want to build
 +build-exe-y = pwm_node.elf
 +
 +
 +
 +
 +
diff --cc examples/pwm_node2/makefile
index 64d97b16,41297f8e..9e330df0
--- a/examples/pwm_node2/makefile
+++ b/examples/pwm_node2/makefile
@@@ -1,47 -1,45 +1,45 @@@
 -
 -# Our object files
 -obj-y += pwm_node2_helpers.o
 -obj-y += fading_led.o
 -obj-y += Rte.o
 -obj-y += Tasks.o
 -obj-y += Hooks.o
 -
 -inc-y += $(ROOTDIR)/system/kernel/$(objdir)
 -inc-y += $(ROOTDIR)/system/kernel/include
 -
 -# OS object files.
 -obj-y += Os_Cfg.o
 -# Board object files
 -include $(ROOTDIR)/boards/board_common.mk
 -
 -ABSDIR := $(subst $(TOPDIR)/,,$(CURDIR))
 -
 -# The more precise configuration, the higher preceedance.
 -VPATH := ../config/$(BOARDDIR) ../config $(VPATH)
 -inc-y := ../config/$(BOARDDIR) ../config $(inc-y)
 -
 -inc-y += $(ROOTDIR)/system/kernel/$(objdir)
 -
 -#TODO: Remove?, Build other way?
 -VPATH += $(ROOTDIR)/$(SUBDIR)/Rte
 -inc-y += $(ROOTDIR)/$(SUBDIR)/Rte
 -VPATH += $(ROOTDIR)/components/fading_led
 -inc-y += $(ROOTDIR)/components/fading_led
 -
 -
 -# libs needed by us 
 -#libitem-y +=
 -
 -#linkfile
 -ldcmdfile-y = linkscript_gcc.ldp
 -vpath %.ldf $(ROOTDIR)/$(ARCH_PATH-y)/scripts
 -
 -# What I want to build
 -build-exe-y = pwm_node2.elf
 -
 -
 -
 -
 -
 +
 +# Our object files
 +obj-y += pwm_node2_helpers.o
 +obj-y += fading_led.o
 +obj-y += Rte.o
 +obj-y += Tasks.o
 +obj-y += Hooks.o
 +
- VPATH += ..
- 
 +inc-y += $(ROOTDIR)/system/kernel/$(objdir)
 +inc-y += $(ROOTDIR)/system/kernel/include
 +
 +# OS object files.
 +obj-y += Os_Cfg.o
 +# Board object files
 +include $(ROOTDIR)/boards/board_common.mk
 +
 +ABSDIR := $(subst $(TOPDIR)/,,$(CURDIR))
 +
 +# The more precise configuration, the higher preceedance.
 +VPATH := ../config/$(BOARDDIR) ../config $(VPATH)
 +inc-y := ../config/$(BOARDDIR) ../config $(inc-y)
 +
 +inc-y += $(ROOTDIR)/system/kernel/$(objdir)
 +
 +#TODO: Remove?, Build other way?
- VPATH += ../Rte
- inc-y += ../Rte
++VPATH += $(ROOTDIR)/$(SUBDIR)/Rte
++inc-y += $(ROOTDIR)/$(SUBDIR)/Rte
 +VPATH += $(ROOTDIR)/components/fading_led
 +inc-y += $(ROOTDIR)/components/fading_led
 +
 +
 +# libs needed by us 
 +#libitem-y +=
 +
 +#linkfile
 +ldcmdfile-y = linkscript_gcc.ldp
 +vpath %.ldf $(ROOTDIR)/$(ARCH_PATH-y)/scripts
 +
 +# What I want to build
 +build-exe-y = pwm_node2.elf
 +
 +
 +
 +
 +
diff --cc examples/simple/build_config.mk
index 3eb8133c,a1d32b06..34aa9bfe
--- a/examples/simple/build_config.mk
+++ b/examples/simple/build_config.mk
@@@ -1,10 -1,8 +1,10 @@@
 +-include ../config/*.mk
 +-include ../config/$(BOARDDIR)/*.mk
  
- MOD_USE+=KERNEL MCU
+ -include ../config/*.mk
+ -include ../config/$(BOARDDIR)/*.mk
  
- SELECT_CONSOLE = RAMLOG
- SELECT_OS_CONSOLE = RAMLOG
+ MOD_USE+= COMMON DET ECUM MCU NEWLIB KERNEL RAMLOG 
  
- def-y += CFG_RAMLOG_SIZE=1024
- def-y += HEAPSIZE=1400
+ #def-y += NDEBUG
+ #def-y += HEAPSIZE=1400
diff --cc examples/switch_node/makefile
index b2b6b51d,d9bf0e99..8ef59e37
--- a/examples/switch_node/makefile
+++ b/examples/switch_node/makefile
@@@ -1,47 -1,45 +1,45 @@@
 -
 -# Our object files
 -obj-y += switch_node_helpers.o
 -obj-y += switch.o
 -obj-y += Rte.o
 -obj-y += Tasks.o
 -obj-y += Hooks.o
 -
 -inc-y += $(ROOTDIR)/system/kernel/$(objdir)
 -inc-y += $(ROOTDIR)/system/kernel/include
 -
 -# OS object files.
 -obj-y += Os_Cfg.o
 -# Board object files
 -include $(ROOTDIR)/boards/board_common.mk
 -
 -ABSDIR := $(subst $(TOPDIR)/,,$(CURDIR))
 -
 -# The more precise configuration, the higher preceedance.
 -VPATH := ../config/$(BOARDDIR) ../config $(VPATH)
 -inc-y := ../config/$(BOARDDIR) ../config $(inc-y)
 -
 -inc-y += $(ROOTDIR)/system/kernel/$(objdir)
 -
 -#TODO: Remove?, Build other way?
 -VPATH += $(ROOTDIR)/$(SUBDIR)/Rte
 -inc-y += $(ROOTDIR)/$(SUBDIR)/Rte
 -VPATH += $(ROOTDIR)/components/switch
 -inc-y += $(ROOTDIR)/components/switch
 -
 -
 -# libs needed by us 
 -#libitem-y +=
 -
 -#linkfile
 -ldcmdfile-y = linkscript_gcc.ldp
 -vpath %.ldf $(ROOTDIR)/$(ARCH_PATH-y)/scripts
 -
 -# What I want to build
 -build-exe-y = switch_node.elf
 -
 -
 -
 -
 -
 +
 +# Our object files
 +obj-y += switch_node_helpers.o
 +obj-y += switch.o
 +obj-y += Rte.o
 +obj-y += Tasks.o
 +obj-y += Hooks.o
 +
- VPATH += ..
- 
 +inc-y += $(ROOTDIR)/system/kernel/$(objdir)
 +inc-y += $(ROOTDIR)/system/kernel/include
 +
 +# OS object files.
 +obj-y += Os_Cfg.o
 +# Board object files
 +include $(ROOTDIR)/boards/board_common.mk
 +
 +ABSDIR := $(subst $(TOPDIR)/,,$(CURDIR))
 +
 +# The more precise configuration, the higher preceedance.
 +VPATH := ../config/$(BOARDDIR) ../config $(VPATH)
 +inc-y := ../config/$(BOARDDIR) ../config $(inc-y)
 +
 +inc-y += $(ROOTDIR)/system/kernel/$(objdir)
 +
 +#TODO: Remove?, Build other way?
- VPATH += ../Rte
- inc-y += ../Rte
++VPATH += $(ROOTDIR)/$(SUBDIR)/Rte
++inc-y += $(ROOTDIR)/$(SUBDIR)/Rte
 +VPATH += $(ROOTDIR)/components/switch
 +inc-y += $(ROOTDIR)/components/switch
 +
 +
 +# libs needed by us 
 +#libitem-y +=
 +
 +#linkfile
 +ldcmdfile-y = linkscript_gcc.ldp
 +vpath %.ldf $(ROOTDIR)/$(ARCH_PATH-y)/scripts
 +
 +# What I want to build
 +build-exe-y = switch_node.elf
 +
 +
 +
 +
 +
diff --cc examples/tiny/build_config.mk
index 2608ec9f,82c87f2b..cfacb392
--- a/examples/tiny/build_config.mk
+++ b/examples/tiny/build_config.mk
@@@ -1,7 -1,8 +1,10 @@@
 +-include ../config/*.mk
 +-include ../config/$(BOARDDIR)/*.mk
  
- MOD_USE+=KERNEL MCU
+ -include ../config/*.mk
+ -include ../config/$(BOARDDIR)/*.mk
+ 
+ MOD_USE+=COMMON DET ECUM MCU NEWLIB KERNEL RAMLOG 
  
  SELECT_CONSOLE = RAMLOG
  SELECT_OS_CONSOLE = RAMLOG