summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.com>2013-04-09 21:11:54 +0000
committerTom Rini <trini@ti.com>2013-05-01 16:24:02 -0400
commitd7ea4d4d4c6ddd80ca246daf8383f7632c7db7ae (patch)
tree74f5cddc2277c3207644980f63c0a987b469d842
parentae1768a72cf70c00eec6824a5cc9079b0a247640 (diff)
disk/iso: Add Support for block sizes > 512 byte to ISO partition support
For ISO we check the block size of the device if this is != the CD sector size we assume that the device has no ISO partition. Signed-off-by: Egbert Eich <eich@suse.com>
-rw-r--r--disk/part_iso.c3
-rw-r--r--include/common.h2
2 files changed, 4 insertions, 1 deletions
diff --git a/disk/part_iso.c b/disk/part_iso.c
index 49639af269..cc323b099c 100644
--- a/disk/part_iso.c
+++ b/disk/part_iso.c
@@ -73,6 +73,9 @@ int get_partition_info_iso_verb(block_dev_desc_t * dev_desc, int part_num, disk_
iso_val_entry_t *pve = (iso_val_entry_t *)tmpbuf;
iso_init_def_entry_t *pide;
+ if (dev_desc->blksz != CD_SECTSIZE)
+ return -1;
+
/* the first sector (sector 0x10) must be a primary volume desc */
blkaddr=PVD_OFFSET;
if (dev_desc->block_read (dev_desc->dev, PVD_OFFSET, 1, (ulong *) tmpbuf) != 1)
diff --git a/include/common.h b/include/common.h
index 84315a0b43..fd2495f0d8 100644
--- a/include/common.h
+++ b/include/common.h
@@ -1032,7 +1032,7 @@ static inline phys_addr_t map_to_sysmem(void *ptr)
*/
#define DEFINE_ALIGN_BUFFER(type, name, size, align) \
static char __##name[roundup(size * sizeof(type), align)] \
- __attribute__((aligned(align))); \
+ __aligned(align); \
\
static type *name = (type *)__##name
#define DEFINE_CACHE_ALIGN_BUFFER(type, name, size) \