summaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-09-08 19:55:42 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-09-08 19:55:42 +0000
commit6db7ad74f61eeaae0c8ecb08d483599d9d80c53f (patch)
tree30cacdb892969714d2a079f391ba6786b7c36489 /target
parentac8f9434660b88d0f9686bed3e0bfd5b0adf1788 (diff)
major target cleanup. it is now possible to have subtargets that can override many target settings, including arch - merge adm5120, adm5120eb. target profiles still need to be adapted for subtargets
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8694 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/Makefile2
-rw-r--r--target/linux/adm5120/Makefile21
-rw-r--r--target/linux/adm5120/router_be/config-2.6.22 (renamed from target/linux/adm5120eb/config/default)0
-rw-r--r--target/linux/adm5120/router_be/image/Makefile (renamed from target/linux/adm5120eb/image/Makefile)0
l---------target/linux/adm5120/router_be/image/lzma-loader (renamed from target/linux/adm5120eb/image/lzma-loader)0
-rw-r--r--target/linux/adm5120/router_be/profiles/090-Zyxel.mk (renamed from target/linux/adm5120eb/profiles/090-Zyxel.mk)0
-rw-r--r--target/linux/adm5120/router_be/profiles/100-Texas.mk (renamed from target/linux/adm5120eb/profiles/100-Texas.mk)0
-rw-r--r--target/linux/adm5120/router_be/profiles/110-Atheros.mk (renamed from target/linux/adm5120eb/profiles/110-Atheros.mk)0
-rw-r--r--target/linux/adm5120/router_be/profiles/110-None.mk (renamed from target/linux/adm5120eb/profiles/110-None.mk)0
-rw-r--r--target/linux/adm5120/router_be/target.mk9
-rwxr-xr-xtarget/linux/adm5120/router_le/base-files/default/sbin/wget2nand (renamed from target/linux/adm5120/base-files/default/sbin/wget2nand)0
-rw-r--r--target/linux/adm5120/router_le/config-2.6.22 (renamed from target/linux/adm5120/config/default)0
-rw-r--r--target/linux/adm5120/router_le/profiles/100-Atheros.mk (renamed from target/linux/adm5120/profiles/100-Atheros.mk)0
-rw-r--r--target/linux/adm5120/router_le/profiles/105-Texas.mk (renamed from target/linux/adm5120/profiles/105-Texas.mk)0
-rw-r--r--target/linux/adm5120/router_le/profiles/110-Ralink.mk (renamed from target/linux/adm5120/profiles/110-Ralink.mk)0
-rw-r--r--target/linux/adm5120/router_le/profiles/200-None.mk (renamed from target/linux/adm5120/profiles/200-None.mk)0
-rw-r--r--target/linux/adm5120/router_le/profiles/Cellvision.mk (renamed from target/linux/adm5120/profiles/Cellvision.mk)0
-rw-r--r--target/linux/adm5120/router_le/profiles/RB1xx.mk (renamed from target/linux/adm5120/profiles/RB1xx.mk)0
-rw-r--r--target/linux/adm5120/router_le/target.mk9
-rw-r--r--target/linux/adm5120eb/Makefile27
l---------target/linux/adm5120eb/files1
l---------target/linux/adm5120eb/patches-2.6.221
-rw-r--r--target/linux/amazon/Makefile7
-rw-r--r--target/linux/amazon/config-2.6.21 (renamed from target/linux/amazon/config/default)0
-rw-r--r--target/linux/amcc/Makefile6
-rw-r--r--target/linux/amcc/config-2.6.21 (renamed from target/linux/amcc/config/default)0
-rw-r--r--target/linux/ar7/Makefile6
-rw-r--r--target/linux/ar7/config-2.6.22 (renamed from target/linux/ar7/config/default)0
-rw-r--r--target/linux/at91/Makefile9
-rw-r--r--target/linux/at91/config-2.6.22 (renamed from target/linux/at91/config/default)0
-rw-r--r--target/linux/atheros/Makefile9
-rw-r--r--target/linux/atheros/config-2.6.22 (renamed from target/linux/atheros/config/default)0
-rw-r--r--target/linux/au1000/Makefile8
-rw-r--r--target/linux/au1000/config-2.6.22 (renamed from target/linux/au1000/config/default)0
-rw-r--r--target/linux/avr32/Makefile9
-rw-r--r--target/linux/brcm-2.4/Makefile13
-rw-r--r--target/linux/brcm-2.4/config-2.4.34 (renamed from target/linux/brcm-2.4/config/default)0
-rw-r--r--target/linux/brcm47xx/Makefile8
-rw-r--r--target/linux/brcm47xx/config-2.6.22 (renamed from target/linux/brcm47xx/config/default)0
-rw-r--r--target/linux/brcm63xx/Makefile7
-rw-r--r--target/linux/brcm63xx/config-2.6.22 (renamed from target/linux/brcm63xx/config/default)0
-rw-r--r--target/linux/etrax/Makefile15
-rw-r--r--target/linux/generic-2.4/config-default (renamed from target/linux/generic-2.4/config-template)0
-rw-r--r--target/linux/generic-2.6/config-default (renamed from target/linux/generic-2.6/config-template)0
-rw-r--r--target/linux/iop32x/Makefile7
-rw-r--r--target/linux/iop32x/config-2.6.21 (renamed from target/linux/iop32x/config/default)0
-rw-r--r--target/linux/ixp4xx/Makefile7
-rw-r--r--target/linux/ixp4xx/config-2.6.21 (renamed from target/linux/ixp4xx/config/default)0
-rw-r--r--target/linux/magicbox/Makefile4
-rw-r--r--target/linux/magicbox/config-2.6.22 (renamed from target/linux/magicbox/config/default)0
-rw-r--r--target/linux/pxa/Makefile6
-rw-r--r--target/linux/pxa/config-2.6.21 (renamed from target/linux/pxa/config/default)0
-rw-r--r--target/linux/rb532/Makefile4
-rw-r--r--target/linux/rb532/config-2.6.22 (renamed from target/linux/rb532/config/default)0
-rw-r--r--target/linux/rdc/Makefile10
-rw-r--r--target/linux/rdc/config-2.6.22 (renamed from target/linux/rdc/config/default)0
-rw-r--r--target/linux/rdc/config/profile-wl1532
-rw-r--r--target/linux/sibyte/Makefile4
-rw-r--r--target/linux/sibyte/config-2.6.21 (renamed from target/linux/sibyte/config/default)0
-rw-r--r--target/linux/uml/Makefile4
-rw-r--r--target/linux/x86/Makefile4
61 files changed, 96 insertions, 123 deletions
diff --git a/target/linux/Makefile b/target/linux/Makefile
index 1eb579e82..828825011 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -8,5 +8,5 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/target.mk
prereq clean download prepare compile install menuconfig oldconfig update refresh: FORCE
- $(MAKE) -C $(BOARD) $@
+ TARGET_BUILD=1 $(MAKE) -C $(BOARD) $@
diff --git a/target/linux/adm5120/Makefile b/target/linux/adm5120/Makefile
index f8436c04e..34c3b804a 100644
--- a/target/linux/adm5120/Makefile
+++ b/target/linux/adm5120/Makefile
@@ -1,27 +1,20 @@
#
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2007 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
+
include $(TOPDIR)/rules.mk
-ARCH:=mipsel
BOARD:=adm5120
-BOARDNAME:=ADM5120 (Little Endian)
-FEATURES:=squashfs jffs2 tgz broken
-
LINUX_VERSION:=2.6.22.4
+FEATURES:=squashfs jffs2 tgz broken
-define Target/Description
- Build firmware images for Infineon/ADMtek ADM5120 based boards
- (e.g : RouterBoard RB1xx, Compex WP54G-WRT ...)
-endef
+include $(INCLUDE_DIR)/target.mk
-include $(INCLUDE_DIR)/kernel-build.mk
DEFAULT_PACKAGES += admswconfig
-# include the profiles
--include profiles/*.mk
-
-$(eval $(call BuildKernel))
+$(eval $(call Target,router_be))
+$(eval $(call Target,router_le))
+$(eval $(call BuildTarget))
diff --git a/target/linux/adm5120eb/config/default b/target/linux/adm5120/router_be/config-2.6.22
index 96c2974e0..96c2974e0 100644
--- a/target/linux/adm5120eb/config/default
+++ b/target/linux/adm5120/router_be/config-2.6.22
diff --git a/target/linux/adm5120eb/image/Makefile b/target/linux/adm5120/router_be/image/Makefile
index f47b3ab0b..f47b3ab0b 100644
--- a/target/linux/adm5120eb/image/Makefile
+++ b/target/linux/adm5120/router_be/image/Makefile
diff --git a/target/linux/adm5120eb/image/lzma-loader b/target/linux/adm5120/router_be/image/lzma-loader
index f472e6b25..f472e6b25 120000
--- a/target/linux/adm5120eb/image/lzma-loader
+++ b/target/linux/adm5120/router_be/image/lzma-loader
diff --git a/target/linux/adm5120eb/profiles/090-Zyxel.mk b/target/linux/adm5120/router_be/profiles/090-Zyxel.mk
index b0741e84b..b0741e84b 100644
--- a/target/linux/adm5120eb/profiles/090-Zyxel.mk
+++ b/target/linux/adm5120/router_be/profiles/090-Zyxel.mk
diff --git a/target/linux/adm5120eb/profiles/100-Texas.mk b/target/linux/adm5120/router_be/profiles/100-Texas.mk
index 727a0c064..727a0c064 100644
--- a/target/linux/adm5120eb/profiles/100-Texas.mk
+++ b/target/linux/adm5120/router_be/profiles/100-Texas.mk
diff --git a/target/linux/adm5120eb/profiles/110-Atheros.mk b/target/linux/adm5120/router_be/profiles/110-Atheros.mk
index cc4a70449..cc4a70449 100644
--- a/target/linux/adm5120eb/profiles/110-Atheros.mk
+++ b/target/linux/adm5120/router_be/profiles/110-Atheros.mk
diff --git a/target/linux/adm5120eb/profiles/110-None.mk b/target/linux/adm5120/router_be/profiles/110-None.mk
index 2fcfacde9..2fcfacde9 100644
--- a/target/linux/adm5120eb/profiles/110-None.mk
+++ b/target/linux/adm5120/router_be/profiles/110-None.mk
diff --git a/target/linux/adm5120/router_be/target.mk b/target/linux/adm5120/router_be/target.mk
new file mode 100644
index 000000000..0d9154cff
--- /dev/null
+++ b/target/linux/adm5120/router_be/target.mk
@@ -0,0 +1,9 @@
+ARCH:=mips
+SUBTARGET:=router_be
+BOARDNAME:=ADM5120 Boards (Big Endian)
+
+define Target/Description
+ Build firmware images for Infineon/ADMTek ADM5120 based boards running in big-endian mode
+ (e.g : ZyXEL Prestige 335WT ...)
+endef
+
diff --git a/target/linux/adm5120/base-files/default/sbin/wget2nand b/target/linux/adm5120/router_le/base-files/default/sbin/wget2nand
index adb56b946..adb56b946 100755
--- a/target/linux/adm5120/base-files/default/sbin/wget2nand
+++ b/target/linux/adm5120/router_le/base-files/default/sbin/wget2nand
diff --git a/target/linux/adm5120/config/default b/target/linux/adm5120/router_le/config-2.6.22
index 593d98ce4..593d98ce4 100644
--- a/target/linux/adm5120/config/default
+++ b/target/linux/adm5120/router_le/config-2.6.22
diff --git a/target/linux/adm5120/profiles/100-Atheros.mk b/target/linux/adm5120/router_le/profiles/100-Atheros.mk
index 029586848..029586848 100644
--- a/target/linux/adm5120/profiles/100-Atheros.mk
+++ b/target/linux/adm5120/router_le/profiles/100-Atheros.mk
diff --git a/target/linux/adm5120/profiles/105-Texas.mk b/target/linux/adm5120/router_le/profiles/105-Texas.mk
index 727a0c064..727a0c064 100644
--- a/target/linux/adm5120/profiles/105-Texas.mk
+++ b/target/linux/adm5120/router_le/profiles/105-Texas.mk
diff --git a/target/linux/adm5120/profiles/110-Ralink.mk b/target/linux/adm5120/router_le/profiles/110-Ralink.mk
index d30ee7394..d30ee7394 100644
--- a/target/linux/adm5120/profiles/110-Ralink.mk
+++ b/target/linux/adm5120/router_le/profiles/110-Ralink.mk
diff --git a/target/linux/adm5120/profiles/200-None.mk b/target/linux/adm5120/router_le/profiles/200-None.mk
index 2fcfacde9..2fcfacde9 100644
--- a/target/linux/adm5120/profiles/200-None.mk
+++ b/target/linux/adm5120/router_le/profiles/200-None.mk
diff --git a/target/linux/adm5120/profiles/Cellvision.mk b/target/linux/adm5120/router_le/profiles/Cellvision.mk
index 6912f13e3..6912f13e3 100644
--- a/target/linux/adm5120/profiles/Cellvision.mk
+++ b/target/linux/adm5120/router_le/profiles/Cellvision.mk
diff --git a/target/linux/adm5120/profiles/RB1xx.mk b/target/linux/adm5120/router_le/profiles/RB1xx.mk
index 9dd3de097..9dd3de097 100644
--- a/target/linux/adm5120/profiles/RB1xx.mk
+++ b/target/linux/adm5120/router_le/profiles/RB1xx.mk
diff --git a/target/linux/adm5120/router_le/target.mk b/target/linux/adm5120/router_le/target.mk
new file mode 100644
index 000000000..61da3336f
--- /dev/null
+++ b/target/linux/adm5120/router_le/target.mk
@@ -0,0 +1,9 @@
+ARCH:=mipsel
+SUBTARGET:=router_le
+BOARDNAME:=ADM5120 Boards (Little Endian)
+
+define Target/Description
+ Build firmware images for Infineon/ADMtek ADM5120 based boards
+ (e.g : RouterBoard RB1xx, Compex WP54G-WRT ...)
+endef
+
diff --git a/target/linux/adm5120eb/Makefile b/target/linux/adm5120eb/Makefile
deleted file mode 100644
index 9205c8bf9..000000000
--- a/target/linux/adm5120eb/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-ARCH:=mips
-BOARD:=adm5120eb
-BOARDNAME:=ADM5120 (Big Endian)
-FEATURES:=squashfs pci usb broken
-
-LINUX_VERSION:=2.6.22.4
-
-define Target/Description
- Build firmware images for Infineon/ADMTek ADM5120 based boards running in big-endian mode
- (e.g : ZyXEL Prestige 335WT ...)
-endef
-
-include $(INCLUDE_DIR)/kernel-build.mk
-DEFAULT_PACKAGES += admswconfig
-
-# include the profiles
--include profiles/*.mk
-
-$(eval $(call BuildKernel))
diff --git a/target/linux/adm5120eb/files b/target/linux/adm5120eb/files
deleted file mode 120000
index aadc1cd38..000000000
--- a/target/linux/adm5120eb/files
+++ /dev/null
@@ -1 +0,0 @@
-../adm5120/files \ No newline at end of file
diff --git a/target/linux/adm5120eb/patches-2.6.22 b/target/linux/adm5120eb/patches-2.6.22
deleted file mode 120000
index 09e734222..000000000
--- a/target/linux/adm5120eb/patches-2.6.22
+++ /dev/null
@@ -1 +0,0 @@
-../adm5120/patches-2.6.22 \ No newline at end of file
diff --git a/target/linux/amazon/Makefile b/target/linux/amazon/Makefile
index 1967d52f4..17f9d9649 100644
--- a/target/linux/amazon/Makefile
+++ b/target/linux/amazon/Makefile
@@ -10,6 +10,9 @@ ARCH:=mips
BOARD:=amazon
BOARDNAME:=Infineon Amazon
FEATURES:=squashfs jffs2 broken
+LINUX_VERSION:=2.6.21.5
+
+include $(INCLUDE_DIR)/target.mk
define Target/Description
Build firmware images for Infineon Amazon boards
@@ -17,9 +20,7 @@ endef
KERNELNAME:="uImage"
-include $(INCLUDE_DIR)/kernel-build.mk
-
# include the profiles
-include profiles/*.mk
-$(eval $(call BuildKernel))
+$(eval $(call BuildTarget))
diff --git a/target/linux/amazon/config/default b/target/linux/amazon/config-2.6.21
index 2229e6317..2229e6317 100644
--- a/target/linux/amazon/config/default
+++ b/target/linux/amazon/config-2.6.21
diff --git a/target/linux/amcc/Makefile b/target/linux/amcc/Makefile
index 4dd366caa..a35783be4 100644
--- a/target/linux/amcc/Makefile
+++ b/target/linux/amcc/Makefile
@@ -13,13 +13,13 @@ FEATURES:=jffs2
LINUX_VERSION:=2.6.21.5
+include $(INCLUDE_DIR)/target.mk
+
define Target/Description
Build firmware images for the AMCC Taishan evaluation board
endef
-include $(INCLUDE_DIR)/kernel-build.mk
-
# include the profiles
-include profiles/*.mk
-$(eval $(call BuildKernel))
+$(eval $(call BuildTarget))
diff --git a/target/linux/amcc/config/default b/target/linux/amcc/config-2.6.21
index d0fccac52..d0fccac52 100644
--- a/target/linux/amcc/config/default
+++ b/target/linux/amcc/config-2.6.21
diff --git a/target/linux/ar7/Makefile b/target/linux/ar7/Makefile
index 0beb8ae75..772222ac7 100644
--- a/target/linux/ar7/Makefile
+++ b/target/linux/ar7/Makefile
@@ -13,12 +13,12 @@ FEATURES:=squashfs jffs2 atm
LINUX_VERSION:=2.6.22.4
+include $(INCLUDE_DIR)/target.mk
+
define Target/Description
Build firmware images for TI AR7 based routers
endef
-include $(INCLUDE_DIR)/kernel-build.mk
-
-include profiles/*.mk
-$(eval $(call BuildKernel))
+$(eval $(call BuildTarget))
diff --git a/target/linux/ar7/config/default b/target/linux/ar7/config-2.6.22
index 605140a99..605140a99 100644
--- a/target/linux/ar7/config/default
+++ b/target/linux/ar7/config-2.6.22
diff --git a/target/linux/at91/Makefile b/target/linux/at91/Makefile
index f8ca6f6be..7a9a1adcc 100644
--- a/target/linux/at91/Makefile
+++ b/target/linux/at91/Makefile
@@ -14,14 +14,15 @@ FEATURES:=squashfs usb
#LINUX_VERSION:=2.6.21.5
LINUX_VERSION:=2.6.22.4
+include $(INCLUDE_DIR)/target.mk
+
+KERNELNAME:="uImage"
+
define Target/Description
Build fimware images for Figment Design Labs VersaLink board.
endef
-include $(INCLUDE_DIR)/kernel-build.mk
-
#include the profiles
-include profiles/*.mk
-KERNELNAME:="uImage"
-$(eval $(call BuildKernel))
+$(eval $(call BuildTarget))
diff --git a/target/linux/at91/config/default b/target/linux/at91/config-2.6.22
index 5e74bd616..5e74bd616 100644
--- a/target/linux/at91/config/default
+++ b/target/linux/at91/config-2.6.22
diff --git a/target/linux/atheros/Makefile b/target/linux/atheros/Makefile
index 611345f4b..fc48efd5d 100644
--- a/target/linux/atheros/Makefile
+++ b/target/linux/atheros/Makefile
@@ -13,14 +13,15 @@ FEATURES:=squashfs jffs2
LINUX_VERSION:=2.6.22.4
+include $(INCLUDE_DIR)/target.mk
+
+DEFAULT_PACKAGES += kmod-madwifi
+
define Target/Description
Build firmware images for Atheros SoC boards
endef
-include $(INCLUDE_DIR)/kernel-build.mk
-DEFAULT_PACKAGES += kmod-madwifi
-
# include the profiles
-include profiles/*.mk
-$(eval $(call BuildKernel))
+$(eval $(call BuildTarget))
diff --git a/target/linux/atheros/config/default b/target/linux/atheros/config-2.6.22
index 497f149c4..497f149c4 100644
--- a/target/linux/atheros/config/default
+++ b/target/linux/atheros/config-2.6.22
diff --git a/target/linux/au1000/Makefile b/target/linux/au1000/Makefile
index d7b9f739a..f7dcb03ed 100644
--- a/target/linux/au1000/Makefile
+++ b/target/linux/au1000/Makefile
@@ -13,14 +13,14 @@ FEATURES:=jffs2 usb pci
LINUX_VERSION:=2.6.22.4
+include $(INCLUDE_DIR)/target.mk
+DEFAULT_PACKAGES += yamonenv
+
define Target/Description
Build firmware for AMD Alchemy 1500 boards
(e.g. 4G-Systems Mesh/Access Cube ...)
endef
-include $(INCLUDE_DIR)/kernel-build.mk
-DEFAULT_PACKAGES += yamonenv
-
define Kernel/BuildImage
$(call Kernel/BuildImage/Default)
$(CP) $(LINUX_DIR)/arch/mips/boot/compressed/images/zImage.flash.srec $(LINUX_DIR)/zImage.flash.srec
@@ -30,5 +30,5 @@ endef
# include the profiles
-include profiles/*.mk
-$(eval $(call BuildKernel))
+$(eval $(call BuildTarget))
diff --git a/target/linux/au1000/config/default b/target/linux/au1000/config-2.6.22
index e19792809..e19792809 100644
--- a/target/linux/au1000/config/default
+++ b/target/linux/au1000/config-2.6.22
diff --git a/target/linux/avr32/Makefile b/target/linux/avr32/Makefile
index 4ab853476..01d5838fe 100644
--- a/target/linux/avr32/Makefile
+++ b/target/linux/avr32/Makefile
@@ -10,18 +10,15 @@ ARCH:=avr32
BOARD:=avr32
BOARDNAME:=Atmel AVR32
FEATURES:=squashfs
-
LINUX_VERSION:=2.6.22.4
+include $(INCLUDE_DIR)/target.mk
+
define Target/Description
Build firmware images for ATNGW100 board
endef
-KERNEL:=2.6
-
-include $(INCLUDE_DIR)/kernel-build.mk
-
#include the profiles
-include profiles/*.mk
-$(eval $(call BuildKernel))
+$(eval $(call BuildTarget))
diff --git a/target/linux/brcm-2.4/Makefile b/target/linux/brcm-2.4/Makefile
index ed7336dae..da5cf6404 100644
--- a/target/linux/brcm-2.4/Makefile
+++ b/target/linux/brcm-2.4/Makefile
@@ -11,17 +11,18 @@ BOARD:=brcm-2.4
BOARDNAME:=Broadcom BCM947xx/953xx
FEATURES:=squashfs
+KERNEL:=2.4
+
+include $(INCLUDE_DIR)/target.mk
+
+DEFAULT_PACKAGES += kmod-switch kmod-diag nvram
+
define Target/Description
Build firmware images for Broadcom based routers
(e.g. Linksys WRT54G(S), Asus WL-500g, Motorola WR850G)
endef
-KERNEL:=2.4
-
-include $(INCLUDE_DIR)/kernel-build.mk
-DEFAULT_PACKAGES += kmod-switch kmod-diag nvram
-
# include the profiles
-include profiles/*.mk
-$(eval $(call BuildKernel))
+$(eval $(call BuildTarget))
diff --git a/target/linux/brcm-2.4/config/default b/target/linux/brcm-2.4/config-2.4.34
index 72f6f8698..72f6f8698 100644
--- a/target/linux/brcm-2.4/config/default
+++ b/target/linux/brcm-2.4/config-2.4.34
diff --git a/target/linux/brcm47xx/Makefile b/target/linux/brcm47xx/Makefile
index 11485fe05..5804ee976 100644
--- a/target/linux/brcm47xx/Makefile
+++ b/target/linux/brcm47xx/Makefile
@@ -13,15 +13,15 @@ FEATURES:=squashfs usb
LINUX_VERSION:=2.6.22.4
+include $(INCLUDE_DIR)/target.mk
+DEFAULT_PACKAGES += kmod-switch kmod-diag
+
define Target/Description
Build firmware images for Broadcom based routers
(e.g. Netgear WGT634U)
endef
-include $(INCLUDE_DIR)/kernel-build.mk
-DEFAULT_PACKAGES += kmod-switch kmod-diag
-
# include the profiles
-include profiles/*.mk
-$(eval $(call BuildKernel))
+$(eval $(call BuildTarget))
diff --git a/target/linux/brcm47xx/config/default b/target/linux/brcm47xx/config-2.6.22
index 8e88aab92..8e88aab92 100644
--- a/target/linux/brcm47xx/config/default
+++ b/target/linux/brcm47xx/config-2.6.22
diff --git a/target/linux/brcm63xx/Makefile b/target/linux/brcm63xx/Makefile
index 32bfd06fe..93670c6ee 100644
--- a/target/linux/brcm63xx/Makefile
+++ b/target/linux/brcm63xx/Makefile
@@ -10,17 +10,16 @@ ARCH:=mips
BOARD:=brcm63xx
BOARDNAME:=Broadcom BCM963xx
FEATURES:=squashfs jffs2 broken usb atm
-
LINUX_VERSION:=2.6.22.4
+include $(INCLUDE_DIR)/target.mk
+
define Target/Description
Build firmware images for Broadcom based xDSL/routers
(e.g. Inventel Livebox, Siemens SE515)
endef
-include $(INCLUDE_DIR)/kernel-build.mk
-
# include the profiles
-include profiles/*.mk
-$(eval $(call BuildKernel))
+$(eval $(call BuildTarget))
diff --git a/target/linux/brcm63xx/config/default b/target/linux/brcm63xx/config-2.6.22
index abef335ed..abef335ed 100644
--- a/target/linux/brcm63xx/config/default
+++ b/target/linux/brcm63xx/config-2.6.22
diff --git a/target/linux/etrax/Makefile b/target/linux/etrax/Makefile
index 7c9b76fa6..c83755006 100644
--- a/target/linux/etrax/Makefile
+++ b/target/linux/etrax/Makefile
@@ -12,7 +12,10 @@ BOARDNAME:=Foxboard (ETRAX 100LX)
FEATURES:=squashfs jffs2
LINUX_VERSION:=2.6.19.2
-include $(INCLUDE_DIR)/kernel-build.mk
+include $(INCLUDE_DIR)/target.mk
+
+KERNELNAME:="zImage"
+DEFAULT_PACKAGES += foxboard-utils
define Target/Description
Build fimware images for the FOXBOARD made by acmesystems.it
@@ -31,14 +34,10 @@ define Kernel/Prepare
$(call Kernel/Prepare/Fox)
endef
-DEFAULT_PACKAGES += foxboard-utils
+#include the profiles
+-include profiles/*.mk
+$(eval $(call BuildTarget))
$(eval $(call RequireCommand,/usr/local/cris/gcc-cris, \
Please install the binary cris toolchain. \
))
-
-#include the profiles
--include profiles/*.mk
-
-KERNELNAME:="zImage"
-$(eval $(call BuildKernel))
diff --git a/target/linux/generic-2.4/config-template b/target/linux/generic-2.4/config-default
index 9f33ef427..9f33ef427 100644
--- a/target/linux/generic-2.4/config-template
+++ b/target/linux/generic-2.4/config-default
diff --git a/target/linux/generic-2.6/config-template b/target/linux/generic-2.6/config-default
index 28ff32b43..28ff32b43 100644
--- a/target/linux/generic-2.6/config-template
+++ b/target/linux/generic-2.6/config-default
diff --git a/target/linux/iop32x/Makefile b/target/linux/iop32x/Makefile
index 529a7e048..c097955f3 100644
--- a/target/linux/iop32x/Makefile
+++ b/target/linux/iop32x/Makefile
@@ -13,12 +13,9 @@ FEATURES:=squashfs jffs2
LINUX_VERSION:=2.6.21.5
-define Target/Description
-endef
-
-include $(INCLUDE_DIR)/kernel-build.mk
+include $(INCLUDE_DIR)/target.mk
# include the profiles
-include profiles/*.mk
-$(eval $(call BuildKernel))
+$(eval $(call BuildTarget))
diff --git a/target/linux/iop32x/config/default b/target/linux/iop32x/config-2.6.21
index c13255920..c13255920 100644
--- a/target/linux/iop32x/config/default
+++ b/target/linux/iop32x/config-2.6.21
diff --git a/target/linux/ixp4xx/Makefile b/target/linux/ixp4xx/Makefile
index 25b60a47b..f68f62bc7 100644
--- a/target/linux/ixp4xx/Makefile
+++ b/target/linux/ixp4xx/Makefile
@@ -13,12 +13,9 @@ FEATURES:=squashfs
LINUX_VERSION:=2.6.21.6
-define Target/Description
-endef
-
-include $(INCLUDE_DIR)/kernel-build.mk
+include $(INCLUDE_DIR)/target.mk
# include the profiles
-include profiles/*.mk
-$(eval $(call BuildKernel))
+$(eval $(call BuildTarget))
diff --git a/target/linux/ixp4xx/config/default b/target/linux/ixp4xx/config-2.6.21
index 81c138367..81c138367 100644
--- a/target/linux/ixp4xx/config/default
+++ b/target/linux/ixp4xx/config-2.6.21
diff --git a/target/linux/magicbox/Makefile b/target/linux/magicbox/Makefile
index e003330f0..a20158b52 100644
--- a/target/linux/magicbox/Makefile
+++ b/target/linux/magicbox/Makefile
@@ -13,9 +13,9 @@ FEATURES:=squashfs jffs2
LINUX_VERSION:=2.6.22.4
-include $(INCLUDE_DIR)/kernel-build.mk
+include $(INCLUDE_DIR)/target.mk
# include the profiles
-include profiles/*.mk
-$(eval $(call BuildKernel))
+$(eval $(call BuildTarget))
diff --git a/target/linux/magicbox/config/default b/target/linux/magicbox/config-2.6.22
index 3e36514e9..3e36514e9 100644
--- a/target/linux/magicbox/config/default
+++ b/target/linux/magicbox/config-2.6.22
diff --git a/target/linux/pxa/Makefile b/target/linux/pxa/Makefile
index 3e0e6cd3b..ad44af27e 100644
--- a/target/linux/pxa/Makefile
+++ b/target/linux/pxa/Makefile
@@ -13,13 +13,13 @@ FEATURES:=jffs2 broken
LINUX_VERSION:=2.6.21.5
+include $(INCLUDE_DIR)/target.mk
+
define Target/Description
Stub for boards based on intel PXA
endef
-include $(INCLUDE_DIR)/kernel-build.mk
-
# include the profiles
-include profiles/*.mk
-$(eval $(call BuildKernel))
+$(eval $(call BuildTarget))
diff --git a/target/linux/pxa/config/default b/target/linux/pxa/config-2.6.21
index e288e4273..e288e4273 100644
--- a/target/linux/pxa/config/default
+++ b/target/linux/pxa/config-2.6.21
diff --git a/target/linux/rb532/Makefile b/target/linux/rb532/Makefile
index ee2360187..608f0aca1 100644
--- a/target/linux/rb532/Makefile
+++ b/target/linux/rb532/Makefile
@@ -13,9 +13,9 @@ FEATURES:=jffs2 pci tgz
LINUX_VERSION:=2.6.22.4
-include $(INCLUDE_DIR)/kernel-build.mk
+include $(INCLUDE_DIR)/target.mk
# include the profiles
-include profiles/*.mk
-$(eval $(call BuildKernel))
+$(eval $(call BuildTarget))
diff --git a/target/linux/rb532/config/default b/target/linux/rb532/config-2.6.22
index 24678f1e9..24678f1e9 100644
--- a/target/linux/rb532/config/default
+++ b/target/linux/rb532/config-2.6.22
diff --git a/target/linux/rdc/Makefile b/target/linux/rdc/Makefile
index 5af5e85c6..ac49adeb9 100644
--- a/target/linux/rdc/Makefile
+++ b/target/linux/rdc/Makefile
@@ -13,15 +13,15 @@ FEATURES:=squashfs jffs2 broken
LINUX_VERSION:=2.6.22.4
+include $(INCLUDE_DIR)/target.mk
+
define Target/Description
Build firmware images for RDC321x based routers
(e.g. Airlink101 AR525W, Linksys WRT54R, Sitecom WL-153)
endef
-include $(INCLUDE_DIR)/kernel-build.mk
-
ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
- define Kernel/SetInitramfs
+ define Kernel/SetInitramfs
echo "r6040 parent=wlan0" > $(TARGET_DIR)/etc/modules.d/99-r6040
$(RM) $(TARGET_DIR)/sbin/init
ln -s /etc/preinit $(TARGET_DIR)/sbin/init
@@ -29,10 +29,10 @@ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
sed -i 's,/sbin/init,/bin/busybox init,g' $(TARGET_DIR)/init
mv $(TARGET_DIR)/init $(TARGET_DIR)/linuxrc
sed -i 's,eth0,eth1,g' $(TARGET_DIR)/etc/config/network
- endef
+ endef
endif
# include the profiles
-include profiles/*.mk
-$(eval $(call BuildKernel))
+$(eval $(call BuildTarget))
diff --git a/target/linux/rdc/config/default b/target/linux/rdc/config-2.6.22
index 381a961e9..381a961e9 100644
--- a/target/linux/rdc/config/default
+++ b/target/linux/rdc/config-2.6.22
diff --git a/target/linux/rdc/config/profile-wl153 b/target/linux/rdc/config/profile-wl153
deleted file mode 100644
index 3ab59a881..000000000
--- a/target/linux/rdc/config/profile-wl153
+++ /dev/null
@@ -1,2 +0,0 @@
-# CONFIG_MTD_RDC3210_ALLOW_JFFS2 is not set
-CONFIG_MTD_RDC3210_SIZE=0x200000
diff --git a/target/linux/sibyte/Makefile b/target/linux/sibyte/Makefile
index 35cdb37f2..aa8acea1c 100644
--- a/target/linux/sibyte/Makefile
+++ b/target/linux/sibyte/Makefile
@@ -13,9 +13,9 @@ FEATURES:=broken
LINUX_VERSION:=2.6.21.5
-include $(INCLUDE_DIR)/kernel-build.mk
+include $(INCLUDE_DIR)/target.mk
# include the profiles
-include profiles/*.mk
-$(eval $(call BuildKernel))
+$(eval $(call BuildTarget))
diff --git a/target/linux/sibyte/config/default b/target/linux/sibyte/config-2.6.21
index bf33d13ac..bf33d13ac 100644
--- a/target/linux/sibyte/config/default
+++ b/target/linux/sibyte/config-2.6.21
diff --git a/target/linux/uml/Makefile b/target/linux/uml/Makefile
index a6be082d0..e31ef02bb 100644
--- a/target/linux/uml/Makefile
+++ b/target/linux/uml/Makefile
@@ -25,11 +25,11 @@ LINUX_CONFIG:=$(CURDIR)/config/$(ARCH)
LINUX_VERSION:=2.6.22.4
-include $(INCLUDE_DIR)/kernel-build.mk
+include $(INCLUDE_DIR)/target.mk
# include the profiles
-include profiles/*.mk
endif
-$(eval $(call BuildKernel))
+$(eval $(call BuildTarget))
diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile
index 705cc84ad..771fd191f 100644
--- a/target/linux/x86/Makefile
+++ b/target/linux/x86/Makefile
@@ -13,11 +13,11 @@ FEATURES:=squashfs jffs2 ext2
LINUX_VERSION:=2.6.22.4
-include $(INCLUDE_DIR)/kernel-build.mk
+include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += kmod-natsemi kmod-ne2k-pci
# include the profiles
-include profiles/*.mk
-$(eval $(call BuildKernel))
+$(eval $(call BuildTarget))