[U-Boot-Users] [PATCH] Call ft_board_setup() from the bootm command.
Jerry Van Baren
gvb.uboot at gmail.com
Wed Jul 11 02:45:10 CEST 2007
In the patch titled "Create new fdt boardsetup command..." I removed the
call to ft_board_setup() from the routine fdt_chosen(), but I forgot
to add a direct call back into cmd_bootm.c
This fixes the oversight by adding the direct call to the bootm command.
Signed-off-by: Gerald Van Baren <vanbaren at cideas.com>
---
Thanks, Timur, for finding the screwup.
gvb
common/cmd_bootm.c | 4 ++++
common/cmd_fdt.c | 7 -------
include/fdt_support.h | 6 ++++++
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index cf5dafd..c8825b6 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -980,6 +980,10 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
do_reset (cmdtp, flag, argc, argv);
}
#endif
+#ifdef CONFIG_OF_BOARD_SETUP
+ /* Call the board-specific fixup routine */
+ ft_board_setup(fdt, gd->bd);
+#endif
#endif /* CONFIG_OF_LIBFDT */
#if defined(CONFIG_OF_FLAT_TREE)
/* move of_flat_tree if needed */
diff --git a/common/cmd_fdt.c b/common/cmd_fdt.c
index 824088c..9ddec47 100644
--- a/common/cmd_fdt.c
+++ b/common/cmd_fdt.c
@@ -44,13 +44,6 @@
*/
DECLARE_GLOBAL_DATA_PTR;
-/*
- * Function prototypes/declarations.
- */
-#ifdef CONFIG_OF_BOARD_SETUP
-void ft_board_setup(void *blob, bd_t *bd);
-#endif
-
static int fdt_valid(void);
static int fdt_parse_prop(char *pathp, char *prop, char *newval,
char *data, int *len);
diff --git a/include/fdt_support.h b/include/fdt_support.h
index a276834..60fa423 100644
--- a/include/fdt_support.h
+++ b/include/fdt_support.h
@@ -38,5 +38,11 @@ int fdt_env(void *fdt);
int fdt_bd_t(void *fdt);
#endif
+#ifdef CONFIG_OF_BOARD_SETUP
+void ft_board_setup(void *blob, bd_t *bd);
+void ft_cpu_setup(void *blob, bd_t *bd);
+void ft_pci_setup(void *blob, bd_t *bd);
+#endif
+
#endif /* ifdef CONFIG_OF_LIBFDT */
#endif /* ifndef __FDT_SUPPORT_H */
--
1.4.4.4
More information about the U-Boot
mailing list