mirror of
https://github.com/AsahiLinux/u-boot
synced 2025-02-17 22:49:02 +00:00
cmd: Rework disk.c usage
We only need the function found in cmd/disk.c when we have IDE, SCSI or USB_STORAGE enabled. While the first two are easy to get right, in the 3rd case we assume that the set of cases where we do have USB and do not enable USB_STORAGE are small enough that we can take the small bloat of un-discarded strings on gcc prior to 6.x Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
parent
645176d1d5
commit
aca9814dc5
2 changed files with 3 additions and 7 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue