Fixed compilation for ARM when using a (standard) hard-FP toolchain

Patch by Anders Larsen, 07 Oct 2005

diff --git a/CHANGELOG b/CHANGELOG
index c340fc92c0175533cf90033eaafe20f8f5391897..d0676a11e11339f864935377f5f5c0e1f2f7143e 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 Changes for U-Boot 1.1.4:
 ======================================================================
 
+* Fixed compilation for ARM when using a (standard) hard-FP toolchain
+  Patch by Anders Larsen, 07 Oct 2005 
+
 * Cleanup warnings for cpu/arm720t & cpu/arm1136 files.
   sed the linker scripts, rather than pre-process them.
   Patch by Peter Pearse, 07 Oct 2005

diff --git a/drivers/cfi_flash.c b/drivers/cfi_flash.c
index ca6bd89b0c58b56db1c658c82fcc310cebf22e04..d8dfb4c3223bd2340711d0b8a8ed191252425f88 100644 (file)
--- a/drivers/cfi_flash.c
+++ b/drivers/cfi_flash.c
@@ -221,7 +221,7 @@ static void flash_printqry (flash_info_t * info, flash_sect_t sect)
        cfiptr_t cptr;
        int x, y;
 
-       for (x = 0; x < 0x40; x += 16 / info->portwidth) {
+       for (x = 0; x < 0x40; x += 16U / info->portwidth) {
                cptr.cp =
                        flash_make_addr (info, sect,
                                         x + FLASH_OFFSET_CFI_RESP);
@@ -807,7 +807,7 @@ static void flash_make_cmd (flash_info_t * info, uchar cmd, void *cmdbuf)
 #else
        for (i = 1; i <= info->portwidth; i++)
 #endif
-               *cp++ = (i % info->chipwidth) ? '\0' : cmd;
+               *cp++ = (i & (info->chipwidth - 1)) ? '\0' : cmd;
 }
 
 /*