busybox: remove libdigi dependency

The flash_eraseall busybox utility is not used in the ccimx6 and ccimx6ul
platforms. Its corresponding patch (and the library it depends on) can be
removed from the busybox recipe.

https://jira.digi.com/browse/DEL-1320

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
This commit is contained in:
Gabriel Valcazar 2017-02-15 18:15:34 +01:00
parent 19563821d2
commit 42ac6ea6c2
3 changed files with 1 additions and 69 deletions

View File

@ -1,65 +0,0 @@
From: Javier Viguera <javier.viguera@digi.com>
Date: Fri, 17 Jun 2011 15:00:09 -0500
Subject: [PATCH] del-flash_eraseall
flash_eraseall: disable JFFS2 clean markers for some platforms
Some platforms (i.MX5X, CPX2) require atomic access to OOB otherwise
the JFFS2 information in the OOB leads to errors when mounting the
file system.
For these platforms, disable the possibility of writing JFFS2 clean
markers when erasing the flash.
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
Makefile.flags | 4 ++++
miscutils/flash_eraseall.c | 13 +++++++++++++
2 files changed, 17 insertions(+)
diff --git a/Makefile.flags b/Makefile.flags
index 9f77674..fdbaad8 100644
--- a/Makefile.flags
+++ b/Makefile.flags
@@ -159,6 +159,10 @@ ifeq ($(CONFIG_DMALLOC),y)
LDLIBS += dmalloc
endif
+ifeq ($(CONFIG_FLASH_ERASEALL),y)
+LDLIBS += digi
+endif
+
# If a flat binary should be built, CFLAGS_busybox="-elf2flt"
# env var should be set for make invocation.
# Here we check whether CFLAGS_busybox indeed contains that flag.
diff --git a/miscutils/flash_eraseall.c b/miscutils/flash_eraseall.c
index bf9b739..f202392 100644
--- a/miscutils/flash_eraseall.c
+++ b/miscutils/flash_eraseall.c
@@ -22,6 +22,8 @@
#include <mtd/mtd-user.h>
#include <linux/jffs2.h>
+#include "libdigi/digi-platforms.h" // is_nand_oob_atomic
+
#define OPTION_J (1 << 0)
#define OPTION_N (1 << 1)
#define OPTION_Q (1 << 2)
@@ -85,6 +87,17 @@ int flash_eraseall_main(int argc UNUSED_PARAM, char **argv)
if (meminfo.type == MTD_NANDFLASH)
flags |= IS_NAND;
+ /*
+ * Some platforms (i.MX5X, CPX2) require atomic access to OOB, otherwise
+ * the JFFS2 information in the OOB leads to errors when mounting the
+ * file system.
+ * For those platforms, disable clean-markers option (-j).
+ */
+ if ((flags & OPTION_J) && is_nand_oob_atomic()) {
+ flags &= (~0 - OPTION_J);
+ bb_info_msg("%s: JFFS2 doesn't use OOB in this platform", applet_name);
+ }
+
clmpos = 0;
clmlen = 8;
if (flags & OPTION_J) {

View File

@ -2,11 +2,8 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${BP}:"
DEPENDS += "libdigi"
SRC_URI += "file://0001-del-baudrates.patch \
file://0002-del-flash_eraseall.patch \
file://0003-ntpd-indefinitely-try-to-resolve-peer-addresses.patch \
file://0002-ntpd-indefinitely-try-to-resolve-peer-addresses.patch \
file://suspend \
file://busybox-ntpd \
file://index.html \