summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorAndy Fleming <afleming@freescale.com>2007-08-15 20:06:50 -0500
committerWolfgang Denk <wd@denx.de>2007-08-16 12:12:54 +0200
commit82bd9ee77490588d4da785d75829ca63d0176baf (patch)
treef5286f2cb780fa510949c0533729a855f1a3dd2b /common
parent7613afda77d5eec0f47d303025b0c661b70e4c73 (diff)
downloadtalos-obmc-uboot-82bd9ee77490588d4da785d75829ca63d0176baf.tar.gz
talos-obmc-uboot-82bd9ee77490588d4da785d75829ca63d0176baf.zip
Fix warnings from of_data copy fix
Forgot to cast of_flat_tree to ulong. Signed-off-by: Andy Fleming <afleming@freescale.com>
Diffstat (limited to 'common')
-rw-r--r--common/cmd_bootm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 90e3f8b9af..bcb927fd10 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -932,7 +932,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
* so we flag it to be copied if it is not.
*/
if (of_flat_tree >= (char *)CFG_BOOTMAPSZ)
- of_data = of_flat_tree;
+ of_data = (ulong)of_flat_tree;
#endif
/* move of_flat_tree if needed */
@@ -993,7 +993,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
* so we flag it to be copied if it is not.
*/
if (of_flat_tree >= (char *)CFG_BOOTMAPSZ)
- of_data = of_flat_tree;
+ of_data = (ulong)of_flat_tree;
#endif
/* move of_flat_tree if needed */
OpenPOWER on IntegriCloud