From 968e33a085d629f7b019774f743e1377c034891e Mon Sep 17 00:00:00 2001 From: Wu Jian Gang Date: Wed, 4 Apr 2018 17:46:06 +0800 Subject: [PATCH 1/3] feat(spiffs): Move spiffs to components --- {include/espressif => components/spiffs/include}/esp_spiffs.h | 0 {include/spiffs => components/spiffs/include}/spiffs.h | 0 {include/spiffs => components/spiffs/include}/spiffs_config.h | 0 {include/spiffs => components/spiffs/include}/spiffs_nucleus.h | 0 {third_party/spiffs => components/spiffs/library}/Makefile | 0 {third_party/spiffs => components/spiffs/library}/esp_spiffs.c | 0 {third_party/spiffs => components/spiffs/library}/spiffs_cache.c | 0 {third_party/spiffs => components/spiffs/library}/spiffs_check.c | 0 {third_party/spiffs => components/spiffs/library}/spiffs_gc.c | 0 .../spiffs => components/spiffs/library}/spiffs_hydrogen.c | 0 .../spiffs => components/spiffs/library}/spiffs_nucleus.c | 0 11 files changed, 0 insertions(+), 0 deletions(-) rename {include/espressif => components/spiffs/include}/esp_spiffs.h (100%) rename {include/spiffs => components/spiffs/include}/spiffs.h (100%) rename {include/spiffs => components/spiffs/include}/spiffs_config.h (100%) rename {include/spiffs => components/spiffs/include}/spiffs_nucleus.h (100%) rename {third_party/spiffs => components/spiffs/library}/Makefile (100%) rename {third_party/spiffs => components/spiffs/library}/esp_spiffs.c (100%) rename {third_party/spiffs => components/spiffs/library}/spiffs_cache.c (100%) rename {third_party/spiffs => components/spiffs/library}/spiffs_check.c (100%) rename {third_party/spiffs => components/spiffs/library}/spiffs_gc.c (100%) rename {third_party/spiffs => components/spiffs/library}/spiffs_hydrogen.c (100%) rename {third_party/spiffs => components/spiffs/library}/spiffs_nucleus.c (100%) diff --git a/include/espressif/esp_spiffs.h b/components/spiffs/include/esp_spiffs.h similarity index 100% rename from include/espressif/esp_spiffs.h rename to components/spiffs/include/esp_spiffs.h diff --git a/include/spiffs/spiffs.h b/components/spiffs/include/spiffs.h similarity index 100% rename from include/spiffs/spiffs.h rename to components/spiffs/include/spiffs.h diff --git a/include/spiffs/spiffs_config.h b/components/spiffs/include/spiffs_config.h similarity index 100% rename from include/spiffs/spiffs_config.h rename to components/spiffs/include/spiffs_config.h diff --git a/include/spiffs/spiffs_nucleus.h b/components/spiffs/include/spiffs_nucleus.h similarity index 100% rename from include/spiffs/spiffs_nucleus.h rename to components/spiffs/include/spiffs_nucleus.h diff --git a/third_party/spiffs/Makefile b/components/spiffs/library/Makefile similarity index 100% rename from third_party/spiffs/Makefile rename to components/spiffs/library/Makefile diff --git a/third_party/spiffs/esp_spiffs.c b/components/spiffs/library/esp_spiffs.c similarity index 100% rename from third_party/spiffs/esp_spiffs.c rename to components/spiffs/library/esp_spiffs.c diff --git a/third_party/spiffs/spiffs_cache.c b/components/spiffs/library/spiffs_cache.c similarity index 100% rename from third_party/spiffs/spiffs_cache.c rename to components/spiffs/library/spiffs_cache.c diff --git a/third_party/spiffs/spiffs_check.c b/components/spiffs/library/spiffs_check.c similarity index 100% rename from third_party/spiffs/spiffs_check.c rename to components/spiffs/library/spiffs_check.c diff --git a/third_party/spiffs/spiffs_gc.c b/components/spiffs/library/spiffs_gc.c similarity index 100% rename from third_party/spiffs/spiffs_gc.c rename to components/spiffs/library/spiffs_gc.c diff --git a/third_party/spiffs/spiffs_hydrogen.c b/components/spiffs/library/spiffs_hydrogen.c similarity index 100% rename from third_party/spiffs/spiffs_hydrogen.c rename to components/spiffs/library/spiffs_hydrogen.c diff --git a/third_party/spiffs/spiffs_nucleus.c b/components/spiffs/library/spiffs_nucleus.c similarity index 100% rename from third_party/spiffs/spiffs_nucleus.c rename to components/spiffs/library/spiffs_nucleus.c From 185013df1b2d3f842ce3cf2c628279b3989bc3e8 Mon Sep 17 00:00:00 2001 From: Dong Heng Date: Wed, 4 Apr 2018 17:34:02 +0800 Subject: [PATCH 2/3] feat(spiffs): Add component.mk for spiffs --- components/spiffs/component.mk | 6 ++++ components/spiffs/library/Makefile | 44 ------------------------------ 2 files changed, 6 insertions(+), 44 deletions(-) create mode 100644 components/spiffs/component.mk delete mode 100644 components/spiffs/library/Makefile diff --git a/components/spiffs/component.mk b/components/spiffs/component.mk new file mode 100644 index 00000000..b470ed48 --- /dev/null +++ b/components/spiffs/component.mk @@ -0,0 +1,6 @@ +# +# Component Makefile +# +COMPONENT_ADD_INCLUDEDIRS := include + +COMPONENT_SRCDIRS := library diff --git a/components/spiffs/library/Makefile b/components/spiffs/library/Makefile deleted file mode 100644 index ad8d7a28..00000000 --- a/components/spiffs/library/Makefile +++ /dev/null @@ -1,44 +0,0 @@ - -############################################################# -# Required variables for each makefile -# Discard this section from all parent makefiles -# Expected variables (with automatic defaults): -# CSRCS (all "C" files in the dir) -# SUBDIRS (all subdirs with a Makefile) -# GEN_LIBS - list of libs to be generated () -# GEN_IMAGES - list of images to be generated () -# COMPONENTS_xxx - a list of libs/objs in the form -# subdir/lib to be extracted and rolled up into -# a generated lib/image xxx.a () -# -ifndef PDIR -GEN_LIBS = libspiffs.a -endif - - -############################################################# -# Configuration i.e. compile options etc. -# Target specific stuff (defines etc.) goes in here! -# Generally values applying to a tree are captured in the -# makefile at its root level - these are then overridden -# for a subtree within the makefile rooted therein -# -#DEFINES += - -############################################################# -# Recursion Magic - Don't touch this!! -# -# Each subtree potentially has an include directory -# corresponding to the common APIs applicable to modules -# rooted at that subtree. Accordingly, the INCLUDE PATH -# of a module can only contain the include directories up -# its parent path, and not its siblings -# -# Required for each makefile to inherit from the parent -# - -INCLUDES := $(INCLUDES) -I $(PDIR)include -INCLUDES += -I ./ -PDIR := ../$(PDIR) -sinclude $(PDIR)Makefile - From 1408177a45531e0b44b30aa23c4430b43d62d65e Mon Sep 17 00:00:00 2001 From: Wu Jian Gang Date: Wed, 4 Apr 2018 18:13:02 +0800 Subject: [PATCH 3/3] fix(include): Fix include dependency when esp_spiffs.h moved --- include/espressif/esp_common.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/espressif/esp_common.h b/include/espressif/esp_common.h index 7596201a..8f285625 100644 --- a/include/espressif/esp_common.h +++ b/include/espressif/esp_common.h @@ -100,7 +100,6 @@ #include "esp_system.h" #include "esp_timer.h" #include "esp_ssc.h" -#include "esp_spiffs.h" #include "esp8266/esp8266.h"