[U-Boot] [WIP][PATCH 07/11] bootm: Set working fdt address as part of the bootm flow
Kumar Gala
galak at kernel.crashing.org
Tue Aug 12 15:44:32 CEST 2008
Set the fdt working address so "fdt FOO" commands can be used as part
of the bootm flow.
Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
---
common/cmd_bootm.c | 9 +++++++++
common/cmd_fdt.c | 5 +++++
common/image.c | 1 +
include/fdt_support.h | 2 ++
4 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 918ea98..c5dbf76 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -44,6 +44,13 @@
#include <hush.h>
#endif
+#if defined(CONFIG_OF_LIBFDT)
+#include <fdt.h>
+#include <libfdt.h>
+#include <fdt_support.h>
+#endif
+
+
DECLARE_GLOBAL_DATA_PTR;
extern int gunzip (void *dst, int dstlen, unsigned char *src, unsigned long *lenp);
@@ -267,6 +274,8 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
puts ("Could not find a valid device tree\n");
return 1;
}
+
+ set_working_fdt_addr(images.ft_addr);
#endif
}
diff --git a/common/cmd_fdt.c b/common/cmd_fdt.c
index d3b19dd..44acc34 100644
--- a/common/cmd_fdt.c
+++ b/common/cmd_fdt.c
@@ -50,6 +50,11 @@ static int fdt_print(const char *pathp, char *prop, int depth);
*/
struct fdt_header *working_fdt;
+void set_working_fdt_addr(void *addr)
+{
+ working_fdt = addr;
+}
+
/*
* Flattened Device Tree command, see the help for parameter definitions.
*/
diff --git a/common/image.c b/common/image.c
index e7cb57c..60e1c9d 100644
--- a/common/image.c
+++ b/common/image.c
@@ -1245,6 +1245,7 @@ int boot_relocate_fdt (struct lmb *lmb, ulong bootmap_base,
*of_size = of_len;
}
+ set_working_fdt_addr(*of_flat_tree);
return 0;
error:
diff --git a/include/fdt_support.h b/include/fdt_support.h
index a7c6326..761f85c 100644
--- a/include/fdt_support.h
+++ b/include/fdt_support.h
@@ -68,5 +68,7 @@ void ft_cpu_setup(void *blob, bd_t *bd);
void ft_pci_setup(void *blob, bd_t *bd);
#endif
+void set_working_fdt_addr(void *addr);
+
#endif /* ifdef CONFIG_OF_LIBFDT */
#endif /* ifndef __FDT_SUPPORT_H */
--
1.5.5.1
More information about the U-Boot
mailing list