On Sat, Jun 09, 2018 at 05:55:11PM -0500, Adam Ford wrote:
When enabling BLOCK_CACHE on devices with limited RAM during SPL, some devices may not boot. This creates an option to enable block caching in SPL by defaults off. It is dependent on BLOCK_CACHE and SPL_BLK
Fixes: 46960ad6d09b ("block: Have BLOCK_CACHE default to y in some cases")
Signed-off-by: Adam Ford aford173@gmail.com
V2: Clean up macros and ifdefs
[snip]
diff --git a/include/blk.h b/include/blk.h index fc0c239e46..bd90e39932 100644 --- a/include/blk.h +++ b/include/blk.h @@ -111,7 +111,8 @@ struct blk_desc { #define PAD_TO_BLOCKSIZE(size, blk_desc) \ (PAD_SIZE(size, blk_desc->blksz))
-#ifdef CONFIG_BLOCK_CACHE +#if (CONFIG_IS_ENABLED(BLOCK_CACHE) && !CONFIG_IS_ENABLED(SPL_BUILD)) || \
(CONFIG_IS_ENABLED(SPL_BLOCK_CACHE) && CONFIG_IS_ENABLED(SPL_BUILD))/**
- blkcache_read() - attempt to read a set of blocks from cache
CONFIG_IS_ENABLED(FOO) has the logic for checking for SPL_FOO and SPL_BUILD and so forth. Thanks!