From: arighi <arighi@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Fri, 30 Apr 2010 10:39:44 +0000 (+0000)
Subject: CM3: lm3s scripts and configurations refactoring.
X-Git-Tag: 2.5.0~332
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=b6cf7ebec417a6433b757b2e6e92668194c22a55;p=bertos.git

CM3: lm3s scripts and configurations refactoring.

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

diff --git a/bertos/cpu/cortex-m3/info/LM3S1968.cdef b/bertos/cpu/cortex-m3/info/LM3S1968.cdef
index 494042cc..e3811a29 100644
--- a/bertos/cpu/cortex-m3/info/LM3S1968.cdef
+++ b/bertos/cpu/cortex-m3/info/LM3S1968.cdef
@@ -45,6 +45,7 @@ include("cm3.common")
 
 # CPU type used for flashing/debugging
 MK_PROGRAMMER_CPU = "lm3s"
+MK_FLASH_SCRIPT = PRG_SCRIPTS_DIR + "arm/flash-lm3s.sh"
 
 # CPU default clock frequency
 CPU_DEFAULT_FREQ = "50000000UL"
diff --git a/bertos/cpu/cortex-m3/info/LM3S8962.cdef b/bertos/cpu/cortex-m3/info/LM3S8962.cdef
index 3491c728..ddabc1f2 100644
--- a/bertos/cpu/cortex-m3/info/LM3S8962.cdef
+++ b/bertos/cpu/cortex-m3/info/LM3S8962.cdef
@@ -45,6 +45,7 @@ include("cm3.common")
 
 # CPU type used for flashing/debugging
 MK_PROGRAMMER_CPU = "lm3s"
+MK_FLASH_SCRIPT = PRG_SCRIPTS_DIR + "arm/flash-lm3s.sh"
 
 # CPU default clock frequency
 CPU_DEFAULT_FREQ = "50000000UL"
diff --git a/bertos/cpu/cortex-m3/info/cm3.common b/bertos/cpu/cortex-m3/info/cm3.common
index d08f913a..23dfe2a3 100644
--- a/bertos/cpu/cortex-m3/info/cm3.common
+++ b/bertos/cpu/cortex-m3/info/cm3.common
@@ -65,7 +65,6 @@ SCRIPT_DIR = CPU_DIR + "cortex-m3/scripts/"
 HW_DIR = CPU_DIR + "cortex-m3/hw/"
 DRV_DIR = CPU_DIR + "cortex-m3/drv/"
 
-MK_FLASH_SCRIPT = PRG_SCRIPTS_DIR + "arm/flash-cortex.sh"
 MK_STOPFLASH_SCRIPT = PRG_SCRIPTS_DIR + "arm/stopopenocd.sh"
 MK_DEBUG_SCRIPT = PRG_SCRIPTS_DIR + "arm/debug.sh"
 MK_STOPDEBUG_SCRIPT = PRG_SCRIPTS_DIR + "arm/stopopenocd.sh"
diff --git a/bertos/cpu/cortex-m3/scripts/lm3s8962_ram.ld b/bertos/cpu/cortex-m3/scripts/lm3s8962_ram.ld
new file mode 100644
index 00000000..87d9a309
--- /dev/null
+++ b/bertos/cpu/cortex-m3/scripts/lm3s8962_ram.ld
@@ -0,0 +1,38 @@
+/**
+ * \file
+ * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
+ * Copyright 2010 Develer S.r.l. (http://www.develer.com/)
+ *
+ * -->
+ *
+ * \brief Script for Luminary Micro LM3S8968 Cortex M3 family processors.
+ *
+ * \author Andrea Righi <arighi@develer.com>
+ */
+
+INCLUDE bertos/cpu/cortex-m3/scripts/lm3s1968_ram.ld
diff --git a/bertos/cpu/cortex-m3/scripts/lm3s8962_rom.ld b/bertos/cpu/cortex-m3/scripts/lm3s8962_rom.ld
new file mode 100644
index 00000000..03a497f7
--- /dev/null
+++ b/bertos/cpu/cortex-m3/scripts/lm3s8962_rom.ld
@@ -0,0 +1,38 @@
+/**
+ * \file
+ * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
+ * Copyright 2010 Develer S.r.l. (http://www.develer.com/)
+ *
+ * -->
+ *
+ * \brief Script for Luminary Micro LM3S8962 Cortex M3 family processors.
+ *
+ * \author Andrea Righi <arighi@develer.com>
+ */
+
+INCLUDE bertos/cpu/cortex-m3/scripts/lm3s1968_rom.ld
diff --git a/examples/develgps/develgps.mk b/examples/develgps/develgps.mk
index bc27bd3d..b1415b7c 100644
--- a/examples/develgps/develgps.mk
+++ b/examples/develgps/develgps.mk
@@ -68,7 +68,7 @@ develgps_CPU = cortex-m3
 
 develgps_PROGRAMMER_CPU = lm3s
 develgps_PROGRAMMER_TYPE = luminary
