From 27b6bdaf73e1e61b8ab8760547b68929e7be8837 Mon Sep 17 00:00:00 2001
From: arighi <arighi@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Wed, 27 Oct 2010 09:43:26 +0000
Subject: [PATCH] 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
---
 bertos/cpu/arm/info/AT91SAM7S128.cdef |  4 +--
 bertos/cpu/arm/info/AT91SAM7S256.cdef |  4 +--
 bertos/cpu/arm/info/AT91SAM7S512.cdef |  4 +--
 bertos/cpu/arm/info/AT91SAM7S64.cdef  |  4 +--
 bertos/cpu/arm/info/AT91SAM7X128.cdef |  4 +--
 bertos/cpu/arm/info/AT91SAM7X256.cdef |  4 +--
 bertos/cpu/arm/info/AT91SAM7X512.cdef |  4 +--
 bertos/cpu/arm/info/at91sam7s.common  | 47 +++++++++++++++++++++++++++
 bertos/cpu/arm/info/at91sam7x.common  | 47 +++++++++++++++++++++++++++
 bertos/drv/eth.h                      |  2 +-
 10 files changed, 109 insertions(+), 15 deletions(-)
 create mode 100644 bertos/cpu/arm/info/at91sam7s.common
 create mode 100644 bertos/cpu/arm/info/at91sam7x.common

diff --git a/bertos/cpu/arm/info/AT91SAM7S128.cdef b/bertos/cpu/arm/info/AT91SAM7S128.cdef
index b825fa3f..67845577 100644
--- 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 3e7c3bd8..ff883de3 100644
--- 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 33ee75ec..437bb35e 100644
--- 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 1675dcb4..843eba53 100644
--- 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 3f7920e7..ae50787b 100644
--- 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 d52e940b..1f16ffab 100644
--- 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 547b456a..456eed69 100644
--- 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
index 00000000..79b0584e
--- /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
index 00000000..132d3fe0
--- /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 a5f0c2d5..3caacb59 100644
--- 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
-- 
2.25.1