From: asterix Date: Tue, 22 Mar 2011 14:41:16 +0000 (+0000) Subject: Rename project files. X-Git-Tag: 2.7.0~172 X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=62ed0d03c43d69f18b943b031aa699f157146751;p=bertos.git Rename project files. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@4794 38d2e660-2303-0410-9eaa-f027e97ec537 --- diff --git a/boards/sam3x-ek/examples/sam3x-ek_display/cfg/cfg_pwm.h b/boards/sam3x-ek/examples/sam3x-ek_display/cfg/cfg_pwm.h index 595189e6..68d62837 100644 --- a/boards/sam3x-ek/examples/sam3x-ek_display/cfg/cfg_pwm.h +++ b/boards/sam3x-ek/examples/sam3x-ek_display/cfg/cfg_pwm.h @@ -53,4 +53,12 @@ */ #define PWM_LOG_FORMAT LOG_FMT_VERBOSE +/** + * Enable the OLD pwm API. + * Not recommended for new projects. + * + * $WIZ$ type = "boolean" + */ +#define CFG_PWM_ENABLE_OLD_API 1 + #endif /* CFG_PWM_H */ diff --git a/boards/sam3x-ek/examples/sam3x-ek_display/display.mk b/boards/sam3x-ek/examples/sam3x-ek_display/display.mk deleted file mode 100644 index d1145926..00000000 --- a/boards/sam3x-ek/examples/sam3x-ek_display/display.mk +++ /dev/null @@ -1,101 +0,0 @@ -# -# Wizard autogenerated makefile. -# DO NOT EDIT, use the display_user.mk file instead. -# - -# Constants automatically defined by the selected modules -display_DEBUG = 1 - -# Our target application -TRG += display - -display_PREFIX = "arm-none-eabi-" - -display_SUFFIX = "" - -display_SRC_PATH = boards/sam3x-ek/examples/display - -display_HW_PATH = boards/sam3x-ek - -# Files automatically generated by the wizard. DO NOT EDIT, USE display_USER_CSRC INSTEAD! -display_WIZARD_CSRC = \ - bertos/struct/heap.c \ - bertos/cpu/cortex-m3/hw/switch_ctx_cm3.c \ - bertos/mware/event.c \ - bertos/gfx/bitmap.c \ - bertos/gfx/text.c \ - bertos/cpu/cortex-m3/drv/timer_cm3.c \ - bertos/drv/timer.c \ - bertos/drv/adc.c \ - bertos/cpu/cortex-m3/drv/adc_sam3.c \ - bertos/mware/formatwr.c \ - bertos/mware/sprintf.c \ - bertos/gfx/line.c \ - bertos/drv/lcd_hx8347.c \ - bertos/gfx/text_format.c \ - bertos/drv/kbd.c \ - bertos/fonts/luBS14.c \ - bertos/kern/signal.c \ - bertos/kern/proc.c \ - bertos/mware/hex.c \ - bertos/gui/menu.c \ - # - -# Files automatically generated by the wizard. DO NOT EDIT, USE display_USER_PCSRC INSTEAD! -display_WIZARD_PCSRC = \ - \ - # - -# Files automatically generated by the wizard. DO NOT EDIT, USE display_USER_CPPASRC INSTEAD! -display_WIZARD_CPPASRC = \ - \ - # - -# Files automatically generated by the wizard. DO NOT EDIT, USE display_USER_CXXSRC INSTEAD! -display_WIZARD_CXXSRC = \ - \ - # - -# Files automatically generated by the wizard. DO NOT EDIT, USE display_USER_ASRC INSTEAD! -display_WIZARD_ASRC = \ - \ - # - -display_CPPFLAGS = -D'CPU_FREQ=(84000000UL)' -D'ARCH=(ARCH_DEFAULT)' -D'WIZ_AUTOGEN' -I$(display_HW_PATH) -I$(display_SRC_PATH) $(display_CPU_CPPFLAGS) $(display_USER_CPPFLAGS) - -# Automatically generated by the wizard. PLEASE DO NOT EDIT! -display_LDFLAGS = $(display_CPU_LDFLAGS) $(display_WIZARD_LDFLAGS) $(display_USER_LDFLAGS) - -# Automatically generated by the wizard. PLEASE DO NOT EDIT! -display_CPPAFLAGS = $(display_CPU_CPPAFLAGS) $(display_WIZARD_CPPAFLAGS) $(display_USER_CPPAFLAGS) - -# Automatically generated by the wizard. PLEASE DO NOT EDIT! -display_CSRC = $(display_CPU_CSRC) $(display_WIZARD_CSRC) $(display_USER_CSRC) - -# Automatically generated by the wizard. PLEASE DO NOT EDIT! -display_PCSRC = $(display_CPU_PCSRC) $(display_WIZARD_PCSRC) $(display_USER_PCSRC) - -# Automatically generated by the wizard. PLEASE DO NOT EDIT! -display_CPPASRC = $(display_CPU_CPPASRC) $(display_WIZARD_CPPASRC) $(display_USER_CPPASRC) - -# Automatically generated by the wizard. PLEASE DO NOT EDIT! -display_CXXSRC = $(display_CPU_CXXSRC) $(display_WIZARD_CXXSRC) $(display_USER_CXXSRC) - -# Automatically generated by the wizard. PLEASE DO NOT EDIT! -display_ASRC = $(display_CPU_ASRC) $(display_WIZARD_ASRC) $(display_USER_ASRC) - -# CPU specific flags and options, defined in the CPU definition files. -# Automatically generated by the wizard. PLEASE DO NOT EDIT! -display_CPU_CPPASRC = bertos/cpu/cortex-m3/hw/crt_cm3.S bertos/cpu/cortex-m3/hw/vectors_cm3.S -display_CPU_CPPAFLAGS = -g -gdwarf-2 -mthumb -mno-thumb-interwork -display_CPU_CPPFLAGS = -O0 -g3 -gdwarf-2 -mthumb -mno-thumb-interwork -fno-strict-aliasing -fwrapv -fverbose-asm -Ibertos/cpu/cortex-m3/ -D__ARM_SAM3X8__ -display_CPU_CSRC = bertos/cpu/cortex-m3/hw/init_cm3.c bertos/cpu/cortex-m3/drv/irq_cm3.c bertos/cpu/cortex-m3/drv/clock_sam3.c -display_PROGRAMMER_CPU = sam3 -display_CPU_LDFLAGS = -mthumb -mno-thumb-interwork -nostartfiles -Wl,--no-warn-mismatch -Wl,-dT bertos/cpu/cortex-m3/scripts/sam3x8_rom.ld -display_STOPFLASH_SCRIPT = bertos/prg_scripts/arm/stopopenocd.sh -display_CPU = cortex-m3 -display_STOPDEBUG_SCRIPT = bertos/prg_scripts/arm/stopopenocd.sh -display_DEBUG_SCRIPT = bertos/prg_scripts/arm/debug.sh -display_FLASH_SCRIPT = bertos/prg_scripts/arm/flash-sam3.sh - -include $(display_SRC_PATH)/display_user.mk diff --git a/boards/sam3x-ek/examples/sam3x-ek_display/display_user.mk b/boards/sam3x-ek/examples/sam3x-ek_display/display_user.mk deleted file mode 100644 index a7eb3145..00000000 --- a/boards/sam3x-ek/examples/sam3x-ek_display/display_user.mk +++ /dev/null @@ -1,47 +0,0 @@ -# -# User makefile. -# Edit this file to change compiler options and related stuff. -# - -# Programmer interface configuration, see http://dev.bertos.org/wiki/ProgrammerInterface for help -display_PROGRAMMER_TYPE = none -display_PROGRAMMER_PORT = none - -# Files included by the user. -display_USER_CSRC = \ - $(display_SRC_PATH)/main.c \ - $(display_SRC_PATH)/bitmaps.c \ - bertos/icons/logo.c \ - bertos/fonts/gohu.c \ - # - -# Files included by the user. -display_USER_PCSRC = \ - # - -# Files included by the user. -display_USER_CPPASRC = \ - # - -# Files included by the user. -display_USER_CXXSRC = \ - # - -# Files included by the user. -display_USER_ASRC = \ - # - -# Flags included by the user. -display_USER_LDFLAGS = \ - # - -# Flags included by the user. -display_USER_CPPAFLAGS = \ - # - -# Flags included by the user. -display_USER_CPPFLAGS = \ - -Os \ - -fno-strict-aliasing \ - -fwrapv \ - # diff --git a/boards/sam3x-ek/examples/sam3x-ek_display/project.bertos b/boards/sam3x-ek/examples/sam3x-ek_display/project.bertos index 304aa088..4bc3d1b1 100644 --- a/boards/sam3x-ek/examples/sam3x-ek_display/project.bertos +++ b/boards/sam3x-ek/examples/sam3x-ek_display/project.bertos @@ -12,7 +12,7 @@ p5 I4 sS'PROJECT_NAME' p6 -Vdisplay +Vsam3x-ek_display p7 sS'TOOLCHAIN' p8 @@ -21,9 +21,9 @@ S'path' p10 Varm-none-eabi-gcc p11 -ssS'PROJECT_HW_PATH_FROM_MAKEFILE' +ssS'PROJECT_SRC_PATH_FROM_MAKEFILE' p12 -Vboards/sam3x-ek +Vboards/sam3x-ek/examples/sam3x-ek_display p13 sS'ENABLED_MODULES' p14 @@ -36,13 +36,13 @@ aS'menu' p18 aS'signal' p19 -aS'kernel' +aS'debug' p20 -aS'text_format' +aS'kernel' p21 -aS'sprintf' +aS'text_format' p22 -aS'debug' +aS'sprintf' p23 aS'timer' p24 @@ -69,9 +69,9 @@ p34 sS'PRESET' p35 I01 -sS'PROJECT_SRC_PATH_FROM_MAKEFILE' +sS'PROJECT_HW_PATH_FROM_MAKEFILE' p36 -Vboards/sam3x-ek/examples/display +Vboards/sam3x-ek p37 sS'OUTPUT' p38 diff --git a/boards/sam3x-ek/examples/sam3x-ek_display/sam3x-ek_display.mk b/boards/sam3x-ek/examples/sam3x-ek_display/sam3x-ek_display.mk new file mode 100644 index 00000000..d1145926 --- /dev/null +++ b/boards/sam3x-ek/examples/sam3x-ek_display/sam3x-ek_display.mk @@ -0,0 +1,101 @@ +# +# Wizard autogenerated makefile. +# DO NOT EDIT, use the display_user.mk file instead. +# + +# Constants automatically defined by the selected modules +display_DEBUG = 1 + +# Our target application +TRG += display + +display_PREFIX = "arm-none-eabi-" + +display_SUFFIX = "" + +display_SRC_PATH = boards/sam3x-ek/examples/display + +display_HW_PATH = boards/sam3x-ek + +# Files automatically generated by the wizard. DO NOT EDIT, USE display_USER_CSRC INSTEAD! +display_WIZARD_CSRC = \ + bertos/struct/heap.c \ + bertos/cpu/cortex-m3/hw/switch_ctx_cm3.c \ + bertos/mware/event.c \ + bertos/gfx/bitmap.c \ + bertos/gfx/text.c \ + bertos/cpu/cortex-m3/drv/timer_cm3.c \ + bertos/drv/timer.c \ + bertos/drv/adc.c \ + bertos/cpu/cortex-m3/drv/adc_sam3.c \ + bertos/mware/formatwr.c \ + bertos/mware/sprintf.c \ + bertos/gfx/line.c \ + bertos/drv/lcd_hx8347.c \ + bertos/gfx/text_format.c \ + bertos/drv/kbd.c \ + bertos/fonts/luBS14.c \ + bertos/kern/signal.c \ + bertos/kern/proc.c \ + bertos/mware/hex.c \ + bertos/gui/menu.c \ + # + +# Files automatically generated by the wizard. DO NOT EDIT, USE display_USER_PCSRC INSTEAD! +display_WIZARD_PCSRC = \ + \ + # + +# Files automatically generated by the wizard. DO NOT EDIT, USE display_USER_CPPASRC INSTEAD! +display_WIZARD_CPPASRC = \ + \ + # + +# Files automatically generated by the wizard. DO NOT EDIT, USE display_USER_CXXSRC INSTEAD! +display_WIZARD_CXXSRC = \ + \ + # + +# Files automatically generated by the wizard. DO NOT EDIT, USE display_USER_ASRC INSTEAD! +display_WIZARD_ASRC = \ + \ + # + +display_CPPFLAGS = -D'CPU_FREQ=(84000000UL)' -D'ARCH=(ARCH_DEFAULT)' -D'WIZ_AUTOGEN' -I$(display_HW_PATH) -I$(display_SRC_PATH) $(display_CPU_CPPFLAGS) $(display_USER_CPPFLAGS) + +# Automatically generated by the wizard. PLEASE DO NOT EDIT! +display_LDFLAGS = $(display_CPU_LDFLAGS) $(display_WIZARD_LDFLAGS) $(display_USER_LDFLAGS) + +# Automatically generated by the wizard. PLEASE DO NOT EDIT! +display_CPPAFLAGS = $(display_CPU_CPPAFLAGS) $(display_WIZARD_CPPAFLAGS) $(display_USER_CPPAFLAGS) + +# Automatically generated by the wizard. PLEASE DO NOT EDIT! +display_CSRC = $(display_CPU_CSRC) $(display_WIZARD_CSRC) $(display_USER_CSRC) + +# Automatically generated by the wizard. PLEASE DO NOT EDIT! +display_PCSRC = $(display_CPU_PCSRC) $(display_WIZARD_PCSRC) $(display_USER_PCSRC) + +# Automatically generated by the wizard. PLEASE DO NOT EDIT! +display_CPPASRC = $(display_CPU_CPPASRC) $(display_WIZARD_CPPASRC) $(display_USER_CPPASRC) + +# Automatically generated by the wizard. PLEASE DO NOT EDIT! +display_CXXSRC = $(display_CPU_CXXSRC) $(display_WIZARD_CXXSRC) $(display_USER_CXXSRC) + +# Automatically generated by the wizard. PLEASE DO NOT EDIT! +display_ASRC = $(display_CPU_ASRC) $(display_WIZARD_ASRC) $(display_USER_ASRC) + +# CPU specific flags and options, defined in the CPU definition files. +# Automatically generated by the wizard. PLEASE DO NOT EDIT! +display_CPU_CPPASRC = bertos/cpu/cortex-m3/hw/crt_cm3.S bertos/cpu/cortex-m3/hw/vectors_cm3.S +display_CPU_CPPAFLAGS = -g -gdwarf-2 -mthumb -mno-thumb-interwork +display_CPU_CPPFLAGS = -O0 -g3 -gdwarf-2 -mthumb -mno-thumb-interwork -fno-strict-aliasing -fwrapv -fverbose-asm -Ibertos/cpu/cortex-m3/ -D__ARM_SAM3X8__ +display_CPU_CSRC = bertos/cpu/cortex-m3/hw/init_cm3.c bertos/cpu/cortex-m3/drv/irq_cm3.c bertos/cpu/cortex-m3/drv/clock_sam3.c +display_PROGRAMMER_CPU = sam3 +display_CPU_LDFLAGS = -mthumb -mno-thumb-interwork -nostartfiles -Wl,--no-warn-mismatch -Wl,-dT bertos/cpu/cortex-m3/scripts/sam3x8_rom.ld +display_STOPFLASH_SCRIPT = bertos/prg_scripts/arm/stopopenocd.sh +display_CPU = cortex-m3 +display_STOPDEBUG_SCRIPT = bertos/prg_scripts/arm/stopopenocd.sh +display_DEBUG_SCRIPT = bertos/prg_scripts/arm/debug.sh +display_FLASH_SCRIPT = bertos/prg_scripts/arm/flash-sam3.sh + +include $(display_SRC_PATH)/display_user.mk diff --git a/boards/sam3x-ek/examples/sam3x-ek_display/sam3x-ek_display_user.mk b/boards/sam3x-ek/examples/sam3x-ek_display/sam3x-ek_display_user.mk new file mode 100644 index 00000000..a7eb3145 --- /dev/null +++ b/boards/sam3x-ek/examples/sam3x-ek_display/sam3x-ek_display_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 +display_PROGRAMMER_TYPE = none +display_PROGRAMMER_PORT = none + +# Files included by the user. +display_USER_CSRC = \ + $(display_SRC_PATH)/main.c \ + $(display_SRC_PATH)/bitmaps.c \ + bertos/icons/logo.c \ + bertos/fonts/gohu.c \ + # + +# Files included by the user. +display_USER_PCSRC = \ + # + +# Files included by the user. +display_USER_CPPASRC = \ + # + +# Files included by the user. +display_USER_CXXSRC = \ + # + +# Files included by the user. +display_USER_ASRC = \ + # + +# Flags included by the user. +display_USER_LDFLAGS = \ + # + +# Flags included by the user. +display_USER_CPPAFLAGS = \ + # + +# Flags included by the user. +display_USER_CPPFLAGS = \ + -Os \ + -fno-strict-aliasing \ + -fwrapv \ + #