diff options
| -rw-r--r-- | cmd/Makefile | 7 | ||||
| -rw-r--r-- | cmd/disk.c | 3 |
2 files changed, 3 insertions, 7 deletions
diff --git a/cmd/Makefile b/cmd/Makefile index a1ecf73ef3..81b98ee0d7 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -70,7 +70,7 @@ obj-$(CONFIG_CMD_GPIO) += gpio.o obj-$(CONFIG_CMD_I2C) += i2c.o obj-$(CONFIG_CMD_IOTRACE) += iotrace.o obj-$(CONFIG_CMD_HASH) += hash.o -obj-$(CONFIG_CMD_IDE) += ide.o +obj-$(CONFIG_CMD_IDE) += ide.o disk.o obj-$(CONFIG_CMD_IMMAP) += immap.o obj-$(CONFIG_CMD_INI) += ini.o obj-$(CONFIG_CMD_IRQ) += irq.o @@ -115,7 +115,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_SCSI) += scsi.o +obj-$(CONFIG_SCSI) += scsi.o disk.o obj-$(CONFIG_CMD_SHA1SUM) += sha1sum.o obj-$(CONFIG_CMD_SETEXPR) += setexpr.o obj-$(CONFIG_CMD_SOFTSWITCH) += softswitch.o @@ -137,7 +137,7 @@ ifdef CONFIG_LZMA obj-$(CONFIG_CMD_LZMADEC) += lzmadec.o endif -obj-$(CONFIG_CMD_USB) += usb.o +obj-$(CONFIG_CMD_USB) += usb.o disk.o obj-$(CONFIG_CMD_FASTBOOT) += fastboot.o obj-$(CONFIG_CMD_FS_UUID) += fs_uuid.o @@ -162,4 +162,3 @@ obj-$(CONFIG_CMD_BLOB) += blob.o # core command obj-y += nvedit.o -obj-y += disk.o diff --git a/cmd/disk.c b/cmd/disk.c index 92de3af8a5..3d2a3d2204 100644 --- a/cmd/disk.c +++ b/cmd/disk.c @@ -8,8 +8,6 @@ #include <command.h> #include <part.h> -#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[]) { @@ -130,4 +128,3 @@ int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc, return bootm_maybe_autostart(cmdtp, argv[0]); } -#endif |