summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRamesh Thomas <ramesh.thomas@intel.com>2016-10-29 04:10:36 -0700
committerAnas Nashif <nashif@linux.intel.com>2016-10-30 13:23:58 +0000
commite354ad2a3618e074d6cec5eba923986902fe2b05 (patch)
treeafe39e44bc704b5bc210946142af5047f1d61159
parentf18f861bbdb2cebe7ec084abd3284d87d3872366 (diff)
fs: Move file system code to subsys/
Subsystems code will reside in subsys/ folder. This patch creates the folder and moves FS code there. Jira: ZEP-1120 Change-Id: If3b1bcb996c5fbd4056cd5d1920d41d29810d6b2 Signed-off-by: Ramesh Thomas <ramesh.thomas@intel.com>
-rw-r--r--Kconfig.zephyr2
-rw-r--r--MAINTAINERS2
-rw-r--r--Makefile4
-rw-r--r--subsys/Kconfig18
-rw-r--r--subsys/Makefile1
-rw-r--r--subsys/fs/Kconfig (renamed from fs/Kconfig)0
-rw-r--r--subsys/fs/Makefile (renamed from fs/Makefile)0
-rw-r--r--subsys/fs/fat_flash_diskio.c (renamed from fs/fat_flash_diskio.c)0
-rw-r--r--subsys/fs/fat_fs.c (renamed from fs/fat_fs.c)0
-rw-r--r--subsys/fs/fat_ram_diskio.c (renamed from fs/fat_ram_diskio.c)0
10 files changed, 23 insertions, 4 deletions
diff --git a/Kconfig.zephyr b/Kconfig.zephyr
index 6d513a641..2f33a2ae3 100644
--- a/Kconfig.zephyr
+++ b/Kconfig.zephyr
@@ -32,7 +32,7 @@ source "misc/Kconfig"
source "lib/Kconfig"
-source "fs/Kconfig"
+source "subsys/Kconfig"
source "ext/Kconfig"
diff --git a/MAINTAINERS b/MAINTAINERS
index c0ca58eb0..18ebc141d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -188,7 +188,7 @@ M: Ramesh Thomas <ramesh.thomas@intel.com>
M: Kuo-Lang Tseng <kuo-lang.tseng@intel.com>
S: Supported
F: ext/fs/
-F: fs/
+F: subsys/fs/
F: include/fs/
F: include/fs.h
F: samples/fs/
diff --git a/Makefile b/Makefile
index 64bcf816a..4899cdca9 100644
--- a/Makefile
+++ b/Makefile
@@ -579,9 +579,9 @@ endif # $(dot-config)
# Unified kernel objects are built as a static library
ifeq ($(CONFIG_KERNEL_V2),y)
libs-y := kernel/unified/
-core-y := lib/ misc/ net/ boards/ ext/ usb/ fs/ tests/ arch/
+core-y := lib/ misc/ net/ boards/ ext/ usb/ subsys/ tests/ arch/
else
-core-y := lib/ kernel/ misc/ net/ boards/ ext/ usb/ fs/ tests/ arch/
+core-y := lib/ kernel/ misc/ net/ boards/ ext/ usb/ subsys/ tests/ arch/
endif
drivers-y := drivers/
diff --git a/subsys/Kconfig b/subsys/Kconfig
new file mode 100644
index 000000000..915566276
--- /dev/null
+++ b/subsys/Kconfig
@@ -0,0 +1,18 @@
+# Kconfig - Subsystem configuration options
+#
+# Copyright (c) 2016 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+source "subsys/fs/Kconfig"
diff --git a/subsys/Makefile b/subsys/Makefile
new file mode 100644
index 000000000..dbce76108
--- /dev/null
+++ b/subsys/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_FILE_SYSTEM) += fs/
diff --git a/fs/Kconfig b/subsys/fs/Kconfig
index 482dcf54d..482dcf54d 100644
--- a/fs/Kconfig
+++ b/subsys/fs/Kconfig
diff --git a/fs/Makefile b/subsys/fs/Makefile
index ed9c06378..ed9c06378 100644
--- a/fs/Makefile
+++ b/subsys/fs/Makefile
diff --git a/fs/fat_flash_diskio.c b/subsys/fs/fat_flash_diskio.c
index bd08eba42..bd08eba42 100644
--- a/fs/fat_flash_diskio.c
+++ b/subsys/fs/fat_flash_diskio.c
diff --git a/fs/fat_fs.c b/subsys/fs/fat_fs.c
index 414241e3b..414241e3b 100644
--- a/fs/fat_fs.c
+++ b/subsys/fs/fat_fs.c
diff --git a/fs/fat_ram_diskio.c b/subsys/fs/fat_ram_diskio.c
index 565e30378..565e30378 100644
--- a/fs/fat_ram_diskio.c
+++ b/subsys/fs/fat_ram_diskio.c