summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukasz Majewski <l.majewski@majess.pl>2015-08-24 00:21:43 +0200
committerMarek Vasut <marex@denx.de>2015-09-07 13:41:04 +0200
commit346969584be509b444dd1ba0db31ca7adb47575b (patch)
tree63ea95cdf84371c5d1e20a1ebcec81fe63f65338
parent5a6087277c271773248e30c53ba494e328a7d476 (diff)
downloadu-boot-imx-346969584be509b444dd1ba0db31ca7adb47575b.zip
u-boot-imx-346969584be509b444dd1ba0db31ca7adb47575b.tar.gz
u-boot-imx-346969584be509b444dd1ba0db31ca7adb47575b.tar.bz2
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>
-rw-r--r--include/net/tftp.h (renamed from net/tftp.h)0
-rw-r--r--net/bootp.c2
-rw-r--r--net/net.c2
-rw-r--r--net/rarp.c2
-rw-r--r--net/tftp.c2
5 files changed, 4 insertions, 4 deletions
diff --git a/net/tftp.h b/include/net/tftp.h
index c411c9b..c411c9b 100644
--- a/net/tftp.h
+++ b/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 2a6efd8..a115ce2 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 18ce84c..181f0f3 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>