Merge tag 'efi-2020-01-rc2' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

[oweals/u-boot.git] / disk / part_iso.c

diff --git a/disk/part_iso.c b/disk/part_iso.c
index bb8ed658f22538a64dfd1643cd37ed821313dc99..e733227f5996b8ef83ccb4a1fa5ac1f7b02a8699 100644 (file)
--- a/disk/part_iso.c
+++ b/disk/part_iso.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2001
  * Denis Peter, MPL AG Switzerland, d.peter@mpl.ch.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -10,7 +9,7 @@
 #include <asm/unaligned.h>
 #include "part_iso.h"
 
-#ifdef HAVE_BLOCK_DEVICE
+#ifdef CONFIG_HAVE_BLOCK_DEVICE
 
 /* #define     ISO_PART_DEBUG */
 
@@ -24,7 +23,7 @@
 #undef CHECK_FOR_POWERPC_PLATTFORM
 #define CD_SECTSIZE 2048
 
-static unsigned char tmpbuf[CD_SECTSIZE];
+static unsigned char tmpbuf[CD_SECTSIZE] __aligned(ARCH_DMA_MINALIGN);
 
 unsigned long iso_dread(struct blk_desc *block_dev, lbaint_t start,
                         lbaint_t blkcnt, void *buffer)
@@ -202,7 +201,7 @@ found:
 static int part_get_info_iso(struct blk_desc *dev_desc, int part_num,
                                  disk_partition_t *info)
 {
-       return part_get_info_iso_verb(dev_desc, part_num, info, 1);
+       return part_get_info_iso_verb(dev_desc, part_num, info, 0);
 }
 
 static void part_print_iso(struct blk_desc *dev_desc)
@@ -228,7 +227,7 @@ static int part_test_iso(struct blk_desc *dev_desc)
 {
        disk_partition_t info;
 
-       return part_get_info_iso_verb(dev_desc, 1, &info, 1);
+       return part_get_info_iso_verb(dev_desc, 1, &info, 0);
 }
 
 U_BOOT_PART_TYPE(iso) = {