summaryrefslogtreecommitdiff
path: root/include/image.h
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-12-05 02:11:59 +0100
committerWolfgang Denk <wd@denx.de>2009-12-05 02:11:59 +0100
commit2a49bf3149e34e6f910e70bbc0a26e81cfdbdf70 (patch)
treee19b3def6c8f41f56cdb5e8b71aa53d8f72f5812 /include/image.h
parentcd514aeb996e2f7aefbe1f78481965d9d074aed4 (diff)
parentf68ab43de67f59925542efb6bcec30f4a84fe695 (diff)
downloadu-boot-imx-2a49bf3149e34e6f910e70bbc0a26e81cfdbdf70.zip
u-boot-imx-2a49bf3149e34e6f910e70bbc0a26e81cfdbdf70.tar.gz
u-boot-imx-2a49bf3149e34e6f910e70bbc0a26e81cfdbdf70.tar.bz2
Merge branch 'master' into next
Conflicts: board/esd/plu405/plu405.c drivers/rtc/ftrtc010.c Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include/image.h')
-rw-r--r--include/image.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/image.h b/include/image.h
index cc38eae..d2e78fe 100644
--- a/include/image.h
+++ b/include/image.h
@@ -220,12 +220,10 @@ typedef struct bootm_headers {
const char *fit_uname_rd; /* init ramdisk subimage node unit name */
int fit_noffset_rd; /* init ramdisk subimage node offset */
-#if defined(CONFIG_PPC)
void *fit_hdr_fdt; /* FDT blob FIT image header */
const char *fit_uname_fdt; /* FDT blob subimage node unit name */
int fit_noffset_fdt;/* FDT blob subimage node offset */
#endif
-#endif
#ifndef USE_HOSTCC
image_info_t os; /* os image info */