[U-Boot] [PATCH v4 2/9] net: tftp: Move tftp.h file from ./net to ./include/net

Lukasz Majewski l.majewski at majess.pl
Mon Aug 24 00:21:43 CEST 2015


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 at majess.pl>
Acked-by: Joe Hershberger <joe.hershberger at ni.com>
---
Changes for v2:
- Move tftp.h from ./include to ./include/net/ directory

Changes for v3:
- Generate the patch set to avoid deleting and creating new files (git
  should just "move" them)

Changes for v4:
- None

Change-Id: Idb26f766c3a72a47bec596f5f3c68f5ef632766a
---
 {net => include/net}/tftp.h | 0
 net/bootp.c                 | 2 +-
 net/net.c                   | 2 +-
 net/rarp.c                  | 2 +-
 net/tftp.c                  | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename {net => include/net}/tftp.h (100%)

diff --git a/net/tftp.h b/include/net/tftp.h
similarity index 100%
rename from net/tftp.h
rename to include/net/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 89be32a..1a51131 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>
-- 
2.1.4



More information about the U-Boot mailing list