From ad78a25e6bfb87a82ea5ff441c054e64f99df17c Mon Sep 17 00:00:00 2001 From: batt Date: Fri, 28 Aug 2009 14:48:25 +0000 Subject: [PATCH] Use correct path. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@2815 38d2e660-2303-0410-9eaa-f027e97ec537 --- bertos/cpu/arm/info/at91sam7.common | 11 +++++------ bertos/cpu/avr/info/avr.common | 5 ++--- bertos/cpu/path.common | 2 ++ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bertos/cpu/arm/info/at91sam7.common b/bertos/cpu/arm/info/at91sam7.common index 942d84e9..b0716386 100644 --- a/bertos/cpu/arm/info/at91sam7.common +++ b/bertos/cpu/arm/info/at91sam7.common @@ -69,11 +69,11 @@ CPU_TAGS = ["at91", CORE_CPU] # Where are locate the bertos directories SCRIPT_DIR = CPU_DIR + "arm/scripts/" HW_DIR = CPU_DIR + "arm/hw/" -PROG_SCRIPT_DIR = "prog_scripts/arm/" -MK_FLASH_SCRIPT = PROG_SCRIPT_DIR + "flash.sh" -MK_DEBUG_SCRIPT = PROG_SCRIPT_DIR + "debug.sh" -MK_GDB_INIT_SCRIPT = PROG_SCRIPT_DIR + "openocd/gdbinit-sam7" +MK_FLASH_SCRIPT = PRG_SCRIPTS_DIR + "arm/flash.sh" +MK_DEBUG_SCRIPT = PRG_SCRIPTS_DIR + "arm/debug.sh" + +GDB_INIT_SCRIPT = PRG_SCRIPTS_DIR + "arm/openocd/gdbinit-sam7" # Common GCC flags. MK_CPPAFLAGS = "-O0 -g -gdwarf-2 -g -gen-debug" @@ -81,5 +81,4 @@ MK_CPU_CPPFLAGS = "-O0 -g3 -gdwarf-2 -fverbose-asm -I" + CPU_DIR + "arm/" MK_LDFLAGS = "-nostartfiles -Wl,--no-warn-mismatch" # CRT file. -MK_CPPASRC = [ HW_DIR + "crtat91sam7_rom.S"] - +MK_CPPASRC = HW_DIR + "crtat91sam7_rom.S" diff --git a/bertos/cpu/avr/info/avr.common b/bertos/cpu/avr/info/avr.common index 5bb40dee..1dab8507 100644 --- a/bertos/cpu/avr/info/avr.common +++ b/bertos/cpu/avr/info/avr.common @@ -58,10 +58,9 @@ CPU_DEFAULT_FREQ = "8000000UL" # Where are locate the bertos directories SCRIPT_DIR = CPU_DIR + "avr/scripts/" -PROG_SCRIPT_DIR = "prog_scripts/avr/" -MK_FLASH_SCRIPT = PROG_SCRIPT_DIR + "flash.sh" -MK_DEBUG_SCRIPT = PROG_SCRIPT_DIR + "debug.sh" +MK_FLASH_SCRIPT = PRG_SCRIPTS_DIR + "avr/flash.sh" +MK_DEBUG_SCRIPT = PRG_SCRIPTS_DIR + "avr/debug.sh" # Common GCC flags. MK_CPU_CPPFLAGS = "-Os -fno-strict-aliasing -I" + CPU_DIR + "avr/" diff --git a/bertos/cpu/path.common b/bertos/cpu/path.common index fce20b04..4c1808bd 100644 --- a/bertos/cpu/path.common +++ b/bertos/cpu/path.common @@ -42,3 +42,5 @@ # BeRTOS cpu directory CPU_DIR = "bertos/cpu/" + +PRG_SCRIPTS_DIR = "bertos/prg_scripts/" -- 2.25.1