From 42ac6ea6c2e187d2ab63344706ff30bb4c113428 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Wed, 15 Feb 2017 18:15:34 +0100 Subject: [PATCH] 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 --- .../0002-del-flash_eraseall.patch | 65 ------------------- ...itely-try-to-resolve-peer-addresses.patch} | 0 .../busybox/busybox_1.24.1.bbappend | 5 +- 3 files changed, 1 insertion(+), 69 deletions(-) delete mode 100644 meta-digi-dey/recipes-core/busybox/busybox-1.24.1/0002-del-flash_eraseall.patch rename meta-digi-dey/recipes-core/busybox/busybox-1.24.1/{0003-ntpd-indefinitely-try-to-resolve-peer-addresses.patch => 0002-ntpd-indefinitely-try-to-resolve-peer-addresses.patch} (100%) diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/0002-del-flash_eraseall.patch b/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/0002-del-flash_eraseall.patch deleted file mode 100644 index d69a4ad2d..000000000 --- a/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/0002-del-flash_eraseall.patch +++ /dev/null @@ -1,65 +0,0 @@ -From: Javier Viguera -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 ---- - 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 - #include - -+#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) { diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/0003-ntpd-indefinitely-try-to-resolve-peer-addresses.patch b/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/0002-ntpd-indefinitely-try-to-resolve-peer-addresses.patch similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox-1.24.1/0003-ntpd-indefinitely-try-to-resolve-peer-addresses.patch rename to meta-digi-dey/recipes-core/busybox/busybox-1.24.1/0002-ntpd-indefinitely-try-to-resolve-peer-addresses.patch diff --git a/meta-digi-dey/recipes-core/busybox/busybox_1.24.1.bbappend b/meta-digi-dey/recipes-core/busybox/busybox_1.24.1.bbappend index f7b942600..56d5012b2 100644 --- a/meta-digi-dey/recipes-core/busybox/busybox_1.24.1.bbappend +++ b/meta-digi-dey/recipes-core/busybox/busybox_1.24.1.bbappend @@ -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 \