X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/e54536938f891e79daada146d2e081251d1be122..907958f26817fd7ae5bcf01a290187c9c452109e:/target/linux/adm5120-2.6/image/Makefile

diff --git a/target/linux/adm5120-2.6/image/Makefile b/target/linux/adm5120-2.6/image/Makefile
index 360a87f65..829ddef3d 100644
--- a/target/linux/adm5120-2.6/image/Makefile
+++ b/target/linux/adm5120-2.6/image/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
 IMGNAME = $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)
-LOADER_MAKE = $(MAKE) -C lzma-loader KDIR=$(KDIR)
+LOADER_MAKE = $(NO_TRACE_MAKE) -C lzma-loader KDIR=$(KDIR)
 
 define Image/Build/Loader
 	$(LOADER_MAKE) LOADER=loader-$(1).$(2) LOADER_DATA="" \
@@ -77,15 +77,22 @@ define Image/Build/MyLoader
 		$(IMGNAME)-$(3)-$(2).bin
 endef
 
+define Image/cmdline/yaffs2
+root=/dev/mtdblock1 rootfstype=yaffs2 init=/etc/preinit
+endef
+
 define Image/Build/RouterBoard
-	$(CP) $(KDIR)/vmlinux.elf $(IMGNAME)-vmlinux
+	$(CP) $(KDIR)/vmlinux.elf $(IMGNAME)-rb1xx-vmlinux
+	$(STAGING_DIR)/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)
+ifneq ($(1),tgz)
 	$(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)
@@ -99,9 +106,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)
@@ -112,11 +119,16 @@ ifneq ($(1),jffs2-128k)
 	$(call Image/Build/MyLoader,$(1),wpp54ag,$(patsubst jffs2-%,jffs2,$(1)),WPP54AG)
 endif
 endif
-ifeq ($(1),tgz)
-	$(call Image/Build/RouterBoard)
+endif
 endif
 endef
 
+ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
+  define Image/BuildKernel
+	$(call Image/Build/RouterBoard)
+  endef
+endif
+
 define Image/Build/LZMAKernel
 	$(LOADER_MAKE) TARGET_DIR=$(BIN_DIR) \
 		LOADER=openwrt-$(BOARD)-$(KERNEL)-ramfs-lzma-$(1).$(2) \
@@ -138,12 +150,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)
@@ -153,6 +170,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))