rewrite image generation

SVN-Revision: 8755

8 files changed, 51 insertions, 122 deletions

diff --git a/target/linux/adm5120/router_be/image/Makefile b/target/linux/adm5120/router_be/image/Makefile
deleted file mode 100644
index f47b3ab..0000000
--- a/target/linux/adm5120/router_be/image/Makefile
+++ /dev/null
@@ -1,80 +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
-include $(INCLUDE_DIR)/image.mk
-
-IMGNAME = $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)
-LOADER_MAKE = $(NO_TRACE_MAKE) -C lzma-loader KDIR=$(KDIR)
-
-define Image/Build/Loader
-	$(LOADER_MAKE) LOADER=loader-$(1).$(2) LOADER_DATA="" \
-		LZMA_TEXT_START=$(3) LZMA_STARTUP_ORG=$(4) \
-		CONFIG_PASS_KARGS=$(5) CONFIG_BOARD=$(6) \
-		compile loader.$(2)
-endef
-
-define Build/Clean
-	$(LOADER_MAKE) clean
-endef
-
-define Image/Prepare
-	cat $(KDIR)/vmlinux | $(STAGING_DIR_HOST)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $(KDIR)/vmlinux.lzma
-endef
-
-define trxalign/jffs2-128k
--a 0x20000
-endef
-define trxalign/jffs2-64k
--a 0x10000
-endef
-define trxalign/squashfs
--a 1024
-endef
-
-define Image/Build/TRX
-	$(STAGING_DIR_HOST)/bin/trx -o $(1) -f $(3) -f $(KDIR)/vmlinux.lzma \
-		$(call trxalign/$(2)) -f $(KDIR)/root.$(2)
-endef
-
-define Image/Build/TRXNoloader
-	$(STAGING_DIR_HOST)/bin/trx -o $(1) -f $(KDIR)/vmlinux.lzma \
-		$(call trxalign/$(2)) -f $(KDIR)/root.$(2)
-endef
-
-define Image/Build/ZyXEL
-	$(call Image/Build/Loader,loader-$(2),gz,0x80500000,0)
-	$(call Image/Build/TRXNoloader,$(IMGNAME)-$(3)-$(2).trx,$(1))
-	#TODO: firmware generation tool needed
-endef
-
-define Image/Build
-	#FIXME: No firmware images yet
-endef
-
-define Image/Build/LZMAKernel
-	$(LOADER_MAKE) TARGET_DIR=$(BIN_DIR) \
-		LOADER=openwrt-$(BOARD)-$(KERNEL)-ramfs-lzma-$(1).$(2) \
-		LOADER_DATA=$(KDIR)/vmlinux.lzma \
-		LZMA_TEXT_START=$(3) LZMA_STARTUP_ORG=$(4) \
-		CONFIG_PASS_KARGS=$(5) CONFIG_BOARD=$(6) \
-		compile loader.$(2)
-endef
-
-define Image/Build/LZMAKernel/ZyXEL
-	$(call Image/Build/LZMAKernel,$(1),$(2),0x80500000,0,y,$(1))
-endef
-
-define Image/Build/Initramfs
-# this line is here intentionally
-ifeq ($(CONFIG_DEVEL),y)
-	$(call Image/Build/LZMAKernel/ZyXEL,p-334wt,bin)
-	$(call Image/Build/LZMAKernel/ZyXEL,p-335,bin)
-endif
-endef
-
-$(eval $(call BuildImage))
-
diff --git a/target/linux/adm5120/router_be/image/lzma-loader b/target/linux/adm5120/router_be/image/lzma-loader
deleted file mode 120000
index f472e6b..0000000
--- a/target/linux/adm5120/router_be/image/lzma-loader
+++ /dev/null
@@ -1 +0,0 @@
-../../adm5120/image/lzma-loader/
\ No newline at end of file
diff --git a/target/linux/adm5120/router_be/profiles/010-Generic.mk b/target/linux/adm5120/router_be/profiles/010-Generic.mk
new file mode 100644
index 0000000..1d47731
--- /dev/null
+++ b/target/linux/adm5120/router_be/profiles/010-Generic.mk
@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2007 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/Generic
+	NAME:=Generic (default)
+	PACKAGES:=
+endef
+
+define Profile/Generic/Description
+	Generic package set compatible with most boards.
+endef
+$(eval $(call Profile,Generic))
+
diff --git a/target/linux/adm5120/router_be/profiles/090-Zyxel.mk b/target/linux/adm5120/router_be/profiles/090-Zyxel.mk
deleted file mode 100644
index b0741e8..0000000
--- a/target/linux/adm5120/router_be/profiles/090-Zyxel.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/Zyxel
-  NAME:=Zyxel Prestige P-334/335/335-WT (default)
-  PACKAGES:=kmod-acx kmod-usb-core kmod-usb-adm5120
-endef
-
-define Profile/Zyxel/Description
-	Package set compatible with the Zyxel prestige P-334/335/335-WT boards
-endef
-$(eval $(call Profile,Zyxel))
-
diff --git a/target/linux/adm5120/router_be/profiles/100-Texas.mk b/target/linux/adm5120/router_be/profiles/100-Texas.mk
index 727a0c0..af17042 100644
--- a/target/linux/adm5120/router_be/profiles/100-Texas.mk
+++ b/target/linux/adm5120/router_be/profiles/100-Texas.mk
@@ -1,13 +1,13 @@
 #
