X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fchunkeey.git;a=blobdiff_plain;f=target%2Flinux%2Fadm5120-2.6%2Fimage%2FMakefile;h=8e36d45df3b0abfc72fc673745b358be408e95f0;hp=732b82de3e881698b81d213df87229d61953995e;hb=c6bc77ea365704f3f5c79d64aed069792a4e95b1;hpb=b070b74f1fe7b72a1d62c51eef6309fe01185e61

diff --git a/target/linux/adm5120-2.6/image/Makefile b/target/linux/adm5120-2.6/image/Makefile
index 732b82de3e..8e36d45df3 100644
--- a/target/linux/adm5120-2.6/image/Makefile
+++ b/target/linux/adm5120-2.6/image/Makefile
@@ -22,7 +22,7 @@ define Build/Clean
 endef
 
 define Image/Prepare
-	cat $(KDIR)/vmlinux | $(STAGING_DIR)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $(KDIR)/vmlinux.lzma
+	cat $(KDIR)/vmlinux | $(STAGING_DIR_HOST)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $(KDIR)/vmlinux.lzma
 endef
 
 define trxalign/jffs2-128k
@@ -36,12 +36,12 @@ define trxalign/squashfs
 endef
 
 define Image/Build/TRX
-	$(STAGING_DIR)/bin/trx -o $(1) -f $(3) -f $(KDIR)/vmlinux.lzma \
+	$(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)/bin/trx -o $(1) -f $(KDIR)/vmlinux.lzma \
+	$(STAGING_DIR_HOST)/bin/trx -o $(1) -f $(KDIR)/vmlinux.lzma \
 		$(call trxalign/$(2)) -f $(KDIR)/root.$(2)
 endef
 
@@ -53,7 +53,7 @@ endef
 define Image/Build/Edimax
 	$(call Image/Build/Loader,$(2),gz,0x80500000,0x6D8,y,$(2))
 	$(call Image/Build/TRXNoloader,$(IMGNAME)-$(3)-$(2).trx,$(1))
-	$(STAGING_DIR)/bin/mkcsysimg -B $(4) -d -w \
+	$(STAGING_DIR_HOST)/bin/mkcsysimg -B $(4) -d -w \
 		-r $(KDIR)/loader-$(2).gz \
 		-x $(IMGNAME)-$(3)-$(2).trx \
 		$(IMGNAME)-$(3)-$(2).bin
@@ -69,7 +69,7 @@ endef
 define Image/Build/MyLoader
 	$(call Image/Build/Loader,$(2),gz,0x80500000,0)
 	$(call Image/Build/TRXNoloader,$(IMGNAME)-$(3)-$(2).trx,$(1))
-	$(STAGING_DIR)/bin/mkmylofw -B $(4) \
+	$(STAGING_DIR_HOST)/bin/mkmylofw -B $(4) \
 		-p0x20000:0x10000:ahp:0x80001000 \
 		-p0x30000:0 \
 		-b0x20000:0x10000:h:$(KDIR)/loader-$(2).gz \
@@ -82,15 +82,13 @@ root=/dev/mtdblock1 rootfstype=yaffs2 init=/etc/preinit
 endef
 
 define Image/Build/RouterBoard
-	$(CP) $(KDIR)/vmlinux.elf $(IMGNAME)-vmlinux
-	$(STAGING_DIR)/bin/patch-cmdline $(KDIR)/vmlinux.elf '$(strip $(call Image/cmdline/yaffs2)) '
+	$(CP) $(KDIR)/vmlinux.elf $(IMGNAME)-rb1xx-vmlinux
+	$(STAGING_DIR_HOST)/bin/patch-cmdline $(KDIR)/vmlinux.elf '$(strip $(call Image/cmdline/yaffs2)) '
 endef
 
-define Image/Build
-# this line is here intentionally
-ifneq ($(1),jffs2-256k)
-ifneq ($(1),jffs2-128k)
+define Image/Build/jffs2-64k
 	$(call Image/Build/Compex,$(1),wp54g-wrt,$(patsubst jffs2-%,jffs2,$(1)),WP54G-WRT)
+ifeq ($(CONFIG_DEVEL),y)
 	$(call Image/Build/Edimax,$(1),br-6104k,$(patsubst jffs2-%,jffs2,$(1)),BR-6104K)
 	$(call Image/Build/Edimax,$(1),br-6104kp,$(patsubst jffs2-%,jffs2,$(1)),BR-6104KP)
 	$(call Image/Build/Edimax,$(1),br-6114wg,$(patsubst jffs2-%,jffs2,$(1)),BR-6114WG)
