V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

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>
This commit is contained in:
Simon Glass 2013-05-08 08:05:58 +00:00 committed by Tom Rini
parent aa6d6db4d4
commit 1fe7d93891
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/image-fit.c
View File

@ -149,11 +149,8 @@ void fit_print_contents(const void *fit)
const char *p; const char *p;
time_t timestamp; time_t timestamp;
#ifdef USE_HOSTCC /* Indent string is defined in header image.h */
p = ""; p = IMAGE_INDENT_STRING;
#else
p = " ";
#endif
/* Root node properties */ /* Root node properties */
ret = fit_get_desc(fit, 0, &desc); 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 * 1, on success
* 0, on failure * 0, on failure
*/ */
#ifndef USE_HOSTCC
int fit_check_ramdisk(const void *fit, int rd_noffset, uint8_t arch, int fit_check_ramdisk(const void *fit, int rd_noffset, uint8_t arch,
int verify) 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); bootstage_mark(BOOTSTAGE_ID_FIT_RD_CHECK_ALL_OK);
return 1; return 1;
} }
#endif /* USE_HOSTCC */

7
common/image.c
View File

@ -296,12 +296,7 @@ void image_print_contents(const void *ptr)
const image_header_t *hdr = (const image_header_t *)ptr; const image_header_t *hdr = (const image_header_t *)ptr;
const char *p; const char *p;
#ifdef USE_HOSTCC p = IMAGE_INDENT_STRING;
p = "";
#else
p = " ";
#endif
printf("%sImage Name: %.*s\n", p, IH_NMLEN, image_get_name(hdr)); printf("%sImage Name: %.*s\n", p, IH_NMLEN, image_get_name(hdr));
if (IMAGE_ENABLE_TIMESTAMP) { if (IMAGE_ENABLE_TIMESTAMP) {
printf("%sCreated: ", p); printf("%sCreated: ", p);

2
include/image.h
View File

@ -44,6 +44,7 @@
#define CONFIG_FIT_VERBOSE 1 /* enable fit_format_{error,warning}() */ #define CONFIG_FIT_VERBOSE 1 /* enable fit_format_{error,warning}() */
#define IMAGE_ENABLE_IGNORE 0 #define IMAGE_ENABLE_IGNORE 0
#define IMAGE_INDENT_STRING ""
#else #else
@ -53,6 +54,7 @@
/* Take notice of the 'ignore' property for hashes */ /* Take notice of the 'ignore' property for hashes */
#define IMAGE_ENABLE_IGNORE 1 #define IMAGE_ENABLE_IGNORE 1
#define IMAGE_INDENT_STRING " "
#endif /* USE_HOSTCC */ #endif /* USE_HOSTCC */