Update the test makefile to new bertos build system.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@4570 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/examples/test/armtest.mk b/examples/test/armtest.mk
index 6f3a73880001548ea1562e1109fe5c2bd4508586..1d2746d227919c2b7bc85d451048108c8c218a61 100644 (file)
--- a/examples/test/armtest.mk
+++ b/examples/test/armtest.mk
@@ -1,32 +1,81 @@
 #
-# $Id: armtest.mk 18234 2007-10-08 13:39:48Z rasky $
-# Copyright 2006 Develer S.r.l. (http://www.develer.com/)
-# All rights reserved.
-#
-# Makefile fragment for DevLib armtest application.
-#
-# Author: Bernie Innocenti <bernie@codewiz.org>
-#
+# Wizard autogenerated makefile.
+# DO NOT EDIT, use the armtest_user.mk file instead.
 #
 
-# Set to 1 for debug builds
+# Constants automatically defined by the selected modules
 armtest_DEBUG = 1
 
 # Our target application
 TRG += armtest
 
-#include arm c and asm sources
-include ./examples/test/arm_src.mk
+armtest_PREFIX = "arm-none-eabi-"
+
+armtest_SUFFIX = ""
+
+armtest_SRC_PATH = examples/test
+
+armtest_HW_PATH = bertos/hw
+
+# Files automatically generated by the wizard. DO NOT EDIT, USE armtest_USER_CSRC INSTEAD!
+armtest_WIZARD_CSRC = \
+       #
+
+# Files automatically generated by the wizard. DO NOT EDIT, USE armtest_USER_PCSRC INSTEAD!
+armtest_WIZARD_PCSRC = \
+        \
+       #
+
+# Files automatically generated by the wizard. DO NOT EDIT, USE armtest_USER_CPPASRC INSTEAD!
+armtest_WIZARD_CPPASRC = \
+        \
+       #
+
+# Files automatically generated by the wizard. DO NOT EDIT, USE armtest_USER_CXXSRC INSTEAD!
+armtest_WIZARD_CXXSRC = \
+        \
+       #
+
+# Files automatically generated by the wizard. DO NOT EDIT, USE armtest_USER_ASRC INSTEAD!
+armtest_WIZARD_ASRC = \
+        \
+       #
+
+armtest_CPPFLAGS = -D'CPU_FREQ=(48023000UL)' -D'ARCH=(ARCH_NIGHTTEST)' -D'WIZ_AUTOGEN' -I$(armtest_HW_PATH) -I$(armtest_SRC_PATH) $(armtest_CPU_CPPFLAGS) $(armtest_USER_CPPFLAGS)
+
+# Automatically generated by the wizard. PLEASE DO NOT EDIT!
+armtest_LDFLAGS = $(armtest_CPU_LDFLAGS) $(armtest_WIZARD_LDFLAGS) $(armtest_USER_LDFLAGS)
+
+# Automatically generated by the wizard. PLEASE DO NOT EDIT!
+armtest_CPPAFLAGS = $(armtest_CPU_CPPAFLAGS) $(armtest_WIZARD_CPPAFLAGS) $(armtest_USER_CPPAFLAGS)
+
+# Automatically generated by the wizard. PLEASE DO NOT EDIT!
+armtest_CSRC = $(armtest_CPU_CSRC) $(armtest_WIZARD_CSRC) $(armtest_USER_CSRC)
 
-armtest_CSRC = $(arm_CSRC) examples/test/empty_main.c
+# Automatically generated by the wizard. PLEASE DO NOT EDIT!
+armtest_PCSRC = $(armtest_CPU_PCSRC) $(armtest_WIZARD_PCSRC) $(armtest_USER_PCSRC)
 
-armtest_CPPASRC = $(arm_ASRC)
+# Automatically generated by the wizard. PLEASE DO NOT EDIT!
+armtest_CPPASRC = $(armtest_CPU_CPPASRC) $(armtest_WIZARD_CPPASRC) $(armtest_USER_CPPASRC)
 
-armtest_PREFIX = arm-none-eabi-
+# Automatically generated by the wizard. PLEASE DO NOT EDIT!
+armtest_CXXSRC = $(armtest_CPU_CXXSRC) $(armtest_WIZARD_CXXSRC) $(armtest_USER_CXXSRC)
 
-armtest_CPPAFLAGS = -O0 -g -gdwarf-2 -g
-armtest_CPPFLAGS = -O0 -D'ARCH=ARCH_NIGHTTEST' -D__ARM_AT91SAM7X256__ -D'CPU_FREQ=(48023000UL)' -D'WIZ_AUTOGEN' -g3 -gdwarf-2 -fverbose-asm -Iexamples/test -Ibertos/cpu/arm
-armtest_LDFLAGS = -nostartfiles -T bertos/cpu/arm/scripts/at91sam7_256_rom.ld -Wl,--no-warn-mismatch
+# Automatically generated by the wizard. PLEASE DO NOT EDIT!
+armtest_ASRC = $(armtest_CPU_ASRC) $(armtest_WIZARD_ASRC) $(armtest_USER_ASRC)
 
