From fd7d7215c62c223031426b1b84e96cd4186bd148 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 23 Jul 2007 02:13:10 +0000
Subject: [PATCH] simplify and fix adm5120 image building, fix broken FEATURES
 handling

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8113 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/adm5120-2.6/Makefile          |  2 +-
 target/linux/adm5120-2.6/image/Makefile    | 15 +++++++++------
 target/linux/adm5120-2.6/profiles/RB1xx.mk |  1 -
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/target/linux/adm5120-2.6/Makefile b/target/linux/adm5120-2.6/Makefile
index fb46f2831..8a4884c9c 100644
--- a/target/linux/adm5120-2.6/Makefile
+++ b/target/linux/adm5120-2.6/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 ARCH:=mipsel
 BOARD:=adm5120
 BOARDNAME:=ADM5120 (Little Endian)
-FEATURES:=squashfs jffs2 pci usb broken
+FEATURES:=squashfs jffs2 tgz broken
 
 LINUX_VERSION:=2.6.22.1
 
diff --git a/target/linux/adm5120-2.6/image/Makefile b/target/linux/adm5120-2.6/image/Makefile
index ee70b6b1a..802fd956a 100644
--- a/target/linux/adm5120-2.6/image/Makefile
+++ b/target/linux/adm5120-2.6/image/Makefile
@@ -86,10 +86,7 @@ define Image/Build/RouterBoard
 	$(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)
+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)
@@ -117,8 +114,14 @@ ifeq ($(CONFIG_DEVEL),y)
 	$(call Image/Build/MyLoader,$(1),wpp54g,$(patsubst jffs2-%,jffs2,$(1)),WPP54G)
 	$(call Image/Build/MyLoader,$(1),wpp54ag,$(patsubst jffs2-%,jffs2,$(1)),WPP54AG)
 endif
-endif
-endif
+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)
diff --git a/target/linux/adm5120-2.6/profiles/RB1xx.mk b/target/linux/adm5120-2.6/profiles/RB1xx.mk
index 58622429e..9dd3de097 100644
--- a/target/linux/adm5120-2.6/profiles/RB1xx.mk
+++ b/target/linux/adm5120-2.6/profiles/RB1xx.mk
@@ -8,7 +8,6 @@
 define Profile/RouterBoard
   NAME:=RouterBoard RB1xx
   PACKAGES:=kmod-madwifi
-  FEATURES:=tgz pci
 endef
 
 define Profile/RouterBoard/Description
-- 
2.35.1