fsl-ddr: Fix the turnaround timing for TIMING_CFG_4

[u-boot] / fs / ext2 / dev.c

diff --git a/fs/ext2/dev.c b/fs/ext2/dev.c
index 35a576daa8136fc3bcc0de7ad8975111102c762a..3b49650bae3f987e827b98ee95dce7def4efdd31 100644 (file)
--- a/fs/ext2/dev.c
+++ b/fs/ext2/dev.c
@@ -25,15 +25,12 @@
 
 
 #include <common.h>
-#if (CONFIG_COMMANDS & CFG_CMD_EXT2)
-
 #include <config.h>
 #include <ext2fs.h>
 
 static block_dev_desc_t *ext2fs_block_dev_desc;
 static disk_partition_t part_info;
 
-#undef DEBUG
 int ext2fs_set_blk_dev (block_dev_desc_t * rbdd, int part)
 {
        ext2fs_block_dev_desc = rbdd;
@@ -74,9 +71,7 @@ int ext2fs_devread (int sector, int byte_offset, int byte_len, char *buf) {
        sector += byte_offset >> SECTOR_BITS;
        byte_offset &= SECTOR_SIZE - 1;
 
-#if defined(DEBUG)
-       printf (" <%d, %d, %d>\n", sector, byte_offset, byte_len);
-#endif
+       debug (" <%d, %d, %d>\n", sector, byte_offset, byte_len);
 
        if (ext2fs_block_dev_desc == NULL) {
                printf ("** Invalid Block Device Descriptor (NULL)\n");
@@ -99,8 +94,23 @@ int ext2fs_devread (int sector, int byte_offset, int byte_len, char *buf) {
                sector++;
        }
 
+       if (byte_len == 0)
+               return 1;
+
        /*  read sector aligned part */
        block_len = byte_len & ~(SECTOR_SIZE - 1);
+
+       if (block_len == 0) {
+               u8 p[SECTOR_SIZE];
+
+               block_len = SECTOR_SIZE;
+               ext2fs_block_dev_desc->block_read(ext2fs_block_dev_desc->dev,
+                                                 part_info.start + sector,
+                                                 1, (unsigned long *)p);
+               memcpy(buf, p, byte_len);
+               return 1;
+       }
+
        if (ext2fs_block_dev_desc->block_read (ext2fs_block_dev_desc->dev,
                                               part_info.start + sector,
                                               block_len / SECTOR_SIZE,
@@ -109,6 +119,7 @@ int ext2fs_devread (int sector, int byte_offset, int byte_len, char *buf) {
                printf (" ** ext2fs_devread() read error - block\n");
                return (0);
        }
+       block_len = byte_len & ~(SECTOR_SIZE - 1);
        buf += block_len;
        byte_len -= block_len;
        sector += block_len / SECTOR_SIZE;
@@ -126,4 +137,3 @@ int ext2fs_devread (int sector, int byte_offset, int byte_len, char *buf) {
        }
        return (1);
 }
-#endif /* CFG_CMD_EXT2FS */