summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Van Baren <vanbaren@cideas.com>2007-07-10 20:40:39 -0400
committerGerald Van Baren <vanbaren@cideas.com>2007-08-10 19:21:36 -0400
commite125a2ffc209dd34794e326c7175658253beadf3 (patch)
tree55b0415c7e61a8a79466a0044a28b680668b4dcf
parentfd61e55dd8cb52ce3ff91b3917af26e24b6b0845 (diff)
downloadu-boot-imx-e125a2ffc209dd34794e326c7175658253beadf3.zip
u-boot-imx-e125a2ffc209dd34794e326c7175658253beadf3.tar.gz
u-boot-imx-e125a2ffc209dd34794e326c7175658253beadf3.tar.bz2
Call ft_board_setup() from the bootm command.
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@cideas.com>
-rw-r--r--common/cmd_bootm.c4
-rw-r--r--common/cmd_fdt.c7
-rw-r--r--include/fdt_support.h6
3 files changed, 10 insertions, 7 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 6ce62be..981ffc5 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -973,6 +973,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 */