[U-Boot] [PATCH v3 02/12] image: Remove remaining #ifdefs in image-fit.c
Simon Glass
sjg at chromium.org
Wed May 8 20:05:58 CEST 2013
There are only two left. One is unnecessary and the other can be moved
to the header file.
Signed-off-by: Simon Glass <sjg at chromium.org>
---
Changes in v3: None
Changes in v2:
- Add new patch to remove #ifdefs in image-fit.c
common/image-fit.c | 9 ++-------
common/image.c | 7 +------
include/image.h | 2 ++
3 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/common/image-fit.c b/common/image-fit.c
index 9516abf..ec7b038 100644
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -149,11 +149,8 @@ void fit_print_contents(const void *fit)
const char *p;
time_t timestamp;
-#ifdef USE_HOSTCC
- p = "";
-#else
- p = " ";
-#endif
+ /* Indent string is defined in header image.h */
+ p = IMAGE_INDENT_STRING;
/* Root node properties */
ret = fit_get_desc(fit, 0, &desc);
@@ -1463,7 +1460,6 @@ void fit_conf_print(const void *fit, int noffset, const char *p)
* 1, on success
* 0, on failure
*/
-#ifndef USE_HOSTCC
int fit_check_ramdisk(const void *fit, int rd_noffset, uint8_t arch,
int verify)
{
@@ -1492,4 +1488,3 @@ int fit_check_ramdisk(const void *fit, int rd_noffset, uint8_t arch,
bootstage_mark(BOOTSTAGE_ID_FIT_RD_CHECK_ALL_OK);
return 1;
}
-#endif /* USE_HOSTCC */
diff --git a/common/image.c b/common/image.c
index 564ed90..d249758 100644
--- a/common/image.c
+++ b/common/image.c
@@ -296,12 +296,7 @@ void image_print_contents(const void *ptr)
const image_header_t *hdr = (const image_header_t *)ptr;
const char *p;
-#ifdef USE_HOSTCC
- p = "";
-#else
- p = " ";
-#endif
-
+ p = IMAGE_INDENT_STRING;
printf("%sImage Name: %.*s\n", p, IH_NMLEN, image_get_name(hdr));
if (IMAGE_ENABLE_TIMESTAMP) {
printf("%sCreated: ", p);
diff --git a/include/image.h b/include/image.h
index df020ff..27c977e 100644
--- a/include/image.h
+++ b/include/image.h
@@ -44,6 +44,7 @@
#define CONFIG_FIT_VERBOSE 1 /* enable fit_format_{error,warning}() */
#define IMAGE_ENABLE_IGNORE 0
+#define IMAGE_INDENT_STRING ""
#else
@@ -53,6 +54,7 @@
/* Take notice of the 'ignore' property for hashes */
#define IMAGE_ENABLE_IGNORE 1
+#define IMAGE_INDENT_STRING " "
#endif /* USE_HOSTCC */
--
1.8.2.1
More information about the U-Boot
mailing list