17 files changed, 41 insertions, 31 deletions
diff --git a/target/linux/at91/flexibity/base-files/etc/config/network b/target/linux/at91/9260/base-files/etc/config/network
index 5800a0bffe..5800a0bffe 100644
--- a/target/linux/at91/flexibity/base-files/etc/config/network
+++ b/target/linux/at91/9260/base-files/etc/config/network
diff --git a/target/linux/at91/flexibity/base-files/etc/config/system b/target/linux/at91/9260/base-files/etc/config/system
index ba7e87c629..ba7e87c629 100644
--- a/target/linux/at91/flexibity/base-files/etc/config/system
+++ b/target/linux/at91/9260/base-files/etc/config/system
diff --git a/target/linux/at91/flexibity/base-files/etc/init.d/custom-user-startup b/target/linux/at91/9260/base-files/etc/init.d/custom-user-startup
index dc9f77c98f..dc9f77c98f 100644
--- a/target/linux/at91/flexibity/base-files/etc/init.d/custom-user-startup
+++ b/target/linux/at91/9260/base-files/etc/init.d/custom-user-startup
diff --git a/target/linux/at91/flexibity/config-default b/target/linux/at91/9260/config-default
index c194586803..c194586803 100644
--- a/target/linux/at91/flexibity/config-default
+++ b/target/linux/at91/9260/config-default
diff --git a/target/linux/at91/flexibity/profiles/000-flexibity-minimal.mk b/target/linux/at91/9260/profiles/000-flexibity-minimal.mk
index 1727e808d8..f8e7a65143 100644
--- a/target/linux/at91/flexibity/profiles/000-flexibity-minimal.mk
+++ b/target/linux/at91/9260/profiles/000-flexibity-minimal.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2008 OpenWrt.org
+# Copyright (C) 20011-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
diff --git a/target/linux/at91/flexibity/profiles/001-flexibity-xwrt.mk b/target/linux/at91/9260/profiles/001-flexibity-xwrt.mk
index 1a99ea2d44..5e2c95e80f 100644
--- a/target/linux/at91/flexibity/profiles/001-flexibity-xwrt.mk
+++ b/target/linux/at91/9260/profiles/001-flexibity-xwrt.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2008 OpenWrt.org
+# Copyright (C) 2011-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
diff --git a/target/linux/at91/flexibity/profiles/002-flexibity-luci.mk b/target/linux/at91/9260/profiles/002-flexibity-luci.mk
index ab9a964fb1..8904140f17 100644
--- a/target/linux/at91/flexibity/profiles/002-flexibity-luci.mk
+++ b/target/linux/at91/9260/profiles/002-flexibity-luci.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2008 OpenWrt.org
+# Copyright (C) 2011-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
diff --git a/target/linux/at91/flexibity/target.mk b/target/linux/at91/9260/target.mk
index 113d2bfcac..91a1d75043 100644
--- a/target/linux/at91/flexibity/target.mk
+++ b/target/linux/at91/9260/target.mk
@@ -1,15 +1,16 @@
 # 
 # Copyright (C) 2011 Flexibity
+# Copyright (C) 2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 
-SUBTARGET:=flexibity
-BOARDNAME:=Flexibity Connect (AT91)
-FEATURES:=ext2 tgz usb
+SUBTARGET:=9260
+BOARDNAME:=AT91SAM9260 Based board
 
 define Target/Description
-  Build fimware images for Flexibity Connect board.
+	Build images for AT91SAM9260 based board, supported board:
+		* Flexibity Connect
 endef
 
