disable image generation for boards which we still have problems with (at least if...

[openwrt/openwrt.git] / 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 360a87f657810257442b5cf9873fdc4ddf0914e6..352ebf480f1e231fb4a1c381286065dbbc3b54dc 100644 (file)
--- 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,8 +77,13 @@ 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
@@ -86,6 +91,7 @@ define Image/Build
 ifneq ($(1),jffs2-256k)
 ifneq ($(1),jffs2-128k)
        $(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)
@@ -112,6 +118,7 @@ ifneq ($(1),jffs2-128k)
        $(call Image/Build/MyLoader,$(1),wpp54ag,$(patsubst jffs2-%,jffs2,$(1)),WPP54AG)
 endif
 endif
+endif
 ifeq ($(1),tgz)
        $(call Image/Build/RouterBoard)
 endif
@@ -138,12 +145,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 +165,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))