| Message ID | 1437811877-13764-3-git-send-email-l.majewski@majess.pl |
|---|---|
| State | Superseded |
| Delegated to: | Łukasz Majewski |
| Headers | show |
Dear Lukasz Majewski, In message <1437811877-13764-3-git-send-email-l.majewski@majess.pl> you wrote: > This change gives the ability to reuse the <tftp.h> header file by other > subsystems (like e.g. dfu). > > Without this change compilation error emerges for the legacy update.c file. > > Signed-off-by: Lukasz Majewski <l.majewski@majess.pl> > > --- > Changes for v2: > - Move tftp.h from ./include to ./include/net/ directory > --- > include/net/tftp.h | 30 ++++++++++++++++++++++++++++++ > net/bootp.c | 2 +- > net/net.c | 2 +- > net/rarp.c | 2 +- > net/tftp.c | 2 +- > net/tftp.h | 30 ------------------------------ > 6 files changed, 34 insertions(+), 34 deletions(-) > create mode 100644 include/net/tftp.h > delete mode 100644 net/tftp.h NAK. Please resubmit and use "-M -C" when generating the patches, so the renames will be properly detected and not result in a file deletion and the addition of an (apparently new) file. Best regards, Wolfgang Denk
On Sat, 25 Jul 2015 14:24:43 +0200 Wolfgang Denk <wd@denx.de> wrote: > Dear Lukasz Majewski, > > In message <1437811877-13764-3-git-send-email-l.majewski@majess.pl> > you wrote: > > This change gives the ability to reuse the <tftp.h> header file by > > other subsystems (like e.g. dfu). > > > > Without this change compilation error emerges for the legacy > > update.c file. > > > > Signed-off-by: Lukasz Majewski <l.majewski@majess.pl> > > > > --- > > Changes for v2: > > - Move tftp.h from ./include to ./include/net/ directory > > --- > > include/net/tftp.h | 30 ++++++++++++++++++++++++++++++ > > net/bootp.c | 2 +- > > net/net.c | 2 +- > > net/rarp.c | 2 +- > > net/tftp.c | 2 +- > > net/tftp.h | 30 ------------------------------ > > 6 files changed, 34 insertions(+), 34 deletions(-) > > create mode 100644 include/net/tftp.h > > delete mode 100644 net/tftp.h > > NAK. Please resubmit and use "-M -C" when generating the patches, so > the renames will be properly detected and not result in a file > deletion and the addition of an (apparently new) file. Ok, Thanks for pointing this out. > > Best regards, > > Wolfgang Denk > Best regards, Lukasz Majewski
[prune cc] Hi Lukasz, On 25 July 2015 at 09:02, Lukasz Majewski <l.majewski@majess.pl> wrote: > On Sat, 25 Jul 2015 14:24:43 +0200 > Wolfgang Denk <wd@denx.de> wrote: > >> Dear Lukasz Majewski, >> >> In message <1437811877-13764-3-git-send-email-l.majewski@majess.pl> >> you wrote: >> > This change gives the ability to reuse the <tftp.h> header file by >> > other subsystems (like e.g. dfu). >> > >> > Without this change compilation error emerges for the legacy >> > update.c file. >> > >> > Signed-off-by: Lukasz Majewski <l.majewski@majess.pl> >> > >> > --- >> > Changes for v2: >> > - Move tftp.h from ./include to ./include/net/ directory >> > --- >> > include/net/tftp.h | 30 ++++++++++++++++++++++++++++++ >> > net/bootp.c | 2 +- >> > net/net.c | 2 +- >> > net/rarp.c | 2 +- >> > net/tftp.c | 2 +- >> > net/tftp.h | 30 ------------------------------ >> > 6 files changed, 34 insertions(+), 34 deletions(-) >> > create mode 100644 include/net/tftp.h >> > delete mode 100644 net/tftp.h >> >> NAK. Please resubmit and use "-M -C" when generating the patches, so >> the renames will be properly detected and not result in a file >> deletion and the addition of an (apparently new) file. > > Ok, Thanks for pointing this out. Or use patman, which does this for you :-) Regards, Simon
diff --git a/include/net/tftp.h b/include/net/tftp.h new file mode 100644 index 0000000..c411c9b --- /dev/null +++ b/include/net/tftp.h @@ -0,0 +1,30 @@ +/* + * LiMon - BOOTP/TFTP. + * + * Copyright 1994, 1995, 2000 Neil Russell. + * Copyright 2011 Comelit Group SpA + * Luca Ceresoli <luca.ceresoli@comelit.it> + * (See License) + */ + +#ifndef __TFTP_H__ +#define __TFTP_H__ + +/**********************************************************************/ +/* + * Global functions and variables. + */ + +/* tftp.c */ +void tftp_start(enum proto_t protocol); /* Begin TFTP get/put */ + +#ifdef CONFIG_CMD_TFTPSRV +void tftp_start_server(void); /* Wait for incoming TFTP put */ +#endif + +extern ulong tftp_timeout_ms; +extern int tftp_timeout_count_max; + +/**********************************************************************/ + +#endif /* __TFTP_H__ */ diff --git a/net/bootp.c b/net/bootp.c index 43466af..b2f8ad4 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -11,8 +11,8 @@ #include <common.h> #include <command.h> #include <net.h> +#include <net/tftp.h> #include "bootp.h" -#include "tftp.h" #include "nfs.h" #ifdef CONFIG_STATUS_LED #include <status_led.h> diff --git a/net/net.c b/net/net.c index 67e0ad2..61e010f 100644 --- a/net/net.c +++ b/net/net.c @@ -86,6 +86,7 @@ #include <environment.h> #include <errno.h> #include <net.h> +#include <net/tftp.h> #if defined(CONFIG_STATUS_LED) #include <miiphy.h> #include <status_led.h> @@ -105,7 +106,6 @@ #if defined(CONFIG_CMD_SNTP) #include "sntp.h" #endif -#include "tftp.h" DECLARE_GLOBAL_DATA_PTR; diff --git a/net/rarp.c b/net/rarp.c index 4ce2f37..1fa11b6 100644 --- a/net/rarp.c +++ b/net/rarp.c @@ -8,10 +8,10 @@ #include <common.h> #include <command.h> #include <net.h> +#include <net/tftp.h> #include "nfs.h" #include "bootp.h" #include "rarp.h" -#include "tftp.h" #define TIMEOUT 5000UL /* Milliseconds before trying BOOTP again */ #ifndef CONFIG_NET_RETRY_COUNT diff --git a/net/tftp.c b/net/tftp.c index 3e99e73..48ccceb 100644 --- a/net/tftp.c +++ b/net/tftp.c @@ -10,7 +10,7 @@ #include <command.h> #include <mapmem.h> #include <net.h> -#include "tftp.h" +#include <net/tftp.h> #include "bootp.h" #ifdef CONFIG_SYS_DIRECT_FLASH_TFTP #include <flash.h> diff --git a/net/tftp.h b/net/tftp.h deleted file mode 100644 index c411c9b..0000000 --- a/net/tftp.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * LiMon - BOOTP/TFTP. - * - * Copyright 1994, 1995, 2000 Neil Russell. - * Copyright 2011 Comelit Group SpA - * Luca Ceresoli <luca.ceresoli@comelit.it> - * (See License) - */ - -#ifndef __TFTP_H__ -#define __TFTP_H__ - -/**********************************************************************/ -/* - * Global functions and variables. - */ - -/* tftp.c */ -void tftp_start(enum proto_t protocol); /* Begin TFTP get/put */ - -#ifdef CONFIG_CMD_TFTPSRV -void tftp_start_server(void); /* Wait for incoming TFTP put */ -#endif - -extern ulong tftp_timeout_ms; -extern int tftp_timeout_count_max; - -/**********************************************************************/ - -#endif /* __TFTP_H__ */
This change gives the ability to reuse the <tftp.h> header file by other subsystems (like e.g. dfu). Without this change compilation error emerges for the legacy update.c file. Signed-off-by: Lukasz Majewski <l.majewski@majess.pl> --- Changes for v2: - Move tftp.h from ./include to ./include/net/ directory --- include/net/tftp.h | 30 ++++++++++++++++++++++++++++++ net/bootp.c | 2 +- net/net.c | 2 +- net/rarp.c | 2 +- net/tftp.c | 2 +- net/tftp.h | 30 ------------------------------ 6 files changed, 34 insertions(+), 34 deletions(-) create mode 100644 include/net/tftp.h delete mode 100644 net/tftp.h