From: asterix <asterix@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Wed, 23 Mar 2011 18:56:55 +0000 (+0000)
Subject: Update the project to compile dacc.
X-Git-Tag: 2.7.0~160
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=96d83592e599db19f7a17a311336d62baa32a9d9;p=bertos.git

Update the project to compile dacc.


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

diff --git a/boards/sam3x-ek/examples/sam3x-ek_display/project.bertos b/boards/sam3x-ek/examples/sam3x-ek_display/project.bertos
index f1af6821..5dbb59f9 100644
--- a/boards/sam3x-ek/examples/sam3x-ek_display/project.bertos
+++ b/boards/sam3x-ek/examples/sam3x-ek_display/project.bertos
@@ -36,48 +36,50 @@ aS'menu'
 p18
 aS'adc'
 p19
-aS'signal'
+aS'dac'
 p20
-aS'kernel'
+aS'signal'
 p21
-aS'text_format'
+aS'kernel'
 p22
-aS'sprintf'
+aS'text_format'
 p23
-aS'debug'
+aS'sprintf'
 p24
-aS'timer'
+aS'debug'
 p25
-aS'gfx'
+aS'timer'
 p26
-aS'formatwr'
+aS'gfx'
 p27
-aS'lcd_hx8347'
+aS'formatwr'
 p28
-aS'heap'
+aS'lcd_hx8347'
 p29
-asS'CPU_NAME'
+aS'heap'
 p30
-VSAM3X8
+asS'CPU_NAME'
 p31
-sS'PROJECT_HW_PATH'
+VSAM3X8
 p32
-S'../..'
+sS'PROJECT_HW_PATH'
 p33
-sS'PROJECT_SRC_PATH'
+S'../..'
 p34
-S'.'
+sS'PROJECT_SRC_PATH'
 p35
-sS'PRESET'
+S'.'
 p36
+sS'PRESET'
+p37
 I01
 sS'PROJECT_SRC_PATH_FROM_MAKEFILE'
-p37
-Vboards/sam3x-ek/examples/sam3x-ek_display
 p38
-sS'OUTPUT'
+Vboards/sam3x-ek/examples/sam3x-ek_display
 p39
-(lp40
+sS'OUTPUT'
+p40
+(lp41
 S'codelite'
-p41
+p42
 as.
\ No newline at end of file
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
index 3f9dfd51..622cf6ab 100644
--- a/boards/sam3x-ek/examples/sam3x-ek_display/sam3x-ek_display.mk
+++ b/boards/sam3x-ek/examples/sam3x-ek_display/sam3x-ek_display.mk
@@ -31,12 +31,13 @@ sam3x-ek_display_WIZARD_CSRC = \
 	bertos/gfx/line.c \
 	bertos/drv/lcd_hx8347.c \
 	bertos/drv/adc.c \
+	bertos/cpu/cortex-m3/drv/adc_sam3.c \
+	bertos/cpu/cortex-m3/drv/dac_sam3.c \
 	bertos/gfx/text_format.c \
 	bertos/drv/kbd.c \
 	bertos/fonts/luBS14.c \
 	bertos/kern/signal.c \
 	bertos/kern/proc.c \
-	bertos/cpu/cortex-m3/drv/adc_sam3.c \
 	bertos/mware/hex.c \
 	bertos/gui/menu.c \
 	#
@@ -86,10 +87,10 @@ sam3x-ek_display_ASRC = $(sam3x-ek_display_CPU_ASRC) $(sam3x-ek_display_WIZARD_A
 
 # CPU specific flags and options, defined in the CPU definition files.
 # Automatically generated by the wizard. PLEASE DO NOT EDIT!
-sam3x-ek_display_CPU_CPPASRC = bertos/cpu/cortex-m3/hw/crt_cm3.S bertos/cpu/cortex-m3/hw/vectors_cm3.S 
+sam3x-ek_display_CPU_CPPASRC = bertos/cpu/cortex-m3/hw/crt_cm3.S bertos/cpu/cortex-m3/hw/vectors_cm3.S
 sam3x-ek_display_CPU_CPPAFLAGS = -g -gdwarf-2 -mthumb -mno-thumb-interwork
 sam3x-ek_display_CPU_CPPFLAGS = -O0 -g3 -gdwarf-2 -mthumb -mno-thumb-interwork -fno-strict-aliasing -fwrapv -fverbose-asm -Ibertos/cpu/cortex-m3/ -D__ARM_SAM3X8__
-sam3x-ek_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 
+sam3x-ek_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
 sam3x-ek_display_PROGRAMMER_CPU = sam3
 sam3x-ek_display_CPU_LDFLAGS = -mthumb -mno-thumb-interwork -nostartfiles -Wl,--no-warn-mismatch -Wl,-dT bertos/cpu/cortex-m3/scripts/sam3x8_rom.ld
 sam3x-ek_display_STOPFLASH_SCRIPT = bertos/prg_scripts/arm/stopopenocd.sh