From mboxrd@z Thu Jan 1 00:00:00 1970 From: gvb.uboot Date: Mon, 26 Nov 2007 21:32:09 -0500 Subject: [U-Boot-Users] [PATCH] Make it possible to use a builtin OF tree. In-Reply-To: <474AD22C.1020500@ge.com> References: <1196016748-2121-1-git-send-email-Joakim.Tjernlund@transmode.se> <474AD22C.1020500@ge.com> Message-ID: <474B81A9.3070605@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Jerry Van Baren wrote: > Joakim Tjernlund wrote: >> Signed-off-by: Joakim Tjernlund >> --- >> common/cmd_bootm.c | 5 ++++- >> 1 files changed, 4 insertions(+), 1 deletions(-) >> >> diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c >> index d816349..8405de7 100644 >> --- a/common/cmd_bootm.c >> +++ b/common/cmd_bootm.c >> @@ -507,6 +507,9 @@ fixup_silent_linux () >> #endif /* CONFIG_SILENT_CONSOLE */ >> >> #ifdef CONFIG_PPC >> +#ifndef DEFAULT_OF_TREE >> + #define DEFAULT_OF_TREE NULL >> +#endif >> static void __attribute__((noinline)) >> do_bootm_linux (cmd_tbl_t *cmdtp, int flag, >> int argc, char *argv[], >> @@ -527,7 +530,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag, >> void (*kernel)(bd_t *, ulong, ulong, ulong, ulong); >> image_header_t *hdr = &header; >> #if defined(CONFIG_OF_FLAT_TREE) || defined(CONFIG_OF_LIBFDT) >> - char *of_flat_tree = NULL; >> + char *of_flat_tree = DEFAULT_OF_TREE; >> ulong of_data = 0; >> #endif > > The loss was most likely my error/misunderstanding way back at the start > of LIBFDT. Your change seems reasonable, I'll add it to my list of > patches to look into and add. > > Thanks, > gvb Hi Joakim, I looked for the definition of DEFAULT_OF_TREE and it doesn't exist in the current u-boot. I used the gitweb "pickaxe" to look for DEFAULT_OF_TREE and didn't find it that way either. Can you identify when we lost the definition? The problem with your patch is that, if DEFAULT_OF_TREE isn't defined by somebody, the builds will break. Since it is undefined at the moment, that means *all* of the OF_FLAT_TREE and OF_LIBFDT builds would break. :-( Thanks, gvb