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>

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>
Egbert Eich · Tom Rini
1 parent ae1768a72c
Showing 2 changed files with 4 additions and 1 deletions Side-by-side Diff
disk/part_iso.c
include/common.h
@@ -73,6 +73,9 @@
 	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)
@@ -1032,7 +1032,7 @@
  */
 #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)			\
...	...	@@ -73,6 +73,9 @@
73	73	iso_val_entry_t pve = (iso_val_entry_t )tmpbuf;
74	74	iso_init_def_entry_t *pide;
75	75
	76	+ if (dev_desc->blksz != CD_SECTSIZE)
	77	+ return -1;
	78	+
76	79	/* the first sector (sector 0x10) must be a primary volume desc */
77	80	blkaddr=PVD_OFFSET;
78	81	if (dev_desc->block_read (dev_desc->dev, PVD_OFFSET, 1, (ulong *) tmpbuf) != 1)
...	...	@@ -1032,7 +1032,7 @@
1032	1032	*/
1033	1033	#define DEFINE_ALIGN_BUFFER(type, name, size, align) \
1034	1034	static char __##name[roundup(size * sizeof(type), align)] \
1035		- __attribute__((aligned(align))); \
	1035	+ __aligned(align); \
1036	1036	\
1037	1037	static type name = (type )__##name
1038	1038	#define DEFINE_CACHE_ALIGN_BUFFER(type, name, size) \