From 346969584be509b444dd1ba0db31ca7adb47575b Mon Sep 17 00:00:00 2001
From: Lukasz Majewski <l.majewski@majess.pl>
Date: Mon, 24 Aug 2015 00:21:43 +0200
Subject: [PATCH] net: tftp: Move tftp.h file from ./net to ./include/net

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>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
---
 {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 43466af2f3..b2f8ad4ded 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 2a6efd85ea..a115ce2892 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 4ce2f37a8a..1fa11b690d 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 18ce84c202..181f0f363e 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.39.2