projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pantheon: define CONFIG_SYS_CACHELINE_SIZE
[oweals/u-boot.git]
/
disk
/
part_amiga.c
diff --git
a/disk/part_amiga.c
b/disk/part_amiga.c
index f1ad24a438f20d260e995d677723e5243bce045e..50efe39b1b28ad6a532dfbbecfc0b36c24fbcd46 100644
(file)
--- a/
disk/part_amiga.c
+++ b/
disk/part_amiga.c
@@
-24,10
+24,14
@@
#include <common.h>
#include <command.h>
#include <ide.h>
#include <common.h>
#include <command.h>
#include <ide.h>
-#include <cmd_disk.h>
#include "part_amiga.h"
#include "part_amiga.h"
-#if ((CONFIG_COMMANDS & CFG_CMD_IDE) || (CONFIG_COMMANDS & CFG_CMD_SCSI)) && defined(CONFIG_AMIGA_PARTITION)
+#if defined(CONFIG_CMD_IDE) || \
+ defined(CONFIG_CMD_MG_DISK) || \
+ defined(CONFIG_CMD_SCSI) || \
+ defined(CONFIG_CMD_USB) || \
+ defined(CONFIG_MMC) || \
+ defined(CONFIG_SYSTEMACE)
#undef AMIGA_DEBUG
#undef AMIGA_DEBUG
@@
-151,7
+155,7
@@
struct rigid_disk_block *get_rdisk(block_dev_desc_t *dev_desc)
s = getenv("amiga_scanlimit");
if (s)
s = getenv("amiga_scanlimit");
if (s)
- limit =
atoi(s
);
+ limit =
simple_strtoul(s, NULL, 10
);
else
limit = AMIGA_BLOCK_LIMIT;
else
limit = AMIGA_BLOCK_LIMIT;
@@
-192,7
+196,7
@@
struct bootcode_block *get_bootcode(block_dev_desc_t *dev_desc)
s = getenv("amiga_scanlimit");
if (s)
s = getenv("amiga_scanlimit");
if (s)
- limit =
atoi(s
);
+ limit =
simple_strtoul(s, NULL, 10
);
else
limit = AMIGA_BLOCK_LIMIT;
else
limit = AMIGA_BLOCK_LIMIT;