diff --git a/target/linux/at91/tqma9263/config-default b/target/linux/at91/9263/config-default
index 70ee3adc6d..70ee3adc6d 100644
--- a/target/linux/at91/tqma9263/config-default
+++ b/target/linux/at91/9263/config-default
diff --git a/target/linux/at91/9263/target.mk b/target/linux/at91/9263/target.mk
new file mode 100644
index 0000000000..fba20877ee
--- /dev/null
+++ b/target/linux/at91/9263/target.mk
@@ -0,0 +1,11 @@
+# 
+# Copyright (C) 2011-2012 OpenWrt.org
+#
+
+SUBTARGET:=9263
+BOARDNAME:=AT91SAM9263 Based board
+
+define Target/Description
+	Build images for AT91SAM9263 based board, supported board:
+		* TQ Components TQMa9263
+endef
diff --git a/target/linux/at91/9g20/config-default b/target/linux/at91/9g20/config-default
new file mode 100644
index 0000000000..c2967762d1
--- /dev/null
+++ b/target/linux/at91/9g20/config-default
@@ -0,0 +1,7 @@
+CONFIG_ARCH_AT91SAM9G20=y
+CONFIG_MACH_AT91SAM9G20EK=y
+# CONFIG_MACH_AT91SAM9G20EK_2MMC is not set
+CONFIG_MACH_ACMENETUSFOXG20=y
+CONFIG_MACH_STAMP9G20=y
+CONFIG_MACH_STAMP9G20_EVB=y
+# CONFIG_MTD_AT91_DATAFLASH_CARD is not set
diff --git a/target/linux/at91/9g20/target.mk b/target/linux/at91/9g20/target.mk
new file mode 100644
index 0000000000..626436e6a1
--- /dev/null
+++ b/target/linux/at91/9g20/target.mk
@@ -0,0 +1,12 @@
+# 
+# Copyright (C) 2006-2012 OpenWrt.org
+#
+
+SUBTARGET:=9g20
+BOARDNAME:=AT91SAM9g20 Based board
+
+define Target/Description
+	Build images for AT91SAM9g20 based board, supported board:
+		* Acmesystems NetusG20
+		* Taskit Stamp9G20 Evaluation Board
+endef
diff --git a/target/linux/at91/Makefile b/target/linux/at91/Makefile
index f20b7e6071..71b967c07d 100644
--- a/target/linux/at91/Makefile
+++ b/target/linux/at91/Makefile
@@ -10,9 +10,9 @@ ARCH:=arm
 BOARD:=at91
 MAINTAINER:=Claudio Mignanti <c.mignanti@gmail.com>
 BOARDNAME:=Atmel AT91
-FEATURES:=squashfs jffs2 targz
+FEATURES:=squashfs jffs2 targz ext2 usb
 CFLAGS:=-Os -pipe -march=armv5te -mtune=arm926ej-s -fno-caller-saves
-SUBTARGETS:=netus tqma9263 flexibity
+SUBTARGETS:=9g20 9260 9263
 
 LINUX_VERSION:=3.3.2
 DEVICE_TYPE=
diff --git a/target/linux/at91/config-default b/target/linux/at91/config-default
index 1ffbb76e6e..fe79340477 100644
--- a/target/linux/at91/config-default
+++ b/target/linux/at91/config-default
@@ -117,6 +117,7 @@ CONFIG_JBD2=y
 CONFIG_KTIME_SCALAR=y
 # CONFIG_LEDS is not set
 # CONFIG_LEDS_GPIO is not set
+# CONFIG_LEDS_ATMEL_PWM is not set
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 # CONFIG_MACB is not set
 # CONFIG_MACH_ACMENETUSFOXG20 is not set
diff --git a/target/linux/at91/netus/config-default b/target/linux/at91/netus/config-default
deleted file mode 100644
index a4287e7353..0000000000
--- a/target/linux/at91/netus/config-default
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_ARCH_AT91SAM9G20=y
-CONFIG_MACH_ACMENETUSFOXG20=y
diff --git a/target/linux/at91/netus/target.mk b/target/linux/at91/netus/target.mk
deleted file mode 100644
index ec9b90aa5b..0000000000
--- a/target/linux/at91/netus/target.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# 
-# Copyright (C) 2006-2011 OpenWrt.org
-#
-
-SUBTARGET:=netus
-BOARDNAME:=Acmesystems NetusG20 board
-
-define Target/Description
-	Build firmware images for Acmesystems NetusG20 board
-endef
diff --git a/target/linux/at91/tqma9263/target.mk b/target/linux/at91/tqma9263/target.mk
deleted file mode 100644
index 9ff2598677..0000000000
--- a/target/linux/at91/tqma9263/target.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# 
-# Copyright (C) 2011 OpenWrt.org
-#
-
-SUBTARGET:=tqma9263
-BOARDNAME:=TQ Components TQMa9263
-
-define Target/Description
-	Build firmware images for TQ Components TQMa9263 board.
-endef