From 189de9277bbfda7a83d3f6ed89307fc128742430 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 23 Jul 2011 00:52:35 +0000
Subject: [PATCH] fix mtd-utils compilation for brcm-2.4

SVN-Revision: 27730
---
 utils/mtd-utils/Makefile | 82 +++++++++++++++++++++-------------------
 1 file changed, 43 insertions(+), 39 deletions(-)

diff --git a/utils/mtd-utils/Makefile b/utils/mtd-utils/Makefile
index ce1c93d9b..b8c26d56a 100644
--- a/utils/mtd-utils/Makefile
+++ b/utils/mtd-utils/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=mtd-utils
 PKG_REV:=a2d010f8fca904fffa3c6e5a5d148cc96a37a08a
 PKG_VERSION:=20090227
-PKG_RELEASE:=1
+PKG_RELEASE:=1.1
 PKG_INSTALL:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -22,53 +22,57 @@ PKG_SOURCE_VERSION:=$(PKG_REV)
 include $(INCLUDE_DIR)/package.mk
 
 FILES:= \
-	ubiupdatevol \
+	doc_loadbios \
+	docfdisk \
+	flash_erase \
+	flash_eraseall \
+	flash_info \
+	flash_lock \
+	flash_otp_dump \
 	flash_otp_info \
+	flash_unlock \
+	flashcp \
+	ftl_check \
+	ftl_format \
+	jffs2dump \
+	mkfs.jffs2 \
+	mtd_debug \
+	nanddump \
 	nandtest \
-	ubimkvol \
-	ubigen \
-	serve_image \
-	recv_image \
-	ubinfo \
-	ubirename \
-	mkpfi \
 	nandwrite \
-	flash_eraseall \
+	nftl_format \
+	nftldump \
+	recv_image \
+	rfddump \
+	rfdformat \
+	serve_image \
+	sumtool
+
+ifneq ($(CONFIG_LINUX_2_4),y)
+FILES += \
+	bin2nand \
 	mkbootenv \
-	ftl_format \
+	mkfs.ubifs \
+	mkpfi \
 	nand2bin \
+	pddcustomize \
+	pfi2bin \
+	pfiflash \
 	ubiattach \
-	nftl_format \
-	nanddump \
-	ubinize \
-	docfdisk \
-	ubimirror \
+	ubicrc32 \
 	ubicrc32.pl \
-	ftl_check \
-	flashcp \
-	jffs2dump \
-	ubiformat \
 	ubidetach \
-	flash_lock \
-	bin2nand \
-	pfiflash \
-	mtd_debug \
-	pddcustomize \
-	flash_unlock \
-	doc_loadbios \
-	nftldump \
-	mkfs.jffs2 \
-	flash_info \
-	ubicrc32 \
+	ubiformat \
+	ubigen \
+	ubimirror \
+	ubimkvol \
+	ubinfo \
+	ubinize \
+	ubirename \
 	ubirmvol \
-	unubi \
-	pfi2bin \
-	mkfs.ubifs \
-	sumtool \
-	flash_erase \
-	rfddump \
-	flash_otp_dump \
-	rfdformat
+	ubiupdatevol \
+	unubi
+endif
 
 define PartGen
 define Package/mtd-utils-$(subst _,-,$(1))
-- 
2.30.2