Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / disk / part_amiga.c

diff --git a/disk/part_amiga.c b/disk/part_amiga.c
index f1ad24a438f20d260e995d677723e5243bce045e..0e6d82dbaed70def98249ac7535098b5fa93a91f 100644 (file)
--- a/disk/part_amiga.c
+++ b/disk/part_amiga.c
@@ -24,10 +24,9 @@
 #include <common.h>
 #include <command.h>
 #include <ide.h>
-#include <cmd_disk.h>
 #include "part_amiga.h"
 
-#if ((CONFIG_COMMANDS & CFG_CMD_IDE) || (CONFIG_COMMANDS & CFG_CMD_SCSI)) && defined(CONFIG_AMIGA_PARTITION)
+#ifdef HAVE_BLOCK_DEVICE
 
 #undef AMIGA_DEBUG
 
@@ -151,7 +150,7 @@ struct rigid_disk_block *get_rdisk(block_dev_desc_t *dev_desc)
 
     s = getenv("amiga_scanlimit");
     if (s)
-       limit = atoi(s);
+       limit = simple_strtoul(s, NULL, 10);
     else
        limit = AMIGA_BLOCK_LIMIT;
 
@@ -192,7 +191,7 @@ struct bootcode_block *get_bootcode(block_dev_desc_t *dev_desc)
 
     s = getenv("amiga_scanlimit");
     if (s)
-       limit = atoi(s);
+       limit = simple_strtoul(s, NULL, 10);
     else
        limit = AMIGA_BLOCK_LIMIT;