From 3ea2a24b2bc1bb47b66a7f8878b147e4cd02f132 Mon Sep 17 00:00:00 2001 From: EunBong Song Date: Fri, 14 Jul 2017 01:40:24 -0700 Subject: [PATCH] fs: driver: Make configurable BCH driver BCH driver is always compiled. This patch makes BCH driver is configurable. Change-Id: I918e90d154f7fe2d361b2cd3d74915291b8ea449 Signed-off-by: EunBong Song --- build/configs/artik053/extra/defconfig | 2 +- build/configs/artik053/minimal/defconfig | 2 +- build/configs/artik053/nettest/defconfig | 2 +- build/configs/artik053/tash/defconfig | 2 +- build/configs/artik053/typical/defconfig | 2 +- build/configs/sidk_s5jt200/hello_with_tash/defconfig | 2 +- build/configs/sidk_s5jt200/kernel_sample/defconfig | 2 +- build/configs/sidk_s5jt200/sidk_tash_wlan/defconfig | 2 +- build/configs/sidk_s5jt200/tc/defconfig | 2 +- os/drivers/Kconfig | 3 --- os/drivers/bch/Make.defs | 2 ++ os/fs/vfs/fs_open.c | 2 +- 12 files changed, 12 insertions(+), 13 deletions(-) diff --git a/build/configs/artik053/extra/defconfig b/build/configs/artik053/extra/defconfig index 1c69c1c..3b79e1f 100644 --- a/build/configs/artik053/extra/defconfig +++ b/build/configs/artik053/extra/defconfig @@ -462,7 +462,7 @@ CONFIG_SPI=y # CONFIG_SPI_BITBANG is not set CONFIG_GPIO=y CONFIG_I2S=y -# CONFIG_BCH is not set +CONFIG_BCH=y CONFIG_RTC=y CONFIG_RTC_DATETIME=y # CONFIG_RTC_ALARM is not set diff --git a/build/configs/artik053/minimal/defconfig b/build/configs/artik053/minimal/defconfig index a8bc087..97741b0 100644 --- a/build/configs/artik053/minimal/defconfig +++ b/build/configs/artik053/minimal/defconfig @@ -416,7 +416,7 @@ CONFIG_SPI=y # CONFIG_SPI_BITBANG is not set CONFIG_GPIO=y # CONFIG_I2S is not set -# CONFIG_BCH is not set +CONFIG_BCH=y CONFIG_RTC=y CONFIG_RTC_DATETIME=y # CONFIG_RTC_ALARM is not set diff --git a/build/configs/artik053/nettest/defconfig b/build/configs/artik053/nettest/defconfig index d8fd9a3..d327eb3 100644 --- a/build/configs/artik053/nettest/defconfig +++ b/build/configs/artik053/nettest/defconfig @@ -481,7 +481,7 @@ CONFIG_SPI=y # CONFIG_SPI_BITBANG is not set CONFIG_GPIO=y # CONFIG_I2S is not set -# CONFIG_BCH is not set +CONFIG_BCH=y CONFIG_RTC=y CONFIG_RTC_DATETIME=y # CONFIG_RTC_ALARM is not set diff --git a/build/configs/artik053/tash/defconfig b/build/configs/artik053/tash/defconfig index b7492f8..52653dc 100644 --- a/build/configs/artik053/tash/defconfig +++ b/build/configs/artik053/tash/defconfig @@ -441,7 +441,7 @@ CONFIG_SPI=y # CONFIG_SPI_BITBANG is not set CONFIG_GPIO=y # CONFIG_I2S is not set -# CONFIG_BCH is not set +CONFIG_BCH=y CONFIG_RTC=y CONFIG_RTC_DATETIME=y # CONFIG_RTC_ALARM is not set diff --git a/build/configs/artik053/typical/defconfig b/build/configs/artik053/typical/defconfig index 46d62c6..be5b1be 100644 --- a/build/configs/artik053/typical/defconfig +++ b/build/configs/artik053/typical/defconfig @@ -462,7 +462,7 @@ CONFIG_SPI=y # CONFIG_SPI_BITBANG is not set CONFIG_GPIO=y # CONFIG_I2S is not set -# CONFIG_BCH is not set +CONFIG_BCH=y CONFIG_RTC=y CONFIG_RTC_DATETIME=y # CONFIG_RTC_ALARM is not set diff --git a/build/configs/sidk_s5jt200/hello_with_tash/defconfig b/build/configs/sidk_s5jt200/hello_with_tash/defconfig index efb7b94..bbc3789 100644 --- a/build/configs/sidk_s5jt200/hello_with_tash/defconfig +++ b/build/configs/sidk_s5jt200/hello_with_tash/defconfig @@ -446,7 +446,7 @@ CONFIG_SPI=y # CONFIG_SPI_BITBANG is not set CONFIG_GPIO=y # CONFIG_I2S is not set -# CONFIG_BCH is not set +CONFIG_BCH=y CONFIG_RTC=y CONFIG_RTC_DATETIME=y # CONFIG_RTC_ALARM is not set diff --git a/build/configs/sidk_s5jt200/kernel_sample/defconfig b/build/configs/sidk_s5jt200/kernel_sample/defconfig index 11248b4..83dec57 100644 --- a/build/configs/sidk_s5jt200/kernel_sample/defconfig +++ b/build/configs/sidk_s5jt200/kernel_sample/defconfig @@ -447,7 +447,7 @@ CONFIG_SPI=y # CONFIG_SPI_BITBANG is not set CONFIG_GPIO=y # CONFIG_I2S is not set -# CONFIG_BCH is not set +CONFIG_BCH=y CONFIG_RTC=y CONFIG_RTC_DATETIME=y # CONFIG_RTC_ALARM is not set diff --git a/build/configs/sidk_s5jt200/sidk_tash_wlan/defconfig b/build/configs/sidk_s5jt200/sidk_tash_wlan/defconfig index 6444e8b..b08db8f 100644 --- a/build/configs/sidk_s5jt200/sidk_tash_wlan/defconfig +++ b/build/configs/sidk_s5jt200/sidk_tash_wlan/defconfig @@ -461,7 +461,7 @@ CONFIG_SPI=y # CONFIG_SPI_BITBANG is not set CONFIG_GPIO=y # CONFIG_I2S is not set -# CONFIG_BCH is not set +CONFIG_BCH=y CONFIG_RTC=y CONFIG_RTC_DATETIME=y # CONFIG_RTC_ALARM is not set diff --git a/build/configs/sidk_s5jt200/tc/defconfig b/build/configs/sidk_s5jt200/tc/defconfig index 6dd21d9..52fc904 100644 --- a/build/configs/sidk_s5jt200/tc/defconfig +++ b/build/configs/sidk_s5jt200/tc/defconfig @@ -451,7 +451,7 @@ CONFIG_SPI=y # CONFIG_SPI_BITBANG is not set CONFIG_GPIO=y # CONFIG_I2S is not set -# CONFIG_BCH is not set +CONFIG_BCH=y CONFIG_RTC=y CONFIG_RTC_DATETIME=y # CONFIG_RTC_ALARM is not set diff --git a/os/drivers/Kconfig b/os/drivers/Kconfig index e0e1dc5..b35154e 100644 --- a/os/drivers/Kconfig +++ b/os/drivers/Kconfig @@ -219,9 +219,6 @@ menuconfig BCH that performed by loop.c. See include/tinyara/fs/fs.h for registration information. -if BCH -endif # BCH - menuconfig RTC bool "RTC Driver Support" default n diff --git a/os/drivers/bch/Make.defs b/os/drivers/bch/Make.defs index 35c2470..704c20f 100644 --- a/os/drivers/bch/Make.defs +++ b/os/drivers/bch/Make.defs @@ -55,6 +55,7 @@ ifneq ($(CONFIG_DISABLE_MOUNTPOINT),y) # Include BCH driver +ifeq ($(CONFIG_BCH),y) CSRCS += bchlib_setup.c bchlib_teardown.c bchlib_read.c bchlib_write.c \ bchlib_cache.c bchlib_sem.c bchdev_register.c bchdev_unregister.c \ bchdev_driver.c @@ -67,3 +68,4 @@ CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM endif endif +endif diff --git a/os/fs/vfs/fs_open.c b/os/fs/vfs/fs_open.c index 39700a6..820a416 100644 --- a/os/fs/vfs/fs_open.c +++ b/os/fs/vfs/fs_open.c @@ -146,7 +146,7 @@ int open(const char *path, int oflags, ...) } #if !defined(CONFIG_DISABLE_MOUNTPOINT) && \ - !defined(CONFIG_DISABLE_PSEUDOFS_OPERATIONS) + !defined(CONFIG_DISABLE_PSEUDOFS_OPERATIONS) && defined(CONFIG_BCH) /* * If the inode is block driver, then we may return a character driver * proxy for the block driver. block_proxy() will instantiate a BCH -- 2.7.4