summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntony Pavlov <antonynpavlov@gmail.com>2018-01-15 00:22:49 +0300
committerSascha Hauer <s.hauer@pengutronix.de>2018-01-17 10:44:30 +0100
commitac9d377b90d6b6638c1e5e626d8da047b5c1274a (patch)
tree629f259c982f30c43c928f9f46393e9e3d03f1c8
parent76759ec94eb3a32d71c32550b6b50965125afd92 (diff)
downloadbarebox-ac9d377b90d6b6638c1e5e626d8da047b5c1274a.tar.gz
barebox-ac9d377b90d6b6638c1e5e626d8da047b5c1274a.tar.xz
move parseopt to lib/
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--fs/Makefile2
-rw-r--r--fs/fs.c3
-rw-r--r--fs/nfs.c3
-rw-r--r--include/parseopt.h (renamed from fs/parseopt.h)0
-rw-r--r--lib/Makefile1
-rw-r--r--lib/parseopt.c (renamed from fs/parseopt.c)0
6 files changed, 4 insertions, 5 deletions
diff --git a/fs/Makefile b/fs/Makefile
index b3f929f506..8e3fd78e92 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -4,7 +4,7 @@ obj-$(CONFIG_FS_RAMFS) += ramfs.o
obj-y += devfs-core.o
obj-$(CONFIG_FS_DEVFS) += devfs.o
obj-$(CONFIG_FS_FAT) += fat/
-obj-y += fs.o parseopt.o
+obj-y += fs.o
obj-$(CONFIG_FS_UBIFS) += ubifs/
obj-$(CONFIG_FS_TFTP) += tftp.o
obj-$(CONFIG_FS_OMAP4_USBBOOT) += omap4_usbbootfs.o
diff --git a/fs/fs.c b/fs/fs.c
index f61ee091b5..ccb4943669 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -35,8 +35,7 @@
#include <libgen.h>
#include <block.h>
#include <libfile.h>
-
-#include "parseopt.h"
+#include <parseopt.h>
char *mkmodestr(unsigned long mode, char *str)
{
diff --git a/fs/nfs.c b/fs/nfs.c
index 97f01cfb34..75cd127eeb 100644
--- a/fs/nfs.c
+++ b/fs/nfs.c
@@ -36,8 +36,7 @@
#include <linux/sizes.h>
#include <byteorder.h>
#include <globalvar.h>
-
-#include "parseopt.h"
+#include <parseopt.h>
#define SUNRPC_PORT 111
diff --git a/fs/parseopt.h b/include/parseopt.h
index abf3be3f35..abf3be3f35 100644
--- a/fs/parseopt.h
+++ b/include/parseopt.h
diff --git a/lib/Makefile b/lib/Makefile
index 1be1742499..8f7ef4e4ed 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -59,3 +59,4 @@ obj-y += reed_solomon/
obj-$(CONFIG_RATP) += ratp.o
obj-y += list_sort.o
obj-y += int_sqrt.o
+obj-y += parseopt.o
diff --git a/fs/parseopt.c b/lib/parseopt.c
index 8ff83019a7..8ff83019a7 100644
--- a/fs/parseopt.c
+++ b/lib/parseopt.c