From: Lukasz Dalek <luk0104@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v2 5/6] usbether: Define CONFIG_USB_ETH_{CDC, SUBSET}
Date: Sun, 23 Sep 2012 16:35:35 +0200 [thread overview]
Message-ID: <1348410936-335-6-git-send-email-luk0104@gmail.com> (raw)
In-Reply-To: <1348410936-335-1-git-send-email-luk0104@gmail.com>
Introduced CONFIG_USB_ETH_CDC and CONFIG_USB_ETH_SUBSET as preparation
for removal DEV_CONFIG_CDC and DEV_CONFIG_SUBSET
Signed-off-by: Lukasz Dalek <luk0104@gmail.com>
---
drivers/usb/gadget/ether.c | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index 9ce2c17..7e6491d 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -44,12 +44,21 @@ extern struct platform_data brd;
unsigned packet_received, packet_sent;
-#ifdef CONFIG_USB_GADGET_PXA2XX
-# undef DEV_CONFIG_CDC
-# define DEV_CONFIG_SUBSET 1
-#else
-# define DEV_CONFIG_CDC 1
+#undef DEV_CONFIG_CDC
+#undef DEV_CONFIG_SUBSET
+
+#if !defined(CONFIG_USB_ETH_CDC) && !defined(CONFIG_USB_ETH_SUBSET)
+# define DEV_CONFIG_CDC 1 /* preserve default behavior */
+#endif
+
+#if defined(CONFIG_USB_ETH_CDC)
+# define DEV_CONFIG_CDC 1
#endif
+
+#if defined(CONFIG_USB_ETH_SUBSET)
+# define DEV_CONFIG_SUBSET 1
+#endif
+
#define GFP_ATOMIC ((gfp_t) 0)
#define GFP_KERNEL ((gfp_t) 0)
--
1.7.8.6
next prev parent reply other threads:[~2012-09-23 14:35 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-23 14:35 [U-Boot] [PATCH v2 0/6] Add h2200 support and pxa25x ethernet gadget Lukasz Dalek
2012-09-23 14:35 ` [U-Boot] [PATCH v2 1/6] h2200: Add support for iPAQ h2200 palmtop Lukasz Dalek
2012-09-23 15:43 ` Marek Vasut
2012-09-23 19:11 ` Łukasz Dałek
2012-09-23 19:31 ` Marek Vasut
2012-09-23 19:39 ` Łukasz Dałek
2012-09-23 20:05 ` Marek Vasut
2012-09-23 20:24 ` Łukasz Dałek
2012-09-23 20:52 ` Marek Vasut
2012-09-23 21:00 ` Łukasz Dałek
2012-09-23 21:04 ` Marek Vasut
2012-09-23 21:11 ` Łukasz Dałek
2012-09-23 21:31 ` Marek Vasut
2012-09-23 21:43 ` Łukasz Dałek
2012-09-23 23:05 ` Marek Vasut
2012-09-23 23:16 ` Łukasz Dałek
2012-09-23 23:25 ` Marek Vasut
2012-09-23 23:39 ` Łukasz Dałek
2012-09-24 1:23 ` Marek Vasut
2012-09-23 14:35 ` [U-Boot] [PATCH v2 2/6] pxa25x: Add support for USB ethernet gadget Lukasz Dalek
2012-09-23 15:44 ` Marek Vasut
2012-09-23 18:16 ` Łukasz Dałek
2012-09-23 18:24 ` Marek Vasut
2012-09-23 18:50 ` Łukasz Dałek
2012-09-23 19:32 ` Marek Vasut
2012-09-23 19:44 ` Łukasz Dałek
2012-09-23 20:05 ` Marek Vasut
2012-09-23 14:35 ` [U-Boot] [PATCH v2 3/6] pxa: Add some stuff to examine cpu model and rev Lukasz Dalek
2012-09-23 14:35 ` [U-Boot] [PATCH v2 4/6] usbether: Fixed bug when using with PXA25X chips Lukasz Dalek
2012-09-23 14:35 ` Lukasz Dalek [this message]
2012-09-23 14:35 ` [U-Boot] [PATCH v2 6/6] usbether: Removed DEV_CONFIG_{CDC,SUBSET} Lukasz Dalek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1348410936-335-6-git-send-email-luk0104@gmail.com \
--to=luk0104@gmail.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox