From e7b504ce8e13d58a80472aa699c099bccb883cd3 Mon Sep 17 00:00:00 2001
From: Jonas Gorski <jogo@openwrt.org>
Date: Wed, 5 Jun 2013 20:58:53 +0000
Subject: [PATCH] kirkwood: convert to use the new jffs2_nand

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 36861
---
 target/linux/kirkwood/Makefile       | 2 +-
 target/linux/kirkwood/image/Makefile | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/target/linux/kirkwood/Makefile b/target/linux/kirkwood/Makefile
index 355087b438..f0dda5ae93 100644
--- a/target/linux/kirkwood/Makefile
+++ b/target/linux/kirkwood/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 ARCH:=arm
 BOARD:=kirkwood
 BOARDNAME:=Marvell Kirkwood
-FEATURES:=targz usb jffs2
+FEATURES:=targz usb jffs2_nand
 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
 
 LINUX_VERSION:=3.3.8
diff --git a/target/linux/kirkwood/image/Makefile b/target/linux/kirkwood/image/Makefile
index c93be67512..99bf864260 100644
--- a/target/linux/kirkwood/image/Makefile
+++ b/target/linux/kirkwood/image/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
-JFFS2OPTS += --little-endian --pagesize=0x800 --no-cleanmarkers --pad
+NAND_BLOCKSIZE := 2048:128k
 
 define Image/Prepare
 	cp $(LINUX_DIR)/arch/arm/boot/uImage $(KDIR)/uImage
@@ -25,7 +25,7 @@ define Image/Build
 	)
 endef
 
-define Image/Build/jffs2-128k
+define Image/Build/jffs2-nand-2048-128k
 	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE)-$(1).img \
 		bs=2048 conv=sync
 endef