summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2013-05-08 08:05:58 +0000
committerTom Rini <trini@ti.com>2013-05-14 15:37:25 -0400
commit1fe7d93891905b9af1d81c9aef7b5646452ceb41 (patch)
tree30bb6a12d24fcb9912eaf2032cb6417dea39c622 /common
parentaa6d6db4d4e85f2cae5553a27d1140069fd3e8e1 (diff)
downloadu-boot-imx-1fe7d93891905b9af1d81c9aef7b5646452ceb41.zip
u-boot-imx-1fe7d93891905b9af1d81c9aef7b5646452ceb41.tar.gz
u-boot-imx-1fe7d93891905b9af1d81c9aef7b5646452ceb41.tar.bz2
image: Remove remaining #ifdefs in image-fit.c
There are only two left. One is unnecessary and the other can be moved to the header file. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common')
-rw-r--r--common/image-fit.c9
-rw-r--r--common/image.c7
2 files changed, 3 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);