Patchwork [U-Boot,v2,1/4] disk/iso: Add Support for block sizes > 512 byte to ISO partition support

login
register
mail settings
Submitter egbert.eich@gmail.com
Date April 10, 2013, 7:11 a.m.
Message ID <1365577917-32563-2-git-send-email-egbert.eich@gmail.com>
Download mbox | patch
Permalink /patch/235317/
State Accepted
Delegated to: Tom Rini
Headers show

Comments

egbert.eich@gmail.com - April 10, 2013, 7:11 a.m.
From: Egbert Eich <eich@suse.com>

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>
---
Changes for v2:                                                               
  - Coding style fixes.                                                       

 disk/part_iso.c  | 3 +++
 include/common.h | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
Tom Rini - May 2, 2013, 4:07 p.m.
On Tue, Apr 09, 2013 at 09:11:54PM -0000, egbert.eich@gmail.com wrote:

> From: Egbert Eich <eich@suse.com>
> 
> 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>

Applied to u-boot/master, thanks!

Patch

diff --git a/disk/part_iso.c b/disk/part_iso.c
index 49639af..cc323b0 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 53cc859..c080cb8 100644
--- a/include/common.h
+++ b/include/common.h
@@ -1011,7 +1011,7 @@  static inline void unmap_sysmem(const void *vaddr)
  */
 #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)			\