-develgps_FLASH_SCRIPT = bertos/prg_scripts/arm/flash-cortex.sh
+develgps_FLASH_SCRIPT = bertos/prg_scripts/arm/flash-lm3s.sh
 develgps_STOPFLASH_SCRIPT = bertos/prg_scripts/arm/stopopenocd.sh
 develgps_DEBUG_SCRIPT = bertos/prg_scripts/arm/debug.sh
 develgps_STOPDEBUG_SCRIPT = bertos/prg_scripts/arm/stopopenocd.sh
diff --git a/examples/lm3s1968/lm3s1968.mk b/examples/lm3s1968/lm3s1968.mk
index 38f29d3e..fc4622f3 100644
--- a/examples/lm3s1968/lm3s1968.mk
+++ b/examples/lm3s1968/lm3s1968.mk
@@ -68,7 +68,7 @@ lm3s1968_CPU = cortex-m3
 
 lm3s1968_PROGRAMMER_CPU = lm3s
 lm3s1968_PROGRAMMER_TYPE = luminary
-lm3s1968_FLASH_SCRIPT = bertos/prg_scripts/arm/flash-cortex.sh
+lm3s1968_FLASH_SCRIPT = bertos/prg_scripts/arm/flash-lm3s.sh
 lm3s1968_STOPFLASH_SCRIPT = bertos/prg_scripts/arm/stopopenocd.sh
 lm3s1968_DEBUG_SCRIPT = bertos/prg_scripts/arm/debug.sh
 lm3s1968_STOPDEBUG_SCRIPT = bertos/prg_scripts/arm/stopopenocd.sh
diff --git a/examples/lm3s8962/lm3s8962.mk b/examples/lm3s8962/lm3s8962.mk
index 51cee8e0..c4ae958f 100644
--- a/examples/lm3s8962/lm3s8962.mk
+++ b/examples/lm3s8962/lm3s8962.mk
@@ -57,13 +57,13 @@ lm3s8962_PREFIX = arm-none-eabi-
 
 lm3s8962_CPPAFLAGS = -mthumb -mno-thumb-interwork
 lm3s8962_CPPFLAGS = -D'ARCH=0' -D__ARM_LM3S8962__ -D'CPU_FREQ=(50000000L)' -D'WIZ_AUTOGEN' -mthumb -mno-thumb-interwork -Iexamples/lm3s8962 -Ibertos/cpu/cortex-m3 -fno-strict-aliasing -fwrapv
-lm3s8962_LDFLAGS = -nostartfiles -T bertos/cpu/cortex-m3/scripts/lm3s1968_rom.ld -Wl,--no-warn-mismatch -mthumb -mno-thumb-interwork
+lm3s8962_LDFLAGS = -nostartfiles -T bertos/cpu/cortex-m3/scripts/lm3s8962_rom.ld -Wl,--no-warn-mismatch -mthumb -mno-thumb-interwork
 
 lm3s8962_CPU = cortex-m3
 
 lm3s8962_PROGRAMMER_CPU = lm3s
 lm3s8962_PROGRAMMER_TYPE = lm3s
-lm3s8962_FLASH_SCRIPT = bertos/prg_scripts/arm/flash-cortex.sh
+lm3s8962_FLASH_SCRIPT = bertos/prg_scripts/arm/flash-lm3s.sh
 lm3s8962_STOPFLASH_SCRIPT = bertos/prg_scripts/arm/stopopenocd.sh
 lm3s8962_DEBUG_SCRIPT = bertos/prg_scripts/arm/debug.sh
 lm3s8962_STOPDEBUG_SCRIPT = bertos/prg_scripts/arm/stopopenocd.sh