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>

diff --git a/disk/part_iso.c b/disk/part_iso.c
index 49639af2690d329a6e989a8c37458f20c8d1b5fe..cc323b099cd50cf72154d2d3afabe6d000928a15 100644 (file)
--- 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 84315a0b43179bfb89bb90d10a4086476159e3de..fd2495f0d8df34676e0476e25636dd30dec66347 100644 (file)
--- 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)                    \