CM3: add support for the LM3S8962 evaluation board.

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

diff --git a/bertos/cpu/attr.h b/bertos/cpu/attr.h
index a02600f37f30cdee8878d52563eb4657d7767c10..5ed8bfca38c726c8f21271f82e8bf68dcc968dd7 100644 (file)
--- a/bertos/cpu/attr.h
+++ b/bertos/cpu/attr.h
@@ -171,7 +171,7 @@
        #define CPU_HARVARD            0
 
        /// Valid pointers should be >= than this value (used for debug)
        #define CPU_HARVARD            0
 
        /// Valid pointers should be >= than this value (used for debug)

-       #if CPU_CM3_LM3S1968
+       #if (CPU_CM3_LM3S1968 || CPU_CM3_LM3S8962)

                #define CPU_RAM_START 0x20000000
        #else
                #warning Fix CPU_RAM_START address for your Cortex-M3, default value set to 0x200
                #define CPU_RAM_START 0x20000000
        #else
                #warning Fix CPU_RAM_START address for your Cortex-M3, default value set to 0x200

diff --git a/bertos/cpu/cortex-m3/info/LM3S8962.cdef b/bertos/cpu/cortex-m3/info/LM3S8962.cdef
new file mode 100644 (file)
index 0000000..f67e7c2
--- /dev/null
+++ b/bertos/cpu/cortex-m3/info/LM3S8962.cdef
@@ -0,0 +1,64 @@
+#
+#-*- coding: utf-8 -*-
+#
+# \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/)
+#
+# -->
+#
+# General CPU info denfinition for Cortex-M3-based LM3S8962 board.
+#
+# This file contain all info for the BeRTOS wizard.
+#
+# \author Andrea Righi <arighi@develer.com>
+#
+#
+
+# Import the common settings for the path.
+include("cm3.common")
+
+# CPU type used for flashing/debugging
+MK_PROGRAMMER_CPU = "lm3s1968"
+
+# CPU default clock frequency
+CPU_DEFAULT_FREQ = "50000000UL"
+
+# Special CPU related tags.
+CPU_TAGS += ["lm3s"]
+
+# Additional hw drivers.
+MK_CPU_CSRC += DRV_DIR + "gpio_lm3s.c " + DRV_DIR + "clock_lm3s.c "
+
+# Short description of the cpu.
+CPU_DESC += [ "256 Kbytes on-chip flash memory",
+               "64 Kbytes on-chip SRAM memory" ]
+
+# GCC flags for this cpu.
+MK_CPU_CPPFLAGS += " -D__ARM_LM3S8962__"
+MK_CPU_LDFLAGS += " -T " + SCRIPT_DIR + "lm3s1968_rom.ld"

diff --git a/bertos/cpu/cortex-m3/io/lm3s.h b/bertos/cpu/cortex-m3/io/lm3s.h
index 012f0b116266801db98acab8e735c7e48da1ede1..d924d4427d2a58976c97270257a0b3b49dffa45d 100644 (file)
--- a/bertos/cpu/cortex-m3/io/lm3s.h
+++ b/bertos/cpu/cortex-m3/io/lm3s.h
@@ -39,7 +39,7 @@
 #include <cpu/detect.h>
 #include <cfg/compiler.h>
 
 #include <cpu/detect.h>
 #include <cfg/compiler.h>
 

-#if CPU_CM3_LM3S1968
+#if (CPU_CM3_LM3S1968 ||  CPU_CM3_LM3S8962)

        #include "lm3s1968.h"
        #include "lm3s_types.h"
        #include "lm3s_ints.h"
        #include "lm3s1968.h"
        #include "lm3s_types.h"
        #include "lm3s_ints.h"

diff --git a/bertos/cpu/detect.h b/bertos/cpu/detect.h
index d421f85e7c156364c9cce86ed3799f40d33d8255..fe940cb07082149429c2f6a20190aaf3df4f6a53 100644 (file)
--- a/bertos/cpu/detect.h
+++ b/bertos/cpu/detect.h
@@ -185,8 +185,15 @@
                #define CPU_CM3_LM3S1968    0
        #endif
 
                #define CPU_CM3_LM3S1968    0
        #endif
 

+       #if defined (__ARM_LM3S8962__)
+               #define CPU_CM3_LM3S        1
+               #define CPU_CM3_LM3S8962    1
+       #else
+               #define CPU_CM3_LM3S8962    0
+       #endif
+

        #if defined (CPU_CM3_LM3S)
        #if defined (CPU_CM3_LM3S)

-               #if CPU_CM3_LM3S1968 + 0 != 1
+               #if CPU_CM3_LM3S1968 + CPU_CM3_LM3S8962 + 0 != 1

                        #error Luminary Cortex-M3 CPU configuration error
                #endif
        /* #elif Add other Cortex-M3 families here */
                        #error Luminary Cortex-M3 CPU configuration error
                #endif
        /* #elif Add other Cortex-M3 families here */


@@ -205,6 +212,8 @@
        #define CPU_CM3_LM3S 0
 
        #define CPU_CM3_LM3S1968 0
        #define CPU_CM3_LM3S 0
 
        #define CPU_CM3_LM3S1968 0

+
+       #define CPU_CM3_LM3S8968 0

 #endif
 
 #if (defined(__IAR_SYSTEMS_ICC__) || defined(__IAR_SYSTEMS_ICC)) \
 #endif
 
 #if (defined(__IAR_SYSTEMS_ICC__) || defined(__IAR_SYSTEMS_ICC)) \