From 701309ec11337125fa2a6e61739ffe4d1c43854e Mon Sep 17 00:00:00 2001 From: Claudio Mignanti Date: Fri, 20 Apr 2012 13:33:01 +0000 Subject: [PATCH] Reorganize the subtargets, group subtargets per cpu family Signed-off-by: Claudio Mignanti SVN-Revision: 31372 --- .../base-files/etc/config/network | 0 .../{flexibity => 9260}/base-files/etc/config/system | 0 .../base-files/etc/init.d/custom-user-startup | 0 target/linux/at91/{flexibity => 9260}/config-default | 0 .../profiles/000-flexibity-minimal.mk | 2 +- .../profiles/001-flexibity-xwrt.mk | 2 +- .../profiles/002-flexibity-luci.mk | 2 +- target/linux/at91/{flexibity => 9260}/target.mk | 9 +++++---- target/linux/at91/{tqma9263 => 9263}/config-default | 0 target/linux/at91/9263/target.mk | 11 +++++++++++ target/linux/at91/9g20/config-default | 7 +++++++ target/linux/at91/9g20/target.mk | 12 ++++++++++++ target/linux/at91/Makefile | 4 ++-- target/linux/at91/config-default | 1 + target/linux/at91/netus/config-default | 2 -- target/linux/at91/netus/target.mk | 10 ---------- target/linux/at91/tqma9263/target.mk | 10 ---------- 17 files changed, 41 insertions(+), 31 deletions(-) rename target/linux/at91/{flexibity => 9260}/base-files/etc/config/network (100%) rename target/linux/at91/{flexibity => 9260}/base-files/etc/config/system (100%) rename target/linux/at91/{flexibity => 9260}/base-files/etc/init.d/custom-user-startup (100%) rename target/linux/at91/{flexibity => 9260}/config-default (100%) rename target/linux/at91/{flexibity => 9260}/profiles/000-flexibity-minimal.mk (90%) rename target/linux/at91/{flexibity => 9260}/profiles/001-flexibity-xwrt.mk (97%) rename target/linux/at91/{flexibity => 9260}/profiles/002-flexibity-luci.mk (97%) rename target/linux/at91/{flexibity => 9260}/target.mk (52%) rename target/linux/at91/{tqma9263 => 9263}/config-default (100%) create mode 100644 target/linux/at91/9263/target.mk create mode 100644 target/linux/at91/9g20/config-default create mode 100644 target/linux/at91/9g20/target.mk delete mode 100644 target/linux/at91/netus/config-default delete mode 100644 target/linux/at91/netus/target.mk delete mode 100644 target/linux/at91/tqma9263/target.mk diff --git a/target/linux/at91/flexibity/base-files/etc/config/network b/target/linux/at91/9260/base-files/etc/config/network similarity index 100% rename from target/linux/at91/flexibity/base-files/etc/config/network rename to 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 similarity index 100% rename from target/linux/at91/flexibity/base-files/etc/config/system rename to 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 similarity index 100% rename from target/linux/at91/flexibity/base-files/etc/init.d/custom-user-startup rename to 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 similarity index 100% rename from target/linux/at91/flexibity/config-default rename to 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 similarity index 90% rename from target/linux/at91/flexibity/profiles/000-flexibity-minimal.mk rename to target/linux/at91/9260/profiles/000-flexibity-minimal.mk index 1727e808d89..f8e7a651430 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 similarity index 97% rename from target/linux/at91/flexibity/profiles/001-flexibity-xwrt.mk rename to target/linux/at91/9260/profiles/001-flexibity-xwrt.mk index 1a99ea2d447..5e2c95e80f8 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 similarity index 97% rename from target/linux/at91/flexibity/profiles/002-flexibity-luci.mk rename to target/linux/at91/9260/profiles/002-flexibity-luci.mk index ab9a964fb15..8904140f174 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 similarity index 52% rename from target/linux/at91/flexibity/target.mk rename to target/linux/at91/9260/target.mk index 113d2bfcacb..91a1d75043e 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 similarity index 100% rename from target/linux/at91/tqma9263/config-default rename to 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 00000000000..fba20877ee3 --- /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 00000000000..c2967762d12 --- /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 00000000000..626436e6a1c --- /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 f20b7e6071a..71b967c07d7 100644 --- a/target/linux/at91/Makefile +++ b/target/linux/at91/Makefile @@ -10,9 +10,9 @@ ARCH:=arm BOARD:=at91 MAINTAINER:=Claudio Mignanti 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 1ffbb76e6e2..fe793404779 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 a4287e73530..00000000000 --- 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 ec9b90aa5be..00000000000 --- 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 9ff25986773..00000000000 --- 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