commit 8cd7c4d44f1617797eda578d28437b8ef417cd80
author Rob Herring <rob.herring@calxeda.com> Mon Sep 10 08:24:51 2012 -0500
committer John Rigby <john.rigby@linaro.org> Thu Dec 06 13:51:51 2012 -0700
tree 7db4550f77926d70b0f6f78fc7c655b5c823e8ae
parent d790b518416e61512700cdb10eeb99bbe0a7ce9f

ARM: add optional call to ft_board_setup

Allow board specific FDT fixups on ARM using the ft_board_setup function.
This is enabled using CONFIG_OF_BOARD_SETUP define.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>

arch/arm/lib/bootm.c

diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index 37476cc..9f31307 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -265,6 +265,11 @@
 	ft_board_setup(*of_flat_tree, gd->bd);
 #endif
 
+#ifdef CONFIG_OF_BOARD_SETUP
+	/* Call the board-specific fixup routine */
+	ft_board_setup(*of_flat_tree, gd->bd);
+#endif
+
 	return 0;
 }
 #endif