diff options
| author | Simon Glass <sjg@chromium.org> | 2016-05-01 11:36:02 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2016-05-17 09:54:43 -0600 |
| commit | c649e3c91cdc96a86ca2665fcfafaca5c4b384b1 (patch) | |
| tree | 09f54670c121c2cbf42ba154fba6594f28a8d6fe /cmd | |
| parent | 2765c4d147011c9ac80cc014661321829056ee25 (diff) | |
| download | talos-obmc-uboot-c649e3c91cdc96a86ca2665fcfafaca5c4b384b1.tar.gz talos-obmc-uboot-c649e3c91cdc96a86ca2665fcfafaca5c4b384b1.zip | |
dm: scsi: Rename CONFIG_CMD_SCSI to CONFIG_SCSI
This option currently enables both the command and the SCSI functionality.
Rename the existing option to CONFIG_SCSI since most of the code relates
to the feature.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/Makefile | 4 | ||||
| -rw-r--r-- | cmd/disk.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmd/Makefile b/cmd/Makefile index f95759e670..6612a3b2b5 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -112,7 +112,7 @@ obj-$(CONFIG_CMD_REMOTEPROC) += remoteproc.o obj-$(CONFIG_SANDBOX) += host.o obj-$(CONFIG_CMD_SATA) += sata.o obj-$(CONFIG_CMD_SF) += sf.o -obj-$(CONFIG_CMD_SCSI) += scsi.o +obj-$(CONFIG_SCSI) += scsi.o obj-$(CONFIG_CMD_SHA1SUM) += sha1sum.o obj-$(CONFIG_CMD_SETEXPR) += setexpr.o obj-$(CONFIG_CMD_SOFTSWITCH) += softswitch.o @@ -157,7 +157,7 @@ endif # !CONFIG_SPL_BUILD ifdef CONFIG_SPL_BUILD ifdef CONFIG_SPL_SATA_SUPPORT -obj-$(CONFIG_CMD_SCSI) += scsi.o +obj-$(CONFIG_SCSI) += scsi.o endif endif # CONFIG_SPL_BUILD diff --git a/cmd/disk.c b/cmd/disk.c index 2fd1717e6a..fcc4123127 100644 --- a/cmd/disk.c +++ b/cmd/disk.c @@ -8,7 +8,7 @@ #include <command.h> #include <part.h> -#if defined(CONFIG_CMD_IDE) || defined(CONFIG_CMD_SCSI) || \ +#if defined(CONFIG_CMD_IDE) || defined(CONFIG_SCSI) || \ defined(CONFIG_USB_STORAGE) int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc, char *const argv[]) |
