summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/spl.h18
1 files changed, 7 insertions, 11 deletions
diff --git a/include/spl.h b/include/spl.h
index f92089b69ea..fb26e3f5537 100644
--- a/include/spl.h
+++ b/include/spl.h
@@ -306,31 +306,27 @@ struct spl_load_info {
void *buf);
#if IS_ENABLED(CONFIG_SPL_LOAD_BLOCK)
int bl_len;
+#endif
};
static inline int spl_get_bl_len(struct spl_load_info *info)
{
+#if IS_ENABLED(CONFIG_SPL_LOAD_BLOCK)
return info->bl_len;
-}
-
-static inline void spl_set_bl_len(struct spl_load_info *info, int bl_len)
-{
- info->bl_len = bl_len;
-}
#else
-};
-
-static inline int spl_get_bl_len(struct spl_load_info *info)
-{
return 1;
+#endif
}
static inline void spl_set_bl_len(struct spl_load_info *info, int bl_len)
{
+#if IS_ENABLED(CONFIG_SPL_LOAD_BLOCK)
+ info->bl_len = bl_len;
+#else
if (bl_len != 1)
panic("CONFIG_SPL_LOAD_BLOCK not enabled");
-}
#endif
+}
/*
* We need to know the position of U-Boot in memory so we can jump to it. We