From: John Crispin <john@openwrt.org>
Date: Tue, 24 Jun 2014 18:12:52 +0000 (+0000)
Subject: lantiq: remove deprecated jffs2_nand configuration
X-Git-Tag: reboot~6828
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d219e055bee41b02f1b092a131e060a92d763813;p=oweals%2Fopenwrt.git

lantiq: remove deprecated jffs2_nand configuration

As far as I am aware, amongst the lantiq boards, jffs2_nand was
only used on the BTHOMEHUBV2B. Ubi-related modifications to the
device tree for that board mean that the resulting jffs2 images
no longer work, and are no longer required anyway. So I suggest
removing the related configuration, which this patch does.

If anyone else is using jffs2_nand on a lantiq target please speak
up!

Incidentally, for a jffs2 rootfs partition concatenated to the
kernel image to be recognised and mounted correctly on nand
this patch or something equivalent is required:
http://patchwork.openwrt.org/patch/5110/
It is marked as accepted in patchwork but doesn't seem to have
been committed. As far as I am concerned it too is deprecated.

Signed-off-by: Ben Mulvihill <ben.mulvihill@gmail.com>

SVN-Revision: 41312
---

diff --git a/target/linux/lantiq/image/Makefile b/target/linux/lantiq/image/Makefile
index 3af3d999b3..7d95061b54 100644
--- a/target/linux/lantiq/image/Makefile
+++ b/target/linux/lantiq/image/Makefile
@@ -12,7 +12,6 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
 JFFS2_BLOCKSIZE = 64k 128k 256k
-NAND_BLOCKSIZE = 512:16k
 
 LOADER_MAKE := $(NO_TRACE_MAKE) -C lzma-loader KDIR=$(KDIR)
 
@@ -171,13 +170,6 @@ define Image/Build/jffs2-256k
 	cat $(KDIR)/uImage-$(2)-$(1) $(KDIR)/root.$(1) > $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(1).image
 endef
 
-define Image/Build/jffs2-nand-512-16k
-	dd if=$(KDIR)/uImage-$(2) of=$(KDIR)/uImage-$(2)-$(1) bs=16k conv=sync
-	$(CP) $(KDIR)/uImage-$(2)-$(1) $(BIN_DIR)/uImage-$(2)-$(1)
-	$(CP) $(KDIR)/root.$(1) $(BIN_DIR)/root-$(2)-$(1)
-	cat $(KDIR)/uImage-$(2)-$(1) $(KDIR)/root.$(1) > $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(1).image
-endef
-
 define Image/Build/ubifs
 
 ifneq ($($(PROFILE)_UBIFS_OPTS),)
diff --git a/target/linux/lantiq/xway/target.mk b/target/linux/lantiq/xway/target.mk
index e8a287412b..0cc3f8ae27 100644
--- a/target/linux/lantiq/xway/target.mk
+++ b/target/linux/lantiq/xway/target.mk
@@ -1,7 +1,7 @@
 ARCH:=mips
 SUBTARGET:=xway
 BOARDNAME:=XWAY
-FEATURES:=squashfs atm mips16 jffs2_nand nand ubifs
+FEATURES:=squashfs atm mips16 nand ubifs
 CPU_TYPE:=34kc
 CPU_SUBTYPE:=dsp