-# 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.
 #
 
 define Profile/Texas
-  NAME:=Texas Instruments WiFi
-  PACKAGES:=kmod-acx
+	NAME:=Texas Instruments WiFi
+	PACKAGES:=kmod-acx
 endef
 
 define Profile/Texas/Description
diff --git a/target/linux/adm5120/router_be/profiles/110-Atheros.mk b/target/linux/adm5120/router_be/profiles/110-Atheros.mk
index cc4a704..fa95bf3 100644
--- a/target/linux/adm5120/router_be/profiles/110-Atheros.mk
+++ b/target/linux/adm5120/router_be/profiles/110-Atheros.mk
@@ -1,17 +1,17 @@
 #
-# 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.
 #
 
 define Profile/Atheros
-  NAME:=Atheros WiFi
-  PACKAGES:=kmod-madwifi
+	NAME:=Atheros WiFi
+	PACKAGES:=kmod-madwifi
 endef
 
 define Profile/Atheros/Description
-	Package set compatible with hardware using Atheros WiFi cards
+	Package set compatible with hardware using Atheros WiFi cards.
 endef
 $(eval $(call Profile,Atheros))
 
diff --git a/target/linux/adm5120/router_be/profiles/110-None.mk b/target/linux/adm5120/router_be/profiles/110-None.mk
deleted file mode 100644
index 2fcfacd..0000000
--- a/target/linux/adm5120/router_be/profiles/110-None.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/None
-  NAME:=No WiFi
-  PACKAGES:=
-endef
-
-define Profile/None/Description
-	Package set without WiFi support
-endef
-$(eval $(call Profile,None))
-
diff --git a/target/linux/adm5120/router_be/profiles/200-ZyXEL.mk b/target/linux/adm5120/router_be/profiles/200-ZyXEL.mk
new file mode 100644
index 0000000..0af5613
--- /dev/null
+++ b/target/linux/adm5120/router_be/profiles/200-ZyXEL.mk
@@ -0,0 +1,27 @@
+#
+# Copyright (C) 2007 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/P-334WT
+	NAME:=ZyXEL Prestige P-334WT
+	PACKAGES:=kmod-acx
+endef
+
+define Profile/P-334WT/Description
+	Package set optimized for the ZyXEL Prestige P-334WT board.
+endef
+
+define Profile/P-335WT
+	NAME:=ZyXEL Prestige P-335WT
+	PACKAGES:=kmod-acx kmod-usb-core kmod-usb-adm5120
+endef
+
+define Profile/P-335WT/Description
+	Package set optimized for the ZyXEL Prestige P-335WT board.
+endef
+
+$(eval $(call Profile,P-334WT))
+$(eval $(call Profile,P-335WT))