path: root/common/image.c
diff options
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-11-24 13:33:51 +0100
committerWolfgang Denk <wd@denx.de>2008-12-13 23:31:49 +0100
commitcd6734510a9ff0f41c4a73567d4080ea0033d2c1 (patch)
treefc9636d5e17498770310e62ee22461d2925db27d /common/image.c
parent89d56f5503eed351efe5ab0b4dd0f1e888fd2336 (diff)
Fix FIT and FDT support to have CONFIG_OF_LIBFDT and CONFIG_FIT independent
FDT support is used for both FIT style images and for architectures that can pass a fdt blob to an OS (ppc, m68k, sparc). For other architectures and boards which do not pass a fdt blob to an OS but want to use the new uImage format, we just need FIT support. Now we can have the 4 following configurations : 1) FIT only CONFIG_FIT 2) fdt blob only CONFIG_OF_LIBFDT 3) both CONFIG_OF_LIBFDT & CONFIG_FIT 4) none none Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'common/image.c')
1 files changed, 2 insertions, 0 deletions
diff --git a/common/image.c b/common/image.c
index 866edf619..daa68bc2d 100644
--- a/common/image.c
+++ b/common/image.c
@@ -1071,6 +1071,7 @@ int boot_ramdisk_high (struct lmb *lmb, ulong rd_data, ulong rd_len,
return -1;
+#endif /* defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_SPARC) */
static void fdt_error (const char *msg)
@@ -1575,6 +1576,7 @@ error:
#endif /* CONFIG_OF_LIBFDT */
+#if defined(CONFIG_PPC) || defined(CONFIG_M68K)
* boot_get_cmdline - allocate and initialize kernel cmdline
* @lmb: pointer to lmb handle, will be used for memory mgmt