AT91: distinct CPU definitions for AT91SAM7X and AT91SAM7S family

Add distinct definitions for AT91SAM7X and AT91SAM7S families to allow
the definition of modules that are supported by one architecture and not
the other (e.g., the ethernet module).

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

diff --git a/bertos/cpu/arm/info/AT91SAM7S128.cdef b/bertos/cpu/arm/info/AT91SAM7S128.cdef
index b825fa3f0d09c5419940bb799543be61e622a35f..67845577e4ebb9af41900929956c729ffb30576f 100644 (file)
--- a/bertos/cpu/arm/info/AT91SAM7S128.cdef
+++ b/bertos/cpu/arm/info/AT91SAM7S128.cdef
@@ -40,8 +40,8 @@
 #
 #
 
-# Import the common settings for the AT91SAM7 family.
-include("at91sam7.common")
+# Import the common settings for the AT91SAM7S family.
+include("at91sam7s.common")
 
 # Short description of the cpu.
 CPU_DESC += [ "128 Kbytes internal flash memory",

diff --git a/bertos/cpu/arm/info/AT91SAM7S256.cdef b/bertos/cpu/arm/info/AT91SAM7S256.cdef
index 3e7c3bd889e896350764041c45d6e9ac0f01c346..ff883de3bf23bbbd093702d1bbbfcfa9edecd9b1 100644 (file)
--- a/bertos/cpu/arm/info/AT91SAM7S256.cdef
+++ b/bertos/cpu/arm/info/AT91SAM7S256.cdef
@@ -40,8 +40,8 @@
 #
 #
 
-# Import the common settings for the AT91SAM7 family.
-include("at91sam7.common")
+# Import the common settings for the AT91SAM7S family.
+include("at91sam7s.common")
 
 # Short description of the cpu.
 CPU_DESC += [ "256 Kbytes internal flash memory",

diff --git a/bertos/cpu/arm/info/AT91SAM7S512.cdef b/bertos/cpu/arm/info/AT91SAM7S512.cdef
index 33ee75ecc24f2d18e0758543dc327fd94cc7a1bb..437bb35e2a46f87b4845d4d710795cbf2c028443 100644 (file)
--- a/bertos/cpu/arm/info/AT91SAM7S512.cdef
+++ b/bertos/cpu/arm/info/AT91SAM7S512.cdef
@@ -40,8 +40,8 @@
 #
 #
 
-# Import the common settings for the AT91SAM7 family.
-include("at91sam7.common")
+# Import the common settings for the AT91SAM7S family.
+include("at91sam7s.common")
 
 # Short description of the cpu.
 CPU_DESC += [ "512 Kbytes internal flash memory",

diff --git a/bertos/cpu/arm/info/AT91SAM7S64.cdef b/bertos/cpu/arm/info/AT91SAM7S64.cdef
index 1675dcb489b2cc1f49f378e673955a806a9b843b..843eba535f77eb732bbe36c9c9408737909261df 100644 (file)
--- a/bertos/cpu/arm/info/AT91SAM7S64.cdef
+++ b/bertos/cpu/arm/info/AT91SAM7S64.cdef
@@ -40,8 +40,8 @@
 #
 #
 
-# Import the common settings for the AT91SAM7 family.
-include("at91sam7.common")
+# Import the common settings for the AT91SAM7S family.
+include("at91sam7s.common")
 
 # Short description of the cpu.
 CPU_DESC += [ "64 Kbytes internal flash memory",

diff --git a/bertos/cpu/arm/info/AT91SAM7X128.cdef b/bertos/cpu/arm/info/AT91SAM7X128.cdef
index 3f7920e739708169f92762efbb39779311f22ed8..ae50787b3acdc5ba380238f1ced193521537700e 100644 (file)
--- a/bertos/cpu/arm/info/AT91SAM7X128.cdef
+++ b/bertos/cpu/arm/info/AT91SAM7X128.cdef
@@ -40,8 +40,8 @@
 #
 #
 
-# Import the common settings for the AT91SAM7 family.
-include("at91sam7.common")
+# Import the common settings for the AT91SAM7X family.
+include("at91sam7x.common")
 
 # Short description of the cpu.
 CPU_DESC += [ "128 Kbytes internal flash memory",

diff --git a/bertos/cpu/arm/info/AT91SAM7X256.cdef b/bertos/cpu/arm/info/AT91SAM7X256.cdef
index d52e940b2d8ef2888285f93a826483c6681c49dd..1f16ffabf455e181adc6eb5179bb2bd5dddcad09 100644 (file)
--- a/bertos/cpu/arm/info/AT91SAM7X256.cdef
+++ b/bertos/cpu/arm/info/AT91SAM7X256.cdef
@@ -40,8 +40,8 @@
 #
 #
 
-# Import the common settings for the AT91SAM7 family.
-include("at91sam7.common")
+# Import the common settings for the AT91SAM7X family.
+include("at91sam7x.common")
 
 # Short description of the cpu.
 CPU_DESC += [ "256 Kbytes internal flash memory",

diff --git a/bertos/cpu/arm/info/AT91SAM7X512.cdef b/bertos/cpu/arm/info/AT91SAM7X512.cdef
index 547b456a6d54f8f165f271516862f79a66496f0f..456eed69a2a38762ff4af404d02f43a7d3bc2f6b 100644 (file)
--- a/bertos/cpu/arm/info/AT91SAM7X512.cdef
+++ b/bertos/cpu/arm/info/AT91SAM7X512.cdef
@@ -40,8 +40,8 @@
 #
 #
 
-# Import the common settings for the AT91SAM7 family.
-include("at91sam7.common")
+# Import the common settings for the AT91SAM7X family.
+include("at91sam7x.common")
 
 # Short description of the cpu.
 CPU_DESC += [ "512 Kbytes internal flash memory",

diff --git a/bertos/cpu/arm/info/at91sam7s.common b/bertos/cpu/arm/info/at91sam7s.common
new file mode 100644 (file)
index 0000000..79b0584
--- /dev/null
+++ b/bertos/cpu/arm/info/at91sam7s.common
@@ -0,0 +1,47 @@
+#
+#-*- 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 2008 Develer S.r.l. (http://www.develer.com/)
+#
+# -->
+#
+# General CPU info denfinition for AT91SAM7X architecture.
+#
+# This file contain all info for the BeRTOS wizard.
+#
+# \author Daniele Basile <asterix@develer.com>
+#
+#
+
+# Import the common settings for the path.
+include("at91sam7.common")
+
+# Special CPU related tags.
+CPU_TAGS += ["at91sam7s"]

diff --git a/bertos/cpu/arm/info/at91sam7x.common b/bertos/cpu/arm/info/at91sam7x.common
new file mode 100644 (file)
index 0000000..132d3fe
--- /dev/null
+++ b/bertos/cpu/arm/info/at91sam7x.common
@@ -0,0 +1,47 @@
+#
+#-*- 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 2008 Develer S.r.l. (http://www.develer.com/)
+#
+# -->
+#
+# General CPU info denfinition for AT91SAM7X architecture.
+#
+# This file contain all info for the BeRTOS wizard.
+#
+# \author Daniele Basile <asterix@develer.com>
+#
+#
+
+# Import the common settings for the path.
+include("at91sam7.common")
+
+# Special CPU related tags.
+CPU_TAGS += ["at91sam7x"]

diff --git a/bertos/drv/eth.h b/bertos/drv/eth.h
index a5f0c2d5a713f53d2db1c7f60b09867dafdc2f1b..3caacb59c725f7ac0d65433a896976985e3ae7ca 100644 (file)
--- a/bertos/drv/eth.h
+++ b/bertos/drv/eth.h
@@ -36,7 +36,7 @@
  *
  * $WIZ$ module_name = "eth"
  * $WIZ$ module_configuration = "bertos/cfg/cfg_eth.h"
- * $WIZ$ module_supports = "at91"
+ * $WIZ$ module_supports = "at91sam7x"
  */
 
 #ifndef DRV_ETH_H