public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Lukasz Dalek <luk0104@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v4 4/8] usbether: Define CONFIG_USB_ETH_{CDC, SUBSET}
Date: Tue,  2 Oct 2012 17:04:30 +0200	[thread overview]
Message-ID: <1349190274-1924-4-git-send-email-luk0104@gmail.com> (raw)
In-Reply-To: <1349190274-1924-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

  parent reply	other threads:[~2012-10-02 15:04 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-02 15:04 [U-Boot] [PATCH v4 1/8] h2200: Add support for iPAQ h2200 palmtop Lukasz Dalek
2012-10-02 15:04 ` [U-Boot] [PATCH v4 2/8] pxa: Add some stuff to examine cpu model and rev Lukasz Dalek
2012-10-02 19:36   ` Marek Vasut
2012-10-02 20:02     ` Łukasz Dałek
2012-10-02 15:04 ` [U-Boot] [PATCH v4 3/8] usbether: Fixed bug when using with PXA25X chips Lukasz Dalek
2012-10-02 15:04 ` Lukasz Dalek [this message]
2012-10-02 15:04 ` [U-Boot] [PATCH v4 5/8] usbether: Removed DEV_CONFIG_{CDC,SUBSET} Lukasz Dalek
2012-10-02 15:04 ` [U-Boot] [PATCH v4 6/8] pxa25x: Add support for USB ethernet gadget Lukasz Dalek
2012-10-02 15:04 ` [U-Boot] [PATCH v4 7/8] usb.h: Add udc_disconnect prototype to usb.h Lukasz Dalek
2012-10-02 15:04 ` [U-Boot] [PATCH v4 8/8] h2200: Add USB CDC ethernet support Lukasz Dalek
2012-10-02 19:35 ` [U-Boot] [PATCH v4 1/8] h2200: Add support for iPAQ h2200 palmtop Marek Vasut
2012-10-02 20:09   ` Łukasz Dałek
2012-10-02 20:19     ` Marek Vasut
2012-10-02 20:38       ` Łukasz Dałek

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=1349190274-1924-4-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