[PATCH 18/26 v6] spl: spl_legacy: Use IS_ENABLED() to remove #ifdef

Stefan Roese
2020-04-08T08:09:34Z

Use IS_ENABLED() instead of #ifdef CONFIG_ to remove one #ifdef.

No functional change intended.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Weijie Gao <weijie.gao@mediatek.com>
Cc: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
---
Changes in v6:
- New patch

common/spl/spl_legacy.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/common/spl/spl_legacy.c b/common/spl/spl_legacy.c
index 33f3587e3b..772135193e 100644
--- a/common/spl/spl_legacy.c
+++ b/common/spl/spl_legacy.c
@@ -11,13 +11,12 @@ int spl_parse_legacy_header(struct spl_image_info *spl_image,
{
u32 header_size = sizeof(struct image_header);

-#ifdef CONFIG_SPL_LEGACY_IMAGE_CRC_CHECK
/* check uImage header CRC */
- if (!image_check_hcrc(header)) {
+ if (IS_ENABLED(CONFIG_SPL_LEGACY_IMAGE_CRC_CHECK) &&
+ !image_check_hcrc(header)) {
puts("SPL: Image header CRC check failed!\n");
return -EINVAL;
}
-#endif

if (spl_image->flags & SPL_COPY_PAYLOAD_ONLY) {
/*
--
2.26.0