diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-05-20 08:05:42 (GMT) |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-05-20 08:05:42 (GMT) |
commit | 05d134b084590684bcf4d832c0035952727b7cd9 (patch) | |
tree | 8f5d5fd811634fa621792cad7ca361251c06cd88 /include/fat.h | |
parent | 6130c14605de760bdcaef36b8a0d34eac2a955f0 (diff) | |
parent | d7782d06534fe4fa47a49fa7c106de5ba85a9687 (diff) | |
download | u-boot-fsl-qoriq-05d134b084590684bcf4d832c0035952727b7cd9.tar.xz |
Merge remote-tracking branch 'u-boot/master'
Conflicts:
boards.cfg
Conflicts were trivial once u-boot-arm/master boards.cfg was
reformatted (commit 6130c146) to match u-boot/master's own
reformatting (commit 1b37fa83).
Diffstat (limited to 'include/fat.h')
-rw-r--r-- | include/fat.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/fat.h b/include/fat.h index c8eb7cc..81d9790 100644 --- a/include/fat.h +++ b/include/fat.h @@ -84,8 +84,13 @@ #define START(dent) (FAT2CPU16((dent)->start) \ + (mydata->fatsize != 32 ? 0 : \ (FAT2CPU16((dent)->starthi) << 16))) +#define IS_LAST_CLUST(x, fatsize) ((x) >= ((fatsize) != 32 ? \ + ((fatsize) != 16 ? 0xff8 : 0xfff8) : \ + 0xffffff8)) #define CHECK_CLUST(x, fatsize) ((x) <= 1 || \ - (x) >= ((fatsize) != 32 ? 0xfff0 : 0xffffff0)) + (x) >= ((fatsize) != 32 ? \ + ((fatsize) != 16 ? 0xff0 : 0xfff0) : \ + 0xffffff0)) typedef struct boot_sector { __u8 ignored[3]; /* Bootstrap code */ |