From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jerry Van Baren <gerald.vanbaren@ge.com>
Date: Fri, 26 Sep 2008 11:06:19 -0400
Subject: [U-Boot] [PATCH] fdt: Overwrite /chosen node in bootm if it
 already exists in the dtb
In-Reply-To: <1222441406-5353-1-git-send-email-sr@denx.de>
References: <1222441406-5353-1-git-send-email-sr@denx.de>
Message-ID: <48DCFA6B.1070501@ge.com>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

Stefan Roese wrote:
> Set force parameter in fdt_chosen() call in do_bootm_linux() call.
> Without this, the chosen node is not overwritten if it already
> exists.
> 
> Signed-off-by: Stefan Roese <sr@denx.de>
> ---
>  lib_ppc/bootm.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/lib_ppc/bootm.c b/lib_ppc/bootm.c
> index 38266e1..5af25dd 100644
> --- a/lib_ppc/bootm.c
> +++ b/lib_ppc/bootm.c
> @@ -145,7 +145,7 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
>  	 * if the user wants it (the logic is in the subroutines).
>  	 */
>  	if (of_size) {
> -		if (fdt_chosen(of_flat_tree, 0) < 0) {
> +		if (fdt_chosen(of_flat_tree, 1) < 0) {
>  			puts ("ERROR: ");
>  			puts ("/chosen node create failed");
>  			puts (" - must RESET the board to recover.\n");

Acked-by: Gerald Van Baren <vanbaren@cideas.com>

Please apply, Wolfgang, and fix the error in my recollection.  :-)

gvb