diff mbox

[U-Boot,PATH,v7,1/2] netconsole: remove `serverip' check

Message ID 1305193737-5952-2-git-send-email-simon.guinot@sequanux.org
State Accepted
Delegated to: Wolfgang Denk
Headers show

Commit Message

Simon Guinot May 12, 2011, 9:48 a.m. UTC
This patch allows to enable the netconsole even if `serverip' is not set.

Because netconsole use the environment variable `ncip' to configure the
destination IP, `serverip' don't need to be defined.

Signed-off-by: Simon Guinot <sguinot@lacie.com>
---
Changes for v2:
  - restore NetOurIP check

Changes for v3:
  - add a "/* Fall through */" comment before the NETCONS case label

Changes for v4,5: none

Changes for v6:
  - enhance commit message

Changes for v7: none

 net/net.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

Comments

Prafulla Wadaskar May 12, 2011, 10:17 a.m. UTC | #1
> -----Original Message-----
> From: Simon Guinot [mailto:simon.guinot@sequanux.org]
> Sent: Thursday, May 12, 2011 3:19 PM
> To: Prafulla Wadaskar
> Cc: Albert ARIBAUD; u-boot@lists.denx.de; Simon Guinot
> Subject: [PATH v7 1/2] netconsole: remove `serverip' check
> 
> This patch allows to enable the netconsole even if `serverip' is not
> set.
> 
> Because netconsole use the environment variable `ncip' to configure the
> destination IP, `serverip' don't need to be defined.
> 
> Signed-off-by: Simon Guinot <sguinot@lacie.com>
> ---
> Changes for v2:
>   - restore NetOurIP check
> 
> Changes for v3:
>   - add a "/* Fall through */" comment before the NETCONS case label
> 
> Changes for v4,5: none
> 
> Changes for v6:
>   - enhance commit message
> 
> Changes for v7: none
> 
>  net/net.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)

This patch looks to be independent.
I don't have any comments for this.
Should be applied to u-boot-net.git.

Hi Ben/Wolfgang
Can you pls review/comment/pull it ?

Regards..
Prafulla . . .
Simon Guinot May 12, 2011, 11:55 a.m. UTC | #2
Hi Prafulla,

On Thu, May 12, 2011 at 03:17:24AM -0700, Prafulla Wadaskar wrote:
> 
> 
> > -----Original Message-----
> > From: Simon Guinot [mailto:simon.guinot@sequanux.org]
> > Sent: Thursday, May 12, 2011 3:19 PM
> > To: Prafulla Wadaskar
> > Cc: Albert ARIBAUD; u-boot@lists.denx.de; Simon Guinot
> > Subject: [PATH v7 1/2] netconsole: remove `serverip' check
> > 
> > This patch allows to enable the netconsole even if `serverip' is not
> > set.
> > 
> > Because netconsole use the environment variable `ncip' to configure the
> > destination IP, `serverip' don't need to be defined.
> > 
> > Signed-off-by: Simon Guinot <sguinot@lacie.com>
> > ---
> > Changes for v2:
> >   - restore NetOurIP check
> > 
> > Changes for v3:
> >   - add a "/* Fall through */" comment before the NETCONS case label
> > 
> > Changes for v4,5: none
> > 
> > Changes for v6:
> >   - enhance commit message
> > 
> > Changes for v7: none
> > 
> >  net/net.c |    3 ++-
> >  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> This patch looks to be independent.
> I don't have any comments for this.
> Should be applied to u-boot-net.git.

The patch itself is independent but the Network Space v2 board setup
rely on it. Without this patch, the netconsole is not usable and the
netconsole is needed to update the stock U-Boot.

IMHO, this two patches should go in the same tree, to avoid a breakage
situation.

Regards,

