Call ft_board_setup() from the bootm command.

PATCH New Jerry Van Baren 1 participant 1 message Jul 11, 2007

Share & tools

Jerry Van Baren

author

2007-07-11 00:45 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---

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(-)

common/cmd_bootm.c +4 -0

index cf5dafd..c8825b6 100644
@@ -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 */

common/cmd_fdt.c +0 -7

index 824088c..9ddec47 100644
@@ -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);

include/fdt_support.h +6 -0

index a276834..60fa423 100644
@@ -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 */

Signature · 1 line

1.4.4.4