summaryrefslogtreecommitdiff
path: root/arch/arm/lib
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2011-06-21 08:48:56 -0700
committerSimon Glass <sjg@chromium.org>2011-08-29 10:39:34 -0700
commitea1e225fb9a6a0dbd5a810a1de711e308bc4b175 (patch)
treefd243feeb7f82456470ca7a190faec7529aeefe7 /arch/arm/lib
parentd82bf0abd79b65282349663f45e2f602cd70dd52 (diff)
fdt: Add DEV_TREE_SEPARATE to provide an fdt separate from image
This adds support for an FDT to be concatenated to the u-boot-bin binary. This is located at run-time by U-Boot. BUG=chromium-os:11623 TEST=Either emerge with http://gerrit.chromium.org/gerrit/2961 or build manually: make ... DEV_TREE_SEPARATE=true and check that u-boot.dtb is built. Change-Id: I7c8b1315d721bc957ef3fd07f167d86345868036 Reviewed-on: http://gerrit.chromium.org/gerrit/2962 Reviewed-by: Simon Glass <sjg@chromium.org> Tested-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/arm/lib')
-rw-r--r--arch/arm/lib/board.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
index 3bb80fc100..2f34677e87 100644
--- a/arch/arm/lib/board.c
+++ b/arch/arm/lib/board.c
@@ -297,6 +297,9 @@ void board_init_f (ulong bootflag)
#ifdef CONFIG_OF_EMBED
/* Get a pointer to the FDT */
gd->blob = _binary_dt_dtb_start;
+#elif defined CONFIG_OF_SEPARATE
+ /* FDT is at end of image */
+ gd->blob = (void*)(_end_ofs + _TEXT_BASE);
#endif
for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) {