From 9f44417de4bb0c73f9d5ae630ccce160e2740d32 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Mon, 29 Mar 2021 02:33:14 +0800 Subject: [PATCH] fs/lfs: Update version to 2.4.0 And redirect assert and log to NuttX's version which is possible after: commit c0cc0a417e727764ccce6f1284e3570898d750e6 Author: Christopher Haster Date: Mon Jan 18 14:01:53 2021 -0600 Enabled overriding of LFS_ASSERT/TRACE/DEBUG/etc This is useful for testing the new erroring assert behavior in CI. Asserts do not error by default, so this macro needs to be overriden. It is possible to test this behavior using the existing option of overriding lfs_util.h with a custom file, by using a small sed one-line script. But this is much simpler. This does raise the question if more of the configuration options in lfs_util.h should be opened up for function-like macro overrides. Signed-off-by: Xiang Xiao Change-Id: Ie70814e1a2777e19a7310358d3a94ff965287d7b --- fs/littlefs/Make.defs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/fs/littlefs/Make.defs b/fs/littlefs/Make.defs index 1e2c05c957b..7294ba9e045 100644 --- a/fs/littlefs/Make.defs +++ b/fs/littlefs/Make.defs @@ -31,15 +31,13 @@ CSRCS += lfs.c lfs_util.c DEPPATH += --dep-path littlefs/littlefs VPATH += :littlefs/littlefs -ifneq ($(CONFIG_DEBUG_FS_INFO),y) - CFLAGS += -DLFS_NO_DEBUG -endif +CFLAGS += -DLFS_TRACE=finfo +CFLAGS += -DLFS_DEBUG=finfo +CFLAGS += -DLFS_WARN=fwarn +CFLAGS += -DLFS_ERROR=ferr +CFLAGS += -DLFS_ASSERT=DEBUGASSERT -ifneq ($(CONFIG_DEBUG_FS_WARN),y) - CFLAGS += -DLFS_NO_WARN -endif - -LITTLEFS_VERSION ?= 2.2.1 +LITTLEFS_VERSION ?= 2.4.0 LITTLEFS_TARBALL = v$(LITTLEFS_VERSION).tar.gz $(LITTLEFS_TARBALL):