diff options
| author | David Brownell | 2008-08-19 02:43:25 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2008-10-16 18:24:46 +0200 |
| commit | 352e2b961c885b98065c402e2ad85057d0a334b2 (patch) | |
| tree | 9567028b1ed8158eff6b0241066bc9694bd33b12 /drivers/usb/gadget | |
| parent | usb gadget: link fixes for printer gadget (diff) | |
| download | kernel-qcow2-linux-352e2b961c885b98065c402e2ad85057d0a334b2.tar.gz kernel-qcow2-linux-352e2b961c885b98065c402e2ad85057d0a334b2.tar.xz kernel-qcow2-linux-352e2b961c885b98065c402e2ad85057d0a334b2.zip | |
usb gadget: link fixes for storage gadget
Change how the file storage gadget driver builds: don't
use separate compilation, since it works poorly when key
parts are library code (with init sections etc). Instead
be as close as we can to "gcc --combine ...".
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/gadget')
| -rw-r--r-- | drivers/usb/gadget/Makefile | 3 | ||||
| -rw-r--r-- | drivers/usb/gadget/file_storage.c | 12 |
2 files changed, 13 insertions, 2 deletions
diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile index 99956b79bdf5..736d58fe941e 100644 --- a/drivers/usb/gadget/Makefile +++ b/drivers/usb/gadget/Makefile @@ -29,8 +29,7 @@ g_ether-objs := ether.o u_ether.o f_subset.o f_ecm.o $(C_UTILS) g_serial-objs := serial.o g_midi-objs := gmidi.o gadgetfs-objs := inode.o -g_file_storage-objs := file_storage.o usbstring.o config.o \ - epautoconf.o +g_file_storage-objs := file_storage.o g_printer-objs := printer.o g_cdc-objs := cdc2.o u_ether.o f_ecm.o \ u_serial.o f_acm.o $(C_UTILS) diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c index ea2c31d18080..0c632d22a631 100644 --- a/drivers/usb/gadget/file_storage.c +++ b/drivers/usb/gadget/file_storage.c @@ -245,6 +245,18 @@ #include "gadget_chips.h" + +/* + * Kbuild is not very cooperative with respect to linking separately + * compiled library objects into one module. So for now we won't use + * separate compilation ... ensuring init/exit sections work to shrink + * the runtime footprint, and giving us at least some parts of what + * a "gcc --combine ... part1.c part2.c part3.c ... " build would. + */ +#include "usbstring.c" +#include "config.c" +#include "epautoconf.c" + /*-------------------------------------------------------------------------*/ #define DRIVER_DESC "File-backed Storage Gadget" |