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 6c3d74897011e076ab6247b9e539f2ac1ddffe9e..0e6d82dbaed70def98249ac7535098b5fa93a91f 100644 (file)
--- a/disk/part_amiga.c
+++ b/disk/part_amiga.c
@@ -26,11 +26,7 @@
 #include <ide.h>
 #include "part_amiga.h"
 
-#if (defined(CONFIG_CMD_IDE) || \
-     defined(CONFIG_CMD_SCSI) || \
-     defined(CONFIG_CMD_USB) || \
-     defined(CONFIG_MMC) || \
-     defined(CONFIG_SYSTEMACE) ) && defined(CONFIG_AMIGA_PARTITION)
+#ifdef HAVE_BLOCK_DEVICE
 
 #undef AMIGA_DEBUG
 
@@ -154,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;
 
@@ -195,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;