projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tegra: remove custom TEGRA_DEVICE_SETTINGS for board files
[oweals/u-boot.git]
/
common
/
cmd_sata.c
diff --git
a/common/cmd_sata.c
b/common/cmd_sata.c
index 1693a7e312fb606890d43dd5a741983da9b47c4c..b401bd10245ea7eb0d357737e6b7c7c1a2269cb7 100644
(file)
--- a/
common/cmd_sata.c
+++ b/
common/cmd_sata.c
@@
-28,7
+28,7
@@
#include <part.h>
#include <sata.h>
#include <part.h>
#include <sata.h>
-int sata_curr_device = -1;
+
static
int sata_curr_device = -1;
block_dev_desc_t sata_dev_desc[CONFIG_SYS_SATA_MAX_DEVICE];
int __sata_initialize(void)
block_dev_desc_t sata_dev_desc[CONFIG_SYS_SATA_MAX_DEVICE];
int __sata_initialize(void)
@@
-48,21
+48,26
@@
int __sata_initialize(void)
sata_dev_desc[i].block_write = sata_write;
rc = init_sata(i);
sata_dev_desc[i].block_write = sata_write;
rc = init_sata(i);
- rc = scan_sata(i);
- if ((sata_dev_desc[i].lba > 0) && (sata_dev_desc[i].blksz > 0))
- init_part(&sata_dev_desc[i]);
+ if (!rc) {
+ rc = scan_sata(i);
+ if (!rc && (sata_dev_desc[i].lba > 0) &&
+ (sata_dev_desc[i].blksz > 0))
+ init_part(&sata_dev_desc[i]);
+ }
}
sata_curr_device = 0;
return rc;
}
int sata_initialize(void) __attribute__((weak,alias("__sata_initialize")));
}
sata_curr_device = 0;
return rc;
}
int sata_initialize(void) __attribute__((weak,alias("__sata_initialize")));
+#ifdef CONFIG_PARTITIONS
block_dev_desc_t *sata_get_dev(int dev)
{
return (dev < CONFIG_SYS_SATA_MAX_DEVICE) ? &sata_dev_desc[dev] : NULL;
}
block_dev_desc_t *sata_get_dev(int dev)
{
return (dev < CONFIG_SYS_SATA_MAX_DEVICE) ? &sata_dev_desc[dev] : NULL;
}
+#endif
-
int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char *
argv[])
+
static int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char * const
argv[])
{
int rc = 0;
{
int rc = 0;
@@
-77,8
+82,7
@@
int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
switch (argc) {
case 0:
case 1:
switch (argc) {
case 0:
case 1:
- cmd_usage(cmdtp);
- return 1;
+ return CMD_RET_USAGE;
case 2:
if (strncmp(argv[1],"inf", 3) == 0) {
int i;
case 2:
if (strncmp(argv[1],"inf", 3) == 0) {
int i;
@@
-115,8
+119,7
@@
int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
}
return rc;
}
}
return rc;
}
- cmd_usage(cmdtp);
- return 1;
+ return CMD_RET_USAGE;
case 3:
if (strncmp(argv[1], "dev", 3) == 0) {
int dev = (int)simple_strtoul(argv[2], NULL, 10);
case 3:
if (strncmp(argv[1], "dev", 3) == 0) {
int dev = (int)simple_strtoul(argv[2], NULL, 10);
@@
-147,8
+150,7
@@
int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
}
return rc;
}
}
return rc;
}
- cmd_usage(cmdtp);
- return 1;
+ return CMD_RET_USAGE;
default: /* at least 4 args */
if (strcmp(argv[1], "read") == 0) {
default: /* at least 4 args */
if (strcmp(argv[1], "read") == 0) {
@@
-184,8
+186,7
@@
int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
n, (n == cnt) ? "OK" : "ERROR");
return (n == cnt) ? 0 : 1;
} else {
n, (n == cnt) ? "OK" : "ERROR");
return (n == cnt) ? 0 : 1;
} else {
- cmd_usage(cmdtp);
- rc = 1;
+ return CMD_RET_USAGE;
}
return rc;
}
return rc;