+# CPU specific flags and options, defined in the CPU definition files.
+# Automatically generated by the wizard. PLEASE DO NOT EDIT!
+armtest_CPU_CPPASRC = bertos/cpu/arm/hw/crt_arm7tdmi.S bertos/cpu/arm/hw/vectors_at91.S
+armtest_CPU_CPPAFLAGS = -g -gdwarf-2
+armtest_CPU_CPPFLAGS = -O0 -g3 -gdwarf-2 -fverbose-asm -Ibertos/cpu/arm/ -D__ARM_AT91SAM7X256__
+armtest_CPU_CSRC =
+armtest_PROGRAMMER_CPU = at91sam7
+armtest_CPU_LDFLAGS = -nostartfiles -Wl,--no-warn-mismatch -T bertos/cpu/arm/scripts/at91sam7_256_rom.ld
+armtest_STOPFLASH_SCRIPT = bertos/prg_scripts/arm/stopopenocd.sh
 armtest_CPU = arm7tdmi
+armtest_STOPDEBUG_SCRIPT = bertos/prg_scripts/arm/stopopenocd.sh
+armtest_DEBUG_SCRIPT = bertos/prg_scripts/arm/debug.sh
+armtest_FLASH_SCRIPT = bertos/prg_scripts/arm/flash.sh
 
+include $(armtest_SRC_PATH)/armtest_user.mk

diff --git a/examples/test/armtest_user.mk b/examples/test/armtest_user.mk
new file mode 100644 (file)
index 0000000..774d4d5
--- /dev/null
+++ b/examples/test/armtest_user.mk
@@ -0,0 +1,46 @@
+#
+# User makefile.
+# Edit this file to change compiler options and related stuff.
+#
+
+# Programmer interface configuration, see http://dev.bertos.org/wiki/ProgrammerInterface for help
+armtest_PROGRAMMER_TYPE = none
+armtest_PROGRAMMER_PORT = none
+
+include $(armtest_SRC_PATH)/arm_src.mk
+
+# Files included by the user.
+armtest_USER_CSRC = \
+       $(armtest_SRC_PATH)/empty_main.c \
+       $(arm_CSRC) \
+       #
+
+# Files included by the user.
+armtest_USER_PCSRC = \
+       #
+
+# Files included by the user.
+armtest_USER_CPPASRC = \
+       #
+
+# Files included by the user.
+armtest_USER_CXXSRC = \
+       #
+
+# Files included by the user.
+armtest_USER_ASRC = \
+       #
+
+# Flags included by the user.
+armtest_USER_LDFLAGS = \
+       #
+
+# Flags included by the user.
+armtest_USER_CPPAFLAGS = \
+       #
+
+# Flags included by the user.
+armtest_USER_CPPFLAGS = \
+       -fno-strict-aliasing \
+       -fwrapv \
+       #

diff --git a/examples/test/avrtest.mk b/examples/test/avrtest.mk
index d1f93e60538a22cd8ee66e24bfa7be498613ee05..07e139a67dd3c4d11663a50fa0ecba2c75c721fe 100644 (file)
--- a/examples/test/avrtest.mk
+++ b/examples/test/avrtest.mk
@@ -1,32 +1,79 @@
 #
-# $Id: avrtest.mk,v 1.3 2006/06/12 21:37:02 marco Exp $
-# Copyright 2006 Develer S.r.l. (http://www.develer.com/)
-# All rights reserved.
+# Wizard autogenerated makefile.
+# DO NOT EDIT, use the avrtest_user.mk file instead.
 #
-# Makefile fragment for DevLib avrtest application.
-#
-# Author: Bernie Innocenti <bernie@codewiz.org>
-#
-
 
-
-# Set to 1 for debug builds
+# Constants automatically defined by the selected modules
 avrtest_DEBUG = 1
 
+
 # Our target application
 TRG += avrtest
 
-avrtest_MCU = atmega64
+avrtest_PREFIX = "avr-"
+
+avrtest_SUFFIX = ""
+
+avrtest_SRC_PATH = examples/test
+
+avrtest_HW_PATH = bertos/hw
+
+# Files automatically generated by the wizard. DO NOT EDIT, USE avrtest_USER_CSRC INSTEAD!
+avrtest_WIZARD_CSRC = \
+        \
+       #
 
-#include avr c and asm sources
-include examples/test/avr_src.mk
+# Files automatically generated by the wizard. DO NOT EDIT, USE avrtest_USER_PCSRC INSTEAD!
+avrtest_WIZARD_PCSRC = \
+        \
+       #
 
-avrtest_CSRC = $(avr_CSRC) examples/test/empty_main.c
+# Files automatically generated by the wizard. DO NOT EDIT, USE avrtest_USER_CPPASRC INSTEAD!
+avrtest_WIZARD_CPPASRC = \
+        \
+       #
 
-avrtest_CPPASRC = $(avr_ASRC)
+# Files automatically generated by the wizard. DO NOT EDIT, USE avrtest_USER_CXXSRC INSTEAD!
+avrtest_WIZARD_CXXSRC = \
+        \
+       #
 
