diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2006-08-18 11:38:05 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-08-18 11:38:05 +0200 |
| commit | 4bfb63207765e9048668eb1fe17ac51b02662635 (patch) | |
| tree | d88516372ae39d18c14597c571a8377857a12ad1 /include | |
| parent | 0a0f3a46fb5cfa7105402bee9c52dd379325d156 (diff) | |
| parent | 94568b600acd768f0e1b3c0abe3694963593cf60 (diff) | |
Merge with git+ssh://fifi/home/wd/git/u-boot/master
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.h | 2 | ||||
| -rw-r--r-- | include/fat.h | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/include/common.h b/include/common.h index bd41ae179ae..9a19001c18d 100644 --- a/include/common.h +++ b/include/common.h @@ -603,7 +603,7 @@ void show_boot_progress (int status); #endif #ifdef CONFIG_INIT_CRITICAL -#error CONFIG_INIT_CRITICAL is depracted! +#error CONFIG_INIT_CRITICAL is deprecated! #error Read section CONFIG_SKIP_LOWLEVEL_INIT in README. #endif diff --git a/include/fat.h b/include/fat.h index 0645458f17b..92638d535e4 100644 --- a/include/fat.h +++ b/include/fat.h @@ -175,15 +175,19 @@ typedef struct dir_slot { __u8 name11_12[4]; /* Last 2 characters in name */ } dir_slot; -/* Private filesystem parameters */ +/* Private filesystem parameters + * + * Note: FAT buffer has to be 32 bit aligned + * (see FAT32 accesses) + */ typedef struct { + __u8 fatbuf[FATBUFSIZE]; /* Current FAT buffer */ int fatsize; /* Size of FAT in bits */ __u16 fatlength; /* Length of FAT in sectors */ __u16 fat_sect; /* Starting sector of the FAT */ __u16 rootdir_sect; /* Start sector of root directory */ __u16 clust_size; /* Size of clusters in sectors */ short data_begin; /* The sector of the first cluster, can be negative */ - __u8 fatbuf[FATBUFSIZE]; /* Current FAT buffer */ int fatbufnum; /* Used by get_fatent, init to -1 */ } fsdata; |