target/linux/orion: create subtargets (closes #8154)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23883 3c298f89-4303-0410-b956-a3cf2f4a3e73

8 files changed, 173 insertions, 120 deletions

diff --git a/target/linux/orion/Makefile b/target/linux/orion/Makefile
index e12866eba..4e6a37831 100644
--- a/target/linux/orion/Makefile
+++ b/target/linux/orion/Makefile
@@ -9,8 +9,7 @@ include $(TOPDIR)/rules.mk
 ARCH:=arm
 BOARD:=orion
 BOARDNAME:=Marvell Orion
-FEATURES:=squashfs
-SUBTARGETS=generic harddisk
+SUBTARGETS:=generic harddisk
 CFLAGS=-Os -pipe -march=armv5t -mtune=xscale -funit-at-a-time
 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
 
@@ -20,6 +19,6 @@ include $(INCLUDE_DIR)/target.mk
 
 KERNELNAME:="uImage"
 
-DEFAULT_PACKAGES += kmod-ath9k wpad-mini
+DEFAULT_PACKAGES += kmod-crypto-mv-cesa
 
 $(eval $(call BuildTarget))
diff --git a/target/linux/orion/base-files/etc/uci-defaults/hardware b/target/linux/orion/generic/base-files/etc/uci-defaults/hardware
index 7f727eb59..7f727eb59 100644
--- a/target/linux/orion/base-files/etc/uci-defaults/hardware
+++ b/target/linux/orion/generic/base-files/etc/uci-defaults/hardware
diff --git a/target/linux/orion/base-files/lib/upgrade/platform.sh b/target/linux/orion/generic/base-files/lib/upgrade/platform.sh
index fdd26c517..fdd26c517 100644
--- a/target/linux/orion/base-files/lib/upgrade/platform.sh
+++ b/target/linux/orion/generic/base-files/lib/upgrade/platform.sh
diff --git a/target/linux/orion/generic/target.mk b/target/linux/orion/generic/target.mk
index 0bc0fc93d..02c5a646a 100644
--- a/target/linux/orion/generic/target.mk
+++ b/target/linux/orion/generic/target.mk
@@ -1,6 +1,16 @@
+#
+# Copyright (C) 2008-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
 BOARDNAME:=Generic
+FEATURES:=squashfs jffs2
+
+DEFAULT_PACKAGES += kmod-ath9k wpad-mini
 
 define Target/Description
-	Build firmware images for orion based boards that boot from internal flash
+	Build firmware images for Marvell Orion based boards that boot from internal flash.
+	(e.g.: Linksys WRT350N v2, Netgear WNR854T, ...)
 endef
-
diff --git a/target/linux/orion/harddisk/target.mk b/target/linux/orion/harddisk/target.mk
index 67a587e33..f5208bd41 100644
--- a/target/linux/orion/harddisk/target.mk
+++ b/target/linux/orion/harddisk/target.mk
@@ -1,6 +1,16 @@
+#
+# Copyright (C) 2008-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
 BOARDNAME:=Internal Hard-Disk
+FEATURES:=targz
+
+DEFAULT_PACKAGES += kmod-ath9k wpad-mini
 
 define Target/Description
-	Build firmware images for orion based boards that boot directly from internal disk storage
-	(e.g : Freecom DataTank 2, ...)
+	Build firmware images for Marvell Orion based boards that boot directly from internal disk storage.
+	(e.g.: Freecom DataTank 2, ...)
 endef
diff --git a/target/linux/orion/image/Makefile b/target/linux/orion/image/Makefile
index 16ae4392f..058519f72 100644
--- a/target/linux/orion/image/Makefile
+++ b/target/linux/orion/image/Makefile
@@ -7,118 +7,6 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
-define Image/Prepare
-	cp $(LINUX_DIR)/arch/arm/boot/uImage $(KDIR)/uImage
-endef
-
-define Image/BuildKernel
-	# Orion Kernel uImages
- # WRT350N v2: mach id 1633 (0x661)
-	echo -en "\x06\x1c\xa0\xe3\x61\x10\x81\xe3" > $(KDIR)/wrt350nv2-zImage
-	cat $(LINUX_DIR)/arch/arm/boot/zImage >> $(KDIR)/wrt350nv2-zImage
-	$(STAGING_DIR_HOST)/bin/mkimage -A arm -O linux -T kernel \
-	-C none -a 0x00008000 -e 0x00008000 -n 'Linux-$(LINUX_VERSION)' \
-	-d $(KDIR)/wrt350nv2-zImage $(KDIR)/wrt350nv2-uImage
-	cp $(KDIR)/wrt350nv2-uImage $(BIN_DIR)/openwrt-wrt350nv2-uImage
- # WNR854T: mach id 1801 (0x709)
-	echo -en "\x07\x1c\xa0\xe3\x09\x10\x81\xe3" > $(KDIR)/wnr854t-zImage
-	cat $(LINUX_DIR)/arch/arm/boot/zImage >> $(KDIR)/wnr854t-zImage
-	$(STAGING_DIR_HOST)/bin/mkimage -A arm -O linux -T kernel \
-	-C none -a 0x00008000 -e 0x00008000 -n 'Linux-$(LINUX_VERSION)' \
-	-d $(KDIR)/wnr854t-zImage $(KDIR)/wnr854t-uImage
-	cp $(KDIR)/wnr854t-uImage $(BIN_DIR)/openwrt-wnr854t-uImage
- # DT2: mach id 1514 (0x5EA)
-	echo -en "\x05\x1c\xa0\xe3\xea\x10\x81\xe3" > $(KDIR)/dt2-zImage
-	cat $(LINUX_DIR)/arch/arm/boot/zImage >> $(KDIR)/dt2-zImage
-	$(STAGING_DIR_HOST)/bin/mkimage -A arm -O linux -T kernel \
-	-C none -a 0x00008000 -e 0x00008000 -n 'Linux-$(LINUX_VERSION)' \
-	-d $(KDIR)/dt2-zImage $(KDIR)/dt2-uImage
-	cp $(KDIR)/dt2-uImage $(BIN_DIR)/openwrt-dt2-uImage
-endef
-
-define Image/Build/Netgear
-	# Orion Netgear Images
-	mkdir $(KDIR)/netgear_image
-	cp $(KDIR)/wnr854t-uImage $(KDIR)/netgear_image/uImage
-	$(STAGING_DIR_HOST)/bin/mkfs.jffs2 -m none -p -l -q -e 128KiB -o $(KDIR)/wnr854t-uImage.jffs2 -d $(KDIR)/netgear_image
-	rm -rf $(KDIR)/netgear_image
-	( \
-		dd if=$(KDIR)/wnr854t-uImage.jffs2 bs=1024k conv=sync; \
-		dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \
-	) > $(BIN_DIR)/openwrt-$(2)-$(1).img
-	$(STAGING_DIR_HOST)/bin/add_header $(3) $(BIN_DIR)/openwrt-$(2)-$(1).img $(BIN_DIR)/openwrt-$(2)-$(1)-webupgrade.img
-endef
-
-define Image/Build/Linksys
-	# Orion Linksys Images
- # sysupgrade image
-	( \
-		dd if="${KDIR}/$2-uImage" bs=$5 conv=sync; \
-		dd if="${KDIR}/root.$1" bs=64k conv=sync; \
-	) > "${BIN_DIR}/openwrt-$2-$1.img"
- # recovery image and webupgrade image for stock firmware
-	rm -rf "${TMP_DIR}/$2_webupgrade"
-	mkdir "${TMP_DIR}/$2_webupgrade"
- # create parameter file
-	echo ":kernel $5 ${BIN_DIR}/openwrt-$2-uImage" >"${TMP_DIR}/$2_webupgrade/$2.par"
-	echo ":rootfs 0 ${KDIR}/root.$1" >>"${TMP_DIR}/$2_webupgrade/$2.par"
-	[ ! -f "$(STAGING_DIR_HOST)/share/wrt350nv2-builder/u-boot.bin" ] || ( \
-		echo ":u-boot 0 $(STAGING_DIR_HOST)/share/wrt350nv2-builder/u-boot.bin" >>"${TMP_DIR}/$2_webupgrade/$2.par"; )
-	echo "#version 0x2020" >>"${TMP_DIR}/$2_webupgrade/$2.par"
- # create bin file for recovery and webupgrade image
-	( cd "${TMP_DIR}/$2_webupgrade"; \
-		"${STAGING_DIR_HOST}/bin/$2-builder" \
-			-v -b "${TMP_DIR}/$2_webupgrade/$2.par"; \
-	)
- # copy bin file as recovery image
-	$(CP) "${TMP_DIR}/$2_webupgrade/wrt350n.bin" "$(BIN_DIR)/openwrt-$2-$1-recovery.bin"
- # create webupgrade image for stock firmware update mechanism
-	zip "${TMP_DIR}/$2_webupgrade/wrt350n.zip" "${TMP_DIR}/$2_webupgrade/wrt350n.bin"
-	"${STAGING_DIR_HOST}/bin/$2-builder" -v -z "${TMP_DIR}/$2_webupgrade/wrt350n.zip" "${BIN_DIR}/openwrt-$2-$1-webupgrade.img"
-	rm -rf "${TMP_DIR}/$2_webupgrade"
-endef
-
-define Image/Build/Freecom
-	# Orion Freecom Images
- # backup unwanted files
-	rm -rf ${TMP_DIR}/$2_backup
-	mkdir ${TMP_DIR}/$2_backup
-	-mv $(TARGET_DIR)/{var,jffs,rom} ${TMP_DIR}/$2_backup
- # add extra files
-	$(INSTALL_DIR) $(TARGET_DIR)/boot
-	# TODO: Add special CMDLINE shim for webupgrade image here
-	$(CP) $(KDIR)/dt2-uImage $(TARGET_DIR)/boot/uImage
-	$(INSTALL_DIR) $(TARGET_DIR)/var
- # create image
-	$(TAR) cfj $(BIN_DIR)/openwrt-$(2)-$(1).img --numeric-owner --owner=0 --group=0 -C $(TARGET_DIR)/ .
-	$(STAGING_DIR_HOST)/bin/encode_crc $(BIN_DIR)/openwrt-$(2)-$(1).img $(BIN_DIR)/openwrt-$(2)-$(1)-webupgrade.img $(3)
- # remove extra files
-	rm -rf $(TARGET_DIR)/{boot,var}
- # recover unwanted files
-	-mv ${TMP_DIR}/$2_backup/* $(TARGET_DIR)/
-	rm -rf ${TMP_DIR}/$2_backup
-endef
-
-define Image/Build
-$(call Image/Build/$(1),$(1))
-$(call Image/Build/Netgear,$(1),wnr854t,NG_WNR854T,$(1))
-$(call Image/Build/Freecom,$(1),dt2,DT,$(1))
- # Leave WRT350Nv2 at last position due to webimage dependency for zip
- # 5th parameter is kernel mtd size, e.g. 0x00100000 = 1048576 or 0x001A0000 = 1703936
-$(call Image/Build/Linksys,$(1),wrt350nv2,WNR350Nv2,$(1),1048576)
-endef
-
-define Image/Build/squashfs
-$(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
-	( \
-		dd if=$(KDIR)/uImage bs=1024k conv=sync; \
-		dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \
-	) > $(BIN_DIR)/$(IMG_PREFIX)-$(1).img
-endef
+include $(SUBTARGET).mk
 
 $(eval $(call BuildImage))
-
-# Dependency for WRT350N v2 webupgrade image
-$(eval $(call RequireCommand,zip, \
-	Please install zip. \
-))
diff --git a/target/linux/orion/image/generic.mk b/target/linux/orion/image/generic.mk
new file mode 100644
index 000000000..c3bd6015f
--- /dev/null
+++ b/target/linux/orion/image/generic.mk
@@ -0,0 +1,91 @@
+#
+# Copyright (C) 2008-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Image/Prepare
+	cp $(LINUX_DIR)/arch/arm/boot/uImage $(KDIR)/uImage
+endef
+
+define Image/BuildKernel
+	# Orion Kernel uImages
+ # WRT350N v2: mach id 1633 (0x661)
+	echo -en "\x06\x1c\xa0\xe3\x61\x10\x81\xe3" > $(KDIR)/wrt350nv2-zImage
+	cat $(LINUX_DIR)/arch/arm/boot/zImage >> $(KDIR)/wrt350nv2-zImage
+	$(STAGING_DIR_HOST)/bin/mkimage -A arm -O linux -T kernel \
+	-C none -a 0x00008000 -e 0x00008000 -n 'Linux-$(LINUX_VERSION)' \
+	-d $(KDIR)/wrt350nv2-zImage $(KDIR)/wrt350nv2-uImage
+	cp $(KDIR)/wrt350nv2-uImage $(BIN_DIR)/openwrt-wrt350nv2-uImage
+ # WNR854T: mach id 1801 (0x709)
+	echo -en "\x07\x1c\xa0\xe3\x09\x10\x81\xe3" > $(KDIR)/wnr854t-zImage
+	cat $(LINUX_DIR)/arch/arm/boot/zImage >> $(KDIR)/wnr854t-zImage
+	$(STAGING_DIR_HOST)/bin/mkimage -A arm -O linux -T kernel \
+	-C none -a 0x00008000 -e 0x00008000 -n 'Linux-$(LINUX_VERSION)' \
+	-d $(KDIR)/wnr854t-zImage $(KDIR)/wnr854t-uImage
+	cp $(KDIR)/wnr854t-uImage $(BIN_DIR)/openwrt-wnr854t-uImage
+endef
+
+define Image/Build/Netgear
+	# Orion Netgear Images
+	mkdir $(KDIR)/netgear_image
+	cp $(KDIR)/wnr854t-uImage $(KDIR)/netgear_image/uImage
+	$(STAGING_DIR_HOST)/bin/mkfs.jffs2 -m none -p -l -q -e 128KiB -o $(KDIR)/wnr854t-uImage.jffs2 -d $(KDIR)/netgear_image
+	rm -rf $(KDIR)/netgear_image
+	( \
+		dd if=$(KDIR)/wnr854t-uImage.jffs2 bs=1024k conv=sync; \
+		dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \
+	) > $(BIN_DIR)/openwrt-$(2)-$(1).img
+	$(STAGING_DIR_HOST)/bin/add_header $(3) $(BIN_DIR)/openwrt-$(2)-$(1).img $(BIN_DIR)/openwrt-$(2)-$(1)-webupgrade.img
+endef
+
+define Image/Build/Linksys
+	# Orion Linksys Images
+ # sysupgrade image
+	( \
+		dd if="${KDIR}/$2-uImage" bs=$5 conv=sync; \
+		dd if="${KDIR}/root.$1" bs=64k conv=sync; \
+	) > "${BIN_DIR}/openwrt-$2-$1.img"
+ # recovery image and webupgrade image for stock firmware
+	rm -rf "${TMP_DIR}/$2_webupgrade"
+	mkdir "${TMP_DIR}/$2_webupgrade"
+ # create parameter file
+	echo ":kernel $5 ${BIN_DIR}/openwrt-$2-uImage" >"${TMP_DIR}/$2_webupgrade/$2.par"
+	echo ":rootfs 0 ${KDIR}/root.$1" >>"${TMP_DIR}/$2_webupgrade/$2.par"
+	[ ! -f "$(STAGING_DIR_HOST)/share/wrt350nv2-builder/u-boot.bin" ] || ( \
+		echo ":u-boot 0 $(STAGING_DIR_HOST)/share/wrt350nv2-builder/u-boot.bin" >>"${TMP_DIR}/$2_webupgrade/$2.par"; )
+	echo "#version 0x2020" >>"${TMP_DIR}/$2_webupgrade/$2.par"
+ # create bin file for recovery and webupgrade image
+	( cd "${TMP_DIR}/$2_webupgrade"; \
+		"${STAGING_DIR_HOST}/bin/$2-builder" \
+			-v -b "${TMP_DIR}/$2_webupgrade/$2.par"; \
+	)
+ # copy bin file as recovery image
+	$(CP) "${TMP_DIR}/$2_webupgrade/wrt350n.bin" "$(BIN_DIR)/openwrt-$2-$1-recovery.bin"
+ # create webupgrade image for stock firmware update mechanism
+	zip "${TMP_DIR}/$2_webupgrade/wrt350n.zip" "${TMP_DIR}/$2_webupgrade/wrt350n.bin"
+	"${STAGING_DIR_HOST}/bin/$2-builder" -v -z "${TMP_DIR}/$2_webupgrade/wrt350n.zip" "${BIN_DIR}/openwrt-$2-$1-webupgrade.img"
+	rm -rf "${TMP_DIR}/$2_webupgrade"
+endef
+
+define Image/Build
+$(call Image/Build/$(1),$(1))
+$(call Image/Build/Netgear,$(1),wnr854t,NG_WNR854T,$(1))
+ # Leave WRT350Nv2 at last position due to webimage dependency for zip
+ # 5th parameter is kernel mtd size, e.g. 0x00100000 = 1048576 or 0x001A0000 = 1703936
+$(call Image/Build/Linksys,$(1),wrt350nv2,WNR350Nv2,$(1),1048576)
+endef
+
+define Image/Build/squashfs
+$(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
+	( \
+		dd if=$(KDIR)/uImage bs=1024k conv=sync; \
+		dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \
+	) > $(BIN_DIR)/$(IMG_PREFIX)-$(1).img
+endef
+
+# Dependency for WRT350N v2 webupgrade image
+$(eval $(call RequireCommand,zip, \
+	Please install zip. \
+))
diff --git a/target/linux/orion/image/harddisk.mk b/target/linux/orion/image/harddisk.mk
new file mode 100644
index 000000000..9f2efad12
--- /dev/null
+++ b/target/linux/orion/image/harddisk.mk
@@ -0,0 +1,55 @@
+#
+# Copyright (C) 2008-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Image/Prepare
+	cp $(LINUX_DIR)/arch/arm/boot/uImage $(KDIR)/uImage
+endef
+
+define Image/BuildKernel
+	# Orion Kernel uImages
+ # DT2: mach id 1514 (0x5EA)
+	echo -en "\x05\x1c\xa0\xe3\xea\x10\x81\xe3" > $(KDIR)/dt2-zImage
+	cat $(LINUX_DIR)/arch/arm/boot/zImage >> $(KDIR)/dt2-zImage
+	$(STAGING_DIR_HOST)/bin/mkimage -A arm -O linux -T kernel \
+	-C none -a 0x00008000 -e 0x00008000 -n 'Linux-$(LINUX_VERSION)' \
+	-d $(KDIR)/dt2-zImage $(KDIR)/dt2-uImage
+	cp $(KDIR)/dt2-uImage $(BIN_DIR)/openwrt-dt2-uImage
+endef
+
+define Image/Build/Freecom
+	# Orion Freecom Images
+ # backup unwanted files
+	rm -rf ${TMP_DIR}/$2_backup
+	mkdir ${TMP_DIR}/$2_backup
+	-mv $(TARGET_DIR)/{var,jffs,rom} ${TMP_DIR}/$2_backup
+ # add extra files
+	$(INSTALL_DIR) $(TARGET_DIR)/boot
+	# TODO: Add special CMDLINE shim for webupgrade image here
+	$(CP) $(KDIR)/dt2-uImage $(TARGET_DIR)/boot/uImage
+	$(INSTALL_DIR) $(TARGET_DIR)/var
+ # create image
+	$(TAR) cfj $(BIN_DIR)/openwrt-$(2)-$(1).img --numeric-owner --owner=0 --group=0 -C $(TARGET_DIR)/ .
+	$(STAGING_DIR_HOST)/bin/encode_crc $(BIN_DIR)/openwrt-$(2)-$(1).img $(BIN_DIR)/openwrt-$(2)-$(1)-webupgrade.img $(3)
+ # remove extra files
+	rm -rf $(TARGET_DIR)/{boot,var}
+ # recover unwanted files
+	-mv ${TMP_DIR}/$2_backup/* $(TARGET_DIR)/
+	rm -rf ${TMP_DIR}/$2_backup
+endef
+
+define Image/Build
+$(call Image/Build/$(1),$(1))
+$(call Image/Build/Freecom,$(1),dt2,DT,$(1))
+endef
+
+define Image/Build/squashfs
+$(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
+	( \
+		dd if=$(KDIR)/uImage bs=1024k conv=sync; \
+		dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \
+	) > $(BIN_DIR)/$(IMG_PREFIX)-$(1).img
+endef