really fix tgz images

[oweals/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 352ebf480f1e231fb4a1c381286065dbbc3b54dc..829ddef3da830f4ed2faba9d7c8de1419c3472d0 100644 (file)
--- a/target/linux/adm5120-2.6/image/Makefile
+++ b/target/linux/adm5120-2.6/image/Makefile
@@ -90,8 +90,9 @@ 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)
+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)
@@ -105,9 +106,9 @@ ifeq (CONFIG_DEVEL,y)
        $(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)
@@ -119,11 +120,15 @@ ifeq (CONFIG_DEVEL,y)
 endif
 endif
 endif
-ifeq ($(1),tgz)
-       $(call Image/Build/RouterBoard)
 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) \
@@ -152,7 +157,7 @@ endef
 define Image/Build/Initramfs
        $(call Image/Build/Initramfs/RouterBoard)
        $(call Image/Build/LZMAKernel/Compex,wp54g-wrt,bin)
-ifeq (CONFIG_DEVEL,y)
+ifeq ($(CONFIG_DEVEL),y)
        $(call Image/Build/LZMAKernel/Generic,generic,bin)
        $(call Image/Build/LZMAKernel/Generic,np27g,bin)
        $(call Image/Build/LZMAKernel/Generic,wp54g,bin)