summaryrefslogtreecommitdiff
path: root/lib_ppc
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2008-10-13 11:17:31 +0200
committerStefan Roese <sr@denx.de>2008-10-13 11:17:31 +0200
commit1f6aa622e365fef9d87de84753eb08347e310a2a (patch)
tree232149e6d93c9387b03628c5d3283cecf7719476 /lib_ppc
parent542b385a620a1783454a00424930e51895f45073 (diff)
parentdf4a0796e86662536df2387ddcf969c2a704bcc2 (diff)
downloadu-boot-imx-1f6aa622e365fef9d87de84753eb08347e310a2a.zip
u-boot-imx-1f6aa622e365fef9d87de84753eb08347e310a2a.tar.gz
u-boot-imx-1f6aa622e365fef9d87de84753eb08347e310a2a.tar.bz2
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
Diffstat (limited to 'lib_ppc')
-rw-r--r--lib_ppc/bootm.c2
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");