Simon
Prafulla Wadaskar May 12, 2011, 12:14 p.m. UTC | #3
> -----Original Message-----
> From: Simon Guinot [mailto:simon@sequanux.org]
> Sent: Thursday, May 12, 2011 5:25 PM
> To: Prafulla Wadaskar
> Cc: Simon Guinot; Albert ARIBAUD; u-boot@lists.denx.de; Wolfgang Denk;
> Ashish Karkare; Prabhanjan Sarnaik
> Subject: Re: [PATH v7 1/2] netconsole: remove `serverip' check
> 
> Hi Prafulla,
> 
> On Thu, May 12, 2011 at 03:17:24AM -0700, Prafulla Wadaskar wrote:
> >
> >
> > > -----Original Message-----
> > > From: Simon Guinot [mailto:simon.guinot@sequanux.org]
> > > Sent: Thursday, May 12, 2011 3:19 PM
> > > To: Prafulla Wadaskar
> > > Cc: Albert ARIBAUD; u-boot@lists.denx.de; Simon Guinot
> > > Subject: [PATH v7 1/2] netconsole: remove `serverip' check
> > >
> > > This patch allows to enable the netconsole even if `serverip' is not
> > > set.
> > >
> > > Because netconsole use the environment variable `ncip' to configure
> the
> > > destination IP, `serverip' don't need to be defined.
> > >
> > > Signed-off-by: Simon Guinot <sguinot@lacie.com>
> > > ---
> > > Changes for v2:
> > >   - restore NetOurIP check
> > >
> > > Changes for v3:
> > >   - add a "/* Fall through */" comment before the NETCONS case label
> > >
> > > Changes for v4,5: none
> > >
> > > Changes for v6:
> > >   - enhance commit message
> > >
> > > Changes for v7: none
> > >
> > >  net/net.c |    3 ++-
> > >  1 files changed, 2 insertions(+), 1 deletions(-)
> >
> > This patch looks to be independent.
> > I don't have any comments for this.
> > Should be applied to u-boot-net.git.
> 
> The patch itself is independent but the Network Space v2 board setup
> rely on it. Without this patch, the netconsole is not usable and the
> netconsole is needed to update the stock U-Boot.
> 
> IMHO, this two patches should go in the same tree, to avoid a breakage
> situation.

I understand the situation, at least we need acked by respective custodians.

Copying Wolfgang for the same

Regards..
Prafulla . .
Mike Frysinger May 12, 2011, 3:14 p.m. UTC | #4
On Thursday, May 12, 2011 06:17:24 Prafulla Wadaskar wrote:
> Hi Ben/Wolfgang
> Can you pls review/comment/pull it ?

Ben is no longer here, and the u-boot-net tree is dead.  Wolfgang is currently 
covering things.
-mike
Wolfgang Denk May 12, 2011, 4:16 p.m. UTC | #5
Dear Simon Guinot,

In message <20110512115521.GD6693@kw.sim.vm.gnt> you wrote:
> 
> > This patch looks to be independent.
> > I don't have any comments for this.
> > Should be applied to u-boot-net.git.
> 
> The patch itself is independent but the Network Space v2 board setup
> rely on it. Without this patch, the netconsole is not usable and the
> netconsole is needed to update the stock U-Boot.
> 
> IMHO, this two patches should go in the same tree, to avoid a breakage
> situation.

No.  This will go into master.  Soon.

Best regards,

Wolfgang Denk
Wolfgang Denk May 12, 2011, 5:12 p.m. UTC | #6
Dear Simon Guinot,

In message <1305193737-5952-2-git-send-email-simon.guinot@sequanux.org> you wrote:
> This patch allows to enable the netconsole even if `serverip' is not set.
> 
> Because netconsole use the environment variable `ncip' to configure the
> destination IP, `serverip' don't need to be defined.
> 
> Signed-off-by: Simon Guinot <sguinot@lacie.com>
> ---
> Changes for v2:
>   - restore NetOurIP check
> 
> Changes for v3:
>   - add a "/* Fall through */" comment before the NETCONS case label
> 
> Changes for v4,5: none
> 
> Changes for v6:
>   - enhance commit message
> 
> Changes for v7: none
> 
>  net/net.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk
Prafulla Wadaskar May 13, 2011, 11:52 a.m. UTC | #7
> -----Original Message-----
> From: Wolfgang Denk [mailto:wd@denx.de]
> Sent: Thursday, May 12, 2011 10:42 PM
> To: Simon Guinot
> Cc: Prafulla Wadaskar; u-boot@lists.denx.de
> Subject: Re: [U-Boot] [PATH v7 1/2] netconsole: remove `serverip' check
> 
> Dear Simon Guinot,
> 
> In message <1305193737-5952-2-git-send-email-simon.guinot@sequanux.org>
> you wrote:
> > This patch allows to enable the netconsole even if `serverip' is not
> set.
> >
> > Because netconsole use the environment variable `ncip' to configure
> the
> > destination IP, `serverip' don't need to be defined.
> >
> > Signed-off-by: Simon Guinot <sguinot@lacie.com>
> > ---
> > Changes for v2:
> >   - restore NetOurIP check
> >
> > Changes for v3:
> >   - add a "/* Fall through */" comment before the NETCONS case label
> >
> > Changes for v4,5: none
> >
> > Changes for v6:
> >   - enhance commit message
> >
> > Changes for v7: none
> >
> >  net/net.c |    3 ++-
> >  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> Applied, thanks.

Hi Albert
Since this patch is applied, Simon can post only one patch.
May you please pull it in u-boot-arm.git ?

Regards..
Prafulla . .
diff mbox

Patch

diff --git a/net/net.c b/net/net.c
index e50bdf1..19ac019 100644
--- a/net/net.c
+++ b/net/net.c
@@ -1718,7 +1718,6 @@  static int net_check_prereq (proto_t protocol)
 #if defined(CONFIG_CMD_NFS)
 	case NFS:
 #endif
-	case NETCONS:
 	case TFTP:
 		if (NetServerIP == 0) {
 			puts ("*** ERROR: `serverip' not set\n");
@@ -1728,7 +1727,9 @@  static int net_check_prereq (proto_t protocol)
     defined(CONFIG_CMD_DNS)
     common:
 #endif
+		/* Fall through */
 
+	case NETCONS:
 		if (NetOurIP == 0) {
 			puts ("*** ERROR: `ipaddr' not set\n");
 			return (1);