From 86a906bed2d2011a63b11928ffd92e45f389077d Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 20 Oct 2007 19:10:06 +0000
Subject: reorganize subtargets, sort subtargets below top level targets

SVN-Revision: 9378
---
 target/linux/adm5120/Makefile            | 4 ++--
 target/linux/adm5120/router_be/target.mk | 2 +-
 target/linux/adm5120/router_le/target.mk | 2 +-
 target/linux/x86/Makefile                | 4 ++--
 target/linux/x86/generic/target.mk       | 2 +-
 target/linux/x86/mediacenter/target.mk   | 3 +--
 6 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'target')

diff --git a/target/linux/adm5120/Makefile b/target/linux/adm5120/Makefile
index ed9dce2c41..cb634e5218 100644
--- a/target/linux/adm5120/Makefile
+++ b/target/linux/adm5120/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 BOARD:=adm5120
+BOARDNAME:=Infineon ADM5120
 LINUX_VERSION:=2.6.23
 FEATURES:=squashfs jffs2 tgz broken
+SUBTARGETS:=router_le router_be
 
 include $(INCLUDE_DIR)/target.mk
 
 DEFAULT_PACKAGES += admswconfig
 
-$(eval $(call Target,router_be))
-$(eval $(call Target,router_le))
 $(eval $(call BuildTarget))
diff --git a/target/linux/adm5120/router_be/target.mk b/target/linux/adm5120/router_be/target.mk
index 0d9154cffd..c5f3a11480 100644
--- a/target/linux/adm5120/router_be/target.mk
+++ b/target/linux/adm5120/router_be/target.mk
@@ -1,6 +1,6 @@
 ARCH:=mips
 SUBTARGET:=router_be
-BOARDNAME:=ADM5120 Boards (Big Endian)
+BOARDNAME:=Big Endian
 
 define Target/Description
 	Build firmware images for Infineon/ADMTek ADM5120 based boards running in big-endian mode
diff --git a/target/linux/adm5120/router_le/target.mk b/target/linux/adm5120/router_le/target.mk
index 61da3336f9..cd8422d93b 100644
--- a/target/linux/adm5120/router_le/target.mk
+++ b/target/linux/adm5120/router_le/target.mk
@@ -1,6 +1,6 @@
 ARCH:=mipsel
 SUBTARGET:=router_le
-BOARDNAME:=ADM5120 Boards (Little Endian)
+BOARDNAME:=Little Endian
 
 define Target/Description
 	Build firmware images for Infineon/ADMtek ADM5120 based boards
diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile
index 452065c382..b0b6ca704b 100644
--- a/target/linux/x86/Makefile
+++ b/target/linux/x86/Makefile
@@ -10,15 +10,15 @@ ARCH=i386
 BOARD:=x86
 BOARDNAME:=x86
 FEATURES:=squashfs jffs2 ext2
+SUBTARGETS=generic mediacenter
 
 LINUX_VERSION:=2.6.23
 
 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += kmod-natsemi kmod-ne2k-pci
 
-$(eval $(call Target,generic))
-$(eval $(call Target,mediacenter))
 $(eval $(call BuildTarget))
+
 $(eval $(call $(if $(CONFIG_TARGET_ROOTFS_ISO),RequireCommand,Ignore),mkisofs, \
    	Please install mkisofs. \
 ))
diff --git a/target/linux/x86/generic/target.mk b/target/linux/x86/generic/target.mk
index 7cfde7d632..e7c75fe475 100644
--- a/target/linux/x86/generic/target.mk
+++ b/target/linux/x86/generic/target.mk
@@ -1,4 +1,4 @@
-SUBTARGET:=generic
+BOARDNAME:=Generic
 
 define Target/Description
 	Build firmware images for x86 based boards 
diff --git a/target/linux/x86/mediacenter/target.mk b/target/linux/x86/mediacenter/target.mk
index 4355a8c84e..f0b6ecbe18 100644
--- a/target/linux/x86/mediacenter/target.mk
+++ b/target/linux/x86/mediacenter/target.mk
@@ -1,6 +1,5 @@
 ARCH:=i686
-SUBTARGET:=Mediacenter
-BOARDNAME:=X86 (Mediacenter)
+BOARDNAME:=Mediacenter
 
 define Target/Description
 	Build firmware images for i686 based Mediacenters
-- 
cgit v1.2.3