diff mbox

[U-Boot,1/1] cmd: Rework disk.c usage

Message ID 1473420405-15508-1-git-send-email-trini@konsulko.com
State Accepted
Commit aca9814dc5e213c1a37a5d6bc7221240ad08e9a0
Delegated to: Tom Rini
Headers show

Commit Message

Tom Rini Sept. 9, 2016, 11:26 a.m. UTC 
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 gives us back ~144 bytes in SPL on many boards and adds ~120 bytes on
xfi3, sansa_fuze_plus, smartweb, eco5pk and p2771-0000-500 in U-Boot itself.

 cmd/Makefile | 7 +++----
 cmd/disk.c   | 3 ---
 2 files changed, 3 insertions(+), 7 deletions(-)

Comments

Tom Rini Sept. 9, 2016, 7:54 p.m. UTC | #1 
On Fri, Sep 09, 2016 at 07:26:45AM -0400, Tom Rini wrote:

> 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>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/cmd/Makefile b/cmd/Makefile
index a1ecf73ef314..81b98ee0d751 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 92de3af8a5c0..3d2a3d22045b 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