summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG3
-rw-r--r--common/cmd_fpga.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 4af0200..7ed5e66 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
Changes since U-Boot 1.1.4:
======================================================================
+* Remove compile warnings in fpga code
+ Patch by Stefan Roese, 07 Oct 2006
+
* Add CONFIG_BOARD_RESET to configure board specific reset function
Patch by Stefan Roese, 07 Oct 2006
diff --git a/common/cmd_fpga.c b/common/cmd_fpga.c
index df859bd..3444091 100644
--- a/common/cmd_fpga.c
+++ b/common/cmd_fpga.c
@@ -263,9 +263,9 @@ int do_fpga (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
puts ("Bad Magic Number\n");
return 1;
}
- data = (char *)(fpga_data + sizeof(image_header_t));
+ data = ((ulong)fpga_data + sizeof(image_header_t));
data_size = ntohl(hdr->ih_size);
- rc = fpga_load (dev, data, data_size);
+ rc = fpga_load (dev, (void *)data, data_size);
}
break;