diff options
Diffstat (limited to 'disk')
| -rw-r--r-- | disk/part.c | 8 | ||||
| -rw-r--r-- | disk/part_amiga.c | 5 | ||||
| -rw-r--r-- | disk/part_dos.c | 1 | ||||
| -rw-r--r-- | disk/part_efi.c | 1 | ||||
| -rw-r--r-- | disk/part_iso.c | 1 | ||||
| -rw-r--r-- | disk/part_mac.c | 1 | 
6 files changed, 14 insertions, 3 deletions
| diff --git a/disk/part.c b/disk/part.c index fdc49d339..c7774930b 100644 --- a/disk/part.c +++ b/disk/part.c @@ -35,6 +35,7 @@  #endif  #if (defined(CONFIG_CMD_IDE) || \ +     defined(CONFIG_CMD_MG_DISK) || \       defined(CONFIG_CMD_SATA) || \       defined(CONFIG_CMD_SCSI) || \       defined(CONFIG_CMD_USB) || \ @@ -65,6 +66,9 @@ static const struct block_drvr block_drvr[] = {  #if defined(CONFIG_SYSTEMACE)  	{ .name = "ace", .get_dev = systemace_get_dev, },  #endif +#if defined(CONFIG_CMD_MG_DISK) +	{ .name = "mgd", .get_dev = mg_disk_get_dev, }, +#endif  	{ },  }; @@ -91,6 +95,7 @@ block_dev_desc_t *get_dev(char* ifname, int dev)  #endif  #if (defined(CONFIG_CMD_IDE) || \ +     defined(CONFIG_CMD_MG_DISK) || \       defined(CONFIG_CMD_SATA) || \       defined(CONFIG_CMD_SCSI) || \       defined(CONFIG_CMD_USB) || \ @@ -203,11 +208,12 @@ void dev_print (block_dev_desc_t *dev_desc)  #endif  #if (defined(CONFIG_CMD_IDE) || \ +     defined(CONFIG_CMD_MG_DISK) || \       defined(CONFIG_CMD_SATA) || \       defined(CONFIG_CMD_SCSI) || \       defined(CONFIG_CMD_USB) || \       defined(CONFIG_MMC)		|| \ -     defined(CONFIG_SYSTEMACE)          ) +     defined(CONFIG_SYSTEMACE) )  #if defined(CONFIG_MAC_PARTITION) || \      defined(CONFIG_DOS_PARTITION) || \ diff --git a/disk/part_amiga.c b/disk/part_amiga.c index c2daf6a60..50efe39b1 100644 --- a/disk/part_amiga.c +++ b/disk/part_amiga.c @@ -27,6 +27,7 @@  #include "part_amiga.h"  #if defined(CONFIG_CMD_IDE) || \ +    defined(CONFIG_CMD_MG_DISK) || \      defined(CONFIG_CMD_SCSI) || \      defined(CONFIG_CMD_USB) || \      defined(CONFIG_MMC) || \ @@ -154,7 +155,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 +196,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; diff --git a/disk/part_dos.c b/disk/part_dos.c index 4ab0b4060..93bf3dd4e 100644 --- a/disk/part_dos.c +++ b/disk/part_dos.c @@ -36,6 +36,7 @@  #include "part_dos.h"  #if defined(CONFIG_CMD_IDE) || \ +    defined(CONFIG_CMD_MG_DISK) || \      defined(CONFIG_CMD_SATA) || \      defined(CONFIG_CMD_SCSI) || \      defined(CONFIG_CMD_USB) || \ diff --git a/disk/part_efi.c b/disk/part_efi.c index 70f62cc9a..626f022f9 100644 --- a/disk/part_efi.c +++ b/disk/part_efi.c @@ -37,6 +37,7 @@  #include "part_efi.h"  #if defined(CONFIG_CMD_IDE) || \ +    defined(CONFIG_CMD_MG_DISK) || \      defined(CONFIG_CMD_SATA) || \      defined(CONFIG_CMD_SCSI) || \      defined(CONFIG_CMD_USB) || \ diff --git a/disk/part_iso.c b/disk/part_iso.c index 719b9495c..8fe6148c2 100644 --- a/disk/part_iso.c +++ b/disk/part_iso.c @@ -26,6 +26,7 @@  #include "part_iso.h"  #if defined(CONFIG_CMD_IDE) || \ +    defined(CONFIG_CMD_MG_DISK) || \      defined(CONFIG_CMD_SCSI) || \      defined(CONFIG_CMD_SATA) || \      defined(CONFIG_CMD_USB) || \ diff --git a/disk/part_mac.c b/disk/part_mac.c index c1afc8c20..bebe415d6 100644 --- a/disk/part_mac.c +++ b/disk/part_mac.c @@ -35,6 +35,7 @@  #include "part_mac.h"  #if defined(CONFIG_CMD_IDE) || \ +    defined(CONFIG_CMD_MG_DISK) || \      defined(CONFIG_CMD_SCSI) || \      defined(CONFIG_CMD_SATA) || \      defined(CONFIG_CMD_USB) || \ |