-avrtest_PCSRC += bertos/mware/formatwr.c
+# Files automatically generated by the wizard. DO NOT EDIT, USE avrtest_USER_ASRC INSTEAD!
+avrtest_WIZARD_ASRC = \
+        \
+       #
+
+avrtest_CPPFLAGS = -D'CPU_FREQ=(8000000UL)' -D'ARCH=(ARCH_NIGHTTEST)' -D'WIZ_AUTOGEN' -I$(avrtest_HW_PATH) -I$(avrtest_SRC_PATH) $(avrtest_CPU_CPPFLAGS) $(avrtest_USER_CPPFLAGS)
+
+# Automatically generated by the wizard. PLEASE DO NOT EDIT!
+avrtest_LDFLAGS = $(avrtest_CPU_LDFLAGS) $(avrtest_WIZARD_LDFLAGS) $(avrtest_USER_LDFLAGS)
+
+# Automatically generated by the wizard. PLEASE DO NOT EDIT!
+avrtest_CPPAFLAGS = $(avrtest_CPU_CPPAFLAGS) $(avrtest_WIZARD_CPPAFLAGS) $(avrtest_USER_CPPAFLAGS)
+
+# Automatically generated by the wizard. PLEASE DO NOT EDIT!
+avrtest_CSRC = $(avrtest_CPU_CSRC) $(avrtest_WIZARD_CSRC) $(avrtest_USER_CSRC)
+
+# Automatically generated by the wizard. PLEASE DO NOT EDIT!
+avrtest_PCSRC = $(avrtest_CPU_PCSRC) $(avrtest_WIZARD_PCSRC) $(avrtest_USER_PCSRC)
+
+# Automatically generated by the wizard. PLEASE DO NOT EDIT!
+avrtest_CPPASRC = $(avrtest_CPU_CPPASRC) $(avrtest_WIZARD_CPPASRC) $(avrtest_USER_CPPASRC)
+
+# Automatically generated by the wizard. PLEASE DO NOT EDIT!
+avrtest_CXXSRC = $(avrtest_CPU_CXXSRC) $(avrtest_WIZARD_CXXSRC) $(avrtest_USER_CXXSRC)
+
+# Automatically generated by the wizard. PLEASE DO NOT EDIT!
+avrtest_ASRC = $(avrtest_CPU_ASRC) $(avrtest_WIZARD_ASRC) $(avrtest_USER_ASRC)
+
+# CPU specific flags and options, defined in the CPU definition files.
+# Automatically generated by the wizard. PLEASE DO NOT EDIT!
+avrtest_DEBUG_SCRIPT = bertos/prg_scripts/nodebug.sh
+avrtest_PROGRAMMER_CPU = atmega64
+avrtest_STOPDEBUG_SCRIPT = bertos/prg_scripts/none.sh
+avrtest_MCU = atmega64
+avrtest_FLASH_SCRIPT = bertos/prg_scripts/avr/flash.sh
+avrtest_STOPFLASH_SCRIPT = bertos/prg_scripts/avr/stopflash.sh
+avrtest_CPU_CPPFLAGS = -Os -Ibertos/cpu/avr/
 
-avrtest_PREFIX = avr-
-avrtest_CPPFLAGS = -D'ARCH=ARCH_NIGHTTEST' -D'CPU_FREQ=(12288000UL)' -D'WIZ_AUTOGEN' -Iexamples/test -Ibertos/cpu/avr
-avrtest_CFLAGS = -Os -mcall-prologues -fno-strict-aliasing
+include $(avrtest_SRC_PATH)/avrtest_user.mk

diff --git a/examples/test/avrtest_user.mk b/examples/test/avrtest_user.mk
new file mode 100644 (file)
index 0000000..fa93e09
--- /dev/null
+++ b/examples/test/avrtest_user.mk
@@ -0,0 +1,47 @@
+#
+# User makefile.
+# Edit this file to change compiler options and related stuff.
+#
+
+# Programmer interface configuration, see http://dev.bertos.org/wiki/ProgrammerInterface for help
+avrtest_PROGRAMMER_TYPE = none
+avrtest_PROGRAMMER_PORT = none
+
+# For Nightlytest we include the all Bertos files.
+include $(avrtest_SRC_PATH)/avr_src.mk
+
+# Files included by the user.
+avrtest_USER_CSRC = \
+       $(avrtest_SRC_PATH)/empty_main.c \
+       $(avr_CSRC) \
+       #
+
+# Files included by the user.
+avrtest_USER_PCSRC = \
+       #
+
+# Files included by the user.
+avrtest_USER_CPPASRC = \
+       #
+
+# Files included by the user.
+avrtest_USER_CXXSRC = \
+       #
+
+# Files included by the user.
+avrtest_USER_ASRC = \
+       #
+
+# Flags included by the user.
+avrtest_USER_LDFLAGS = \
+       #
+
+# Flags included by the user.
+avrtest_USER_CPPAFLAGS = \
+       #
+
+# Flags included by the user.
+avrtest_USER_CPPFLAGS = \
+       -fno-strict-aliasing \
+       -fwrapv \
+       #