Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[u-boot] / disk / part_amiga.c

diff --git a/disk/part_amiga.c b/disk/part_amiga.c
index d4316b858c1ab45bd6a8077e1ac0b9d818ee8408..86d008d476e39fe3320f3c04da18ddb70c3fd2f5 100644 (file)
--- a/disk/part_amiga.c
+++ b/disk/part_amiga.c
@@ -1,16 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2001
  * Hans-Joerg Frieden, Hyperion Entertainment
  * Hans-JoergF@hyperion-entertainment.com
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 #include <common.h>
 #include <command.h>
 #include <ide.h>
 #include "part_amiga.h"
 
-#ifdef HAVE_BLOCK_DEVICE
+#ifdef CONFIG_HAVE_BLOCK_DEVICE
 
 #undef AMIGA_DEBUG
 
@@ -132,7 +131,7 @@ struct rigid_disk_block *get_rdisk(struct blk_desc *dev_desc)
     int limit;
     char *s;
 
-    s = getenv("amiga_scanlimit");
+    s = env_get("amiga_scanlimit");
     if (s)
        limit = simple_strtoul(s, NULL, 10);
     else
@@ -172,7 +171,7 @@ struct bootcode_block *get_bootcode(struct blk_desc *dev_desc)
     int limit;
     char *s;
 
-    s = getenv("amiga_scanlimit");
+    s = env_get("amiga_scanlimit");
     if (s)
        limit = simple_strtoul(s, NULL, 10);
     else
@@ -381,6 +380,7 @@ static void part_print_amiga(struct blk_desc *dev_desc)
 U_BOOT_PART_TYPE(amiga) = {
        .name           = "AMIGA",
        .part_type      = PART_TYPE_AMIGA,
+       .max_entries    = AMIGA_ENTRY_NUMBERS,
        .get_info       = part_get_info_amiga,
        .print          = part_print_amiga,
        .test           = part_test_amiga,