aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2013-06-05 20:58:53 +0000
committerJonas Gorski <jogo@openwrt.org>2013-06-05 20:58:53 +0000
commitc926c403ad62ebf38afdbfe786ecb07dfee89485 (patch)
tree02d96834a129f71105856853ead17729a55435a3 /target
parent982f0f338647610336671a268190ea7d98410bcd (diff)
downloadmaster-187ad058-c926c403ad62ebf38afdbfe786ecb07dfee89485.tar.gz
master-187ad058-c926c403ad62ebf38afdbfe786ecb07dfee89485.tar.bz2
master-187ad058-c926c403ad62ebf38afdbfe786ecb07dfee89485.zip
kirkwood: convert to use the new jffs2_nand
Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36861 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/kirkwood/Makefile2
-rw-r--r--target/linux/kirkwood/image/Makefile4
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