u-boot.git/common/cmd_bootm.c, branch v1.3.2 Unnamed repository; edit this file 'description' to name the repository. Merge git://www.denx.de/git/u-boot 2007-11-28T15:56:37+00:00 Nobuhiro Iwamatsu iwamatsu@nigauri.org 2007-11-28T15:56:37+00:00 7fc792895be3c0edf423c4038992b40345672a12 Conflicts: drivers/Makefile 
Conflicts:

	drivers/Makefile
Fix two typos. 2007-10-19T14:47:26+00:00 Detlev Zundel dzu@denx.de 2007-10-19T14:47:26+00:00 5441f61a3d8b7034f19fc1361183e936198e6dbb Signed-off-by: Detlev Zundel <dzu@denx.de> 
Signed-off-by: Detlev Zundel <dzu@denx.de>
Merge git://www.denx.de/git/u-boot 2007-09-22T16:29:43+00:00 Nobuhiro Iwamatsu iwamatsu@nigauri.org 2007-09-22T16:29:43+00:00 b8685affe614ccf5f4ec66252b30e2e524d18948 Conflicts: CREDITS 
Conflicts:

	CREDITS
Bugfix: make bootm+libfdt compile on boards with no flash 2007-09-08T22:41:52+00:00 Grant Likely grant.likely@secretlab.ca 2007-09-07T15:25:07+00:00 a7d7eca791a37f452c9da10fef4b31dd7aa9a622 Signed-off-by: Grant Likely <grant.likely@secretlab.ca> 
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Fix do_bootm_linux() so that multi-file images with FDT blob boot. 2007-09-06T22:13:41+00:00 Bartlomiej Sieka tur@semihalf.com 2007-09-04T15:31:22+00:00 5b729fb3bd98f49855d6bfc657c3fbae95f2adc2 Fix incorrect blob address calculation in do_bootm_linux() that prevents booting the kernel from a multi-file image (kernel + initrd + blob). Also, make minor updates to the U-Boot's output and to the coding style. Signed-off-by: Bartlomiej Sieka <tur@semihalf.com> 
Fix incorrect blob address calculation in do_bootm_linux() that prevents
booting the kernel from a multi-file image (kernel + initrd + blob).

Also, make minor updates to the U-Boot's output and to the coding style.

Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
bootm/fdt: Only process the fdt if an fdt address was provided 2007-09-06T15:47:40+00:00 Grant Likely grant.likely@secretlab.ca 2007-09-06T15:47:40+00:00 e79021223bc339df655e360645a52c457a74b067 Boards with CONFIG_OF_LIBFDT enabled are not able to boot old-style kernels using the board info structure (instead of passing a device tree) This change allows the old style booting to be used if the fdt argument was not passed to 'bootm'. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: Kim Phillips <kim.phillips@freescale.com> 
Boards with CONFIG_OF_LIBFDT enabled are not able to boot old-style
kernels using the board info structure (instead of passing a device tree)
This change allows the old style booting to be used if the fdt argument
was not passed to 'bootm'.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
Fix warnings from of_data copy fix 2007-08-16T10:12:54+00:00 Andy Fleming afleming@freescale.com 2007-08-16T01:06:50+00:00 82bd9ee77490588d4da785d75829ca63d0176baf Forgot to cast of_flat_tree to ulong. Signed-off-by: Andy Fleming <afleming@freescale.com> 
Forgot to cast of_flat_tree to ulong.

Signed-off-by: Andy Fleming <afleming@freescale.com>
Fix of_data copying for CONFIG_OF_FLAT_TREE-using boards 2007-08-16T10:10:56+00:00 Andy Fleming afleming@freescale.com 2007-08-15T22:30:56+00:00 10aaf716cb0dc6614df54ef78bed5144afd23ef8 The fix, "Fix where the #ifdef CFG_BOOTMAPSZ is placed" neglected to *also* put the code inside the similar #ifdef for CONFIG_OF_FLAT_TREE. Signed-off-by: Andy Fleming <afleming@freescale.com> 
The fix, "Fix where the #ifdef CFG_BOOTMAPSZ is placed"
neglected to *also* put the code inside the similar #ifdef
for CONFIG_OF_FLAT_TREE.

Signed-off-by: Andy Fleming <afleming@freescale.com>
Fix where the #ifdef CFG_BOOTMAPSZ is placed. 2007-08-15T15:44:08+00:00 Jerry Van Baren gvb.uboot@gmail.com 2007-08-15T15:13:15+00:00 210f463c71917b7a4495c2103c228b9c179ae64d Commit 073e1b509980cefe6f53c2d7fbbcd135df1e3924 "Fix initrd/dtb interaction" put the new code outside of the #if defined(CONFIG_OF_LIBFDT) when it should have gone inside of the conditional. As a result, it broke non-LIBFDT board builds. Also added a missing "not." to the comment. Signed-off-by: Gerald Van Baren <vanbaren@cideas.com> 
Commit 073e1b509980cefe6f53c2d7fbbcd135df1e3924 "Fix initrd/dtb
interaction" put the new code outside of the #if defined(CONFIG_OF_LIBFDT)
when it should have gone inside of the conditional.  As a result, it
broke non-LIBFDT board builds.

Also added a missing "not." to the comment.

Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
Fix initrd/dtb interaction 2007-08-14T15:38:19+00:00 Andy Fleming afleming@freescale.com 2007-08-14T15:32:59+00:00 073e1b509980cefe6f53c2d7fbbcd135df1e3924 The original code would wrongly relocate the blob to be right before the initrd if it existed. The blob *must* be within CFG_BOOTMAPSZ, if it is defined. So we make two changes: 1) flag the blob for relocation whenever its address is above BOOTMAPSZ 2) If the blob is being relocated, relocate it before kbd, not initrd Signed-off-by: Andy Fleming <afleming@freescale.com> 
The original code would wrongly relocate the blob to be right before
the initrd if it existed.  The blob *must* be within CFG_BOOTMAPSZ,
if it is defined.  So we make two changes:

1) flag the blob for relocation whenever its address is above BOOTMAPSZ

2) If the blob is being relocated, relocate it before kbd, not initrd

Signed-off-by: Andy Fleming <afleming@freescale.com>