@@ -104,9 +102,9 @@ ifneq ($(1),jffs2-128k)
 	$(call Image/Build/Edimax,$(1),ps-3205uwg,$(patsubst jffs2-%,jffs2,$(1)),PS-3205UWg)
 	$(call Image/Build/Edimax,$(1),br-6524wg,$(patsubst jffs2-%,jffs2,$(1)),BR-6524WG)
 	$(call Image/Build/Edimax,$(1),br-6524wp,$(patsubst jffs2-%,jffs2,$(1)),BR-6524WP)
-	$(call Image/Build/Infineon,$(1),easy-5120,$(patsubst jffs2-%,jffs2,$(1)))
-	$(call Image/Build/Infineon,$(1),easy-5120-rt,$(patsubst jffs2-%,jffs2,$(1)))
 	$(call Image/Build/Infineon,$(1),easy-5120p-ata,$(patsubst jffs2-%,jffs2,$(1)))
+	$(call Image/Build/Infineon,$(1),easy-5120-rt,$(patsubst jffs2-%,jffs2,$(1)))
+	$(call Image/Build/Infineon,$(1),easy-5120-wvoip,$(patsubst jffs2-%,jffs2,$(1)))
 	$(call Image/Build/Infineon,$(1),easy-83000,$(patsubst jffs2-%,jffs2,$(1)))
 	$(call Image/Build/MyLoader,$(1),np27g,$(patsubst jffs2-%,jffs2,$(1)),NP27G)
 	$(call Image/Build/MyLoader,$(1),np28g,$(patsubst jffs2-%,jffs2,$(1)),NP28G)
@@ -116,11 +114,21 @@ ifneq ($(1),jffs2-128k)
 	$(call Image/Build/MyLoader,$(1),wpp54g,$(patsubst jffs2-%,jffs2,$(1)),WPP54G)
 	$(call Image/Build/MyLoader,$(1),wpp54ag,$(patsubst jffs2-%,jffs2,$(1)),WPP54AG)
 endif
-endif
-ifeq ($(1),tgz)
+endef
+
+define Image/Build/squashfs
+$(call Image/Build/jffs2-64k,$(1))
+endef
+
+define Image/Build
+$(call Image/Build/$(1),$(1))
+endef
+
+ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
+  define Image/BuildKernel
 	$(call Image/Build/RouterBoard)
+  endef
 endif
-endef
 
 define Image/Build/LZMAKernel
 	$(LOADER_MAKE) TARGET_DIR=$(BIN_DIR) \
@@ -143,12 +151,17 @@ define Image/Build/LZMAKernel/Admboot
 	$(call Image/Build/LZMAKernel,$(1),$(2),0x80500000,0x6D8,y,$(1))
 endef
 
+define Image/Build/Initramfs/RouterBoard
+	$(CP) $(KDIR)/vmlinux.elf $(IMGNAME)-ramfs-rb1xx.elf
+endef
+
 define Image/Build/Initramfs
+	$(call Image/Build/Initramfs/RouterBoard)
+	$(call Image/Build/LZMAKernel/Compex,wp54g-wrt,bin)
+ifeq ($(CONFIG_DEVEL),y)
 	$(call Image/Build/LZMAKernel/Generic,generic,bin)
-	$(call Image/Build/LZMAKernel/Generic,rb-100,elf)
 	$(call Image/Build/LZMAKernel/Generic,np27g,bin)
 	$(call Image/Build/LZMAKernel/Generic,wp54g,bin)
-	$(call Image/Build/LZMAKernel/Compex,wp54g-wrt,bin)
 	$(call Image/Build/LZMAKernel/Admboot,br-6104k,gz)
 	$(call Image/Build/LZMAKernel/Admboot,easy-5120,gz)
 	$(call Image/Build/LZMAKernel/Admboot,easy-83000,gz)
@@ -158,6 +171,7 @@ define Image/Build/Initramfs
 	$(call Image/Build/LZMAKernel/Admboot,cas-771,gz)
 	$(call Image/Build/LZMAKernel/Admboot,cas-790,gz)
 	$(call Image/Build/LZMAKernel/Admboot,cas-861,gz)
+endif
 endef
 
 $(eval $(call BuildImage))