From 6ac6a5c86638742f77f941f16d2db3a3377ce3e5 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 27 Mar 2018 13:01:56 +0200 Subject: jffs2: Do not use command line defines Update #3375. --- cpukit/libfs/Makefile.am | 2 -- cpukit/libfs/src/jffs2/src/build.c | 2 ++ cpukit/libfs/src/jffs2/src/compat-crc32.c | 2 ++ cpukit/libfs/src/jffs2/src/compr.c | 2 ++ cpukit/libfs/src/jffs2/src/compr_rtime.c | 2 ++ cpukit/libfs/src/jffs2/src/compr_rubin.c | 2 ++ cpukit/libfs/src/jffs2/src/compr_zlib.c | 2 ++ cpukit/libfs/src/jffs2/src/debug.c | 2 ++ cpukit/libfs/src/jffs2/src/dir-rtems.c | 2 ++ cpukit/libfs/src/jffs2/src/erase.c | 2 ++ cpukit/libfs/src/jffs2/src/flashio.c | 2 ++ cpukit/libfs/src/jffs2/src/fs-rtems.c | 2 ++ cpukit/libfs/src/jffs2/src/gc.c | 2 ++ cpukit/libfs/src/jffs2/src/malloc-rtems.c | 2 ++ cpukit/libfs/src/jffs2/src/nodelist.c | 2 ++ cpukit/libfs/src/jffs2/src/nodemgmt.c | 2 ++ cpukit/libfs/src/jffs2/src/read.c | 2 ++ cpukit/libfs/src/jffs2/src/readinode.c | 2 ++ cpukit/libfs/src/jffs2/src/rtems-jffs2-config.h | 2 ++ cpukit/libfs/src/jffs2/src/scan.c | 2 ++ cpukit/libfs/src/jffs2/src/write.c | 2 ++ 21 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 cpukit/libfs/src/jffs2/src/rtems-jffs2-config.h (limited to 'cpukit/libfs') diff --git a/cpukit/libfs/Makefile.am b/cpukit/libfs/Makefile.am index b2d0342536..37ecb6f928 100644 --- a/cpukit/libfs/Makefile.am +++ b/cpukit/libfs/Makefile.am @@ -139,8 +139,6 @@ libjffs2_a_CFLAGS = libjffs2_a_CFLAGS += -Wno-pointer-sign libjffs2_a_CPPFLAGS = libjffs2_a_CPPFLAGS += $(AM_CPPFLAGS) -I$(srcdir)/src/jffs2/include -libjffs2_a_CPPFLAGS += -D__ECOS -libjffs2_a_CPPFLAGS += '-DKBUILD_MODNAME="JFFS2"' # --- include $(top_srcdir)/automake/subdirs.am diff --git a/cpukit/libfs/src/jffs2/src/build.c b/cpukit/libfs/src/jffs2/src/build.c index a3750f902a..b16f2c9fe7 100644 --- a/cpukit/libfs/src/jffs2/src/build.c +++ b/cpukit/libfs/src/jffs2/src/build.c @@ -1,3 +1,5 @@ +#include "rtems-jffs2-config.h" + /* * JFFS2 -- Journalling Flash File System, Version 2. * diff --git a/cpukit/libfs/src/jffs2/src/compat-crc32.c b/cpukit/libfs/src/jffs2/src/compat-crc32.c index 7e4ea269f2..b084574cf6 100644 --- a/cpukit/libfs/src/jffs2/src/compat-crc32.c +++ b/cpukit/libfs/src/jffs2/src/compat-crc32.c @@ -1,3 +1,5 @@ +#include "rtems-jffs2-config.h" + //========================================================================== // // crc32.c diff --git a/cpukit/libfs/src/jffs2/src/compr.c b/cpukit/libfs/src/jffs2/src/compr.c index 985964997e..a9e821a6a1 100644 --- a/cpukit/libfs/src/jffs2/src/compr.c +++ b/cpukit/libfs/src/jffs2/src/compr.c @@ -1,3 +1,5 @@ +#include "rtems-jffs2-config.h" + /* * JFFS2 -- Journalling Flash File System, Version 2. * diff --git a/cpukit/libfs/src/jffs2/src/compr_rtime.c b/cpukit/libfs/src/jffs2/src/compr_rtime.c index 3386d1e1da..98d7ccd3a1 100644 --- a/cpukit/libfs/src/jffs2/src/compr_rtime.c +++ b/cpukit/libfs/src/jffs2/src/compr_rtime.c @@ -1,3 +1,5 @@ +#include "rtems-jffs2-config.h" + /* * JFFS2 -- Journalling Flash File System, Version 2. * diff --git a/cpukit/libfs/src/jffs2/src/compr_rubin.c b/cpukit/libfs/src/jffs2/src/compr_rubin.c index 92e0644bf8..424891cab4 100644 --- a/cpukit/libfs/src/jffs2/src/compr_rubin.c +++ b/cpukit/libfs/src/jffs2/src/compr_rubin.c @@ -1,3 +1,5 @@ +#include "rtems-jffs2-config.h" + /* * JFFS2 -- Journalling Flash File System, Version 2. * diff --git a/cpukit/libfs/src/jffs2/src/compr_zlib.c b/cpukit/libfs/src/jffs2/src/compr_zlib.c index 8bfbacfbb7..ec640c125a 100644 --- a/cpukit/libfs/src/jffs2/src/compr_zlib.c +++ b/cpukit/libfs/src/jffs2/src/compr_zlib.c @@ -1,3 +1,5 @@ +#include "rtems-jffs2-config.h" + /* * JFFS2 -- Journalling Flash File System, Version 2. * diff --git a/cpukit/libfs/src/jffs2/src/debug.c b/cpukit/libfs/src/jffs2/src/debug.c index 1090eb64b9..a5ff32240f 100644 --- a/cpukit/libfs/src/jffs2/src/debug.c +++ b/cpukit/libfs/src/jffs2/src/debug.c @@ -1,3 +1,5 @@ +#include "rtems-jffs2-config.h" + /* * JFFS2 -- Journalling Flash File System, Version 2. * diff --git a/cpukit/libfs/src/jffs2/src/dir-rtems.c b/cpukit/libfs/src/jffs2/src/dir-rtems.c index 7bbbabc309..8d3c3bdc2c 100644 --- a/cpukit/libfs/src/jffs2/src/dir-rtems.c +++ b/cpukit/libfs/src/jffs2/src/dir-rtems.c @@ -1,3 +1,5 @@ +#include "rtems-jffs2-config.h" + /* * JFFS2 -- Journalling Flash File System, Version 2. * diff --git a/cpukit/libfs/src/jffs2/src/erase.c b/cpukit/libfs/src/jffs2/src/erase.c index d0d8a6972f..323848cc75 100644 --- a/cpukit/libfs/src/jffs2/src/erase.c +++ b/cpukit/libfs/src/jffs2/src/erase.c @@ -1,3 +1,5 @@ +#include "rtems-jffs2-config.h" + /* * JFFS2 -- Journalling Flash File System, Version 2. * diff --git a/cpukit/libfs/src/jffs2/src/flashio.c b/cpukit/libfs/src/jffs2/src/flashio.c index af93168cea..7b689a5a7c 100644 --- a/cpukit/libfs/src/jffs2/src/flashio.c +++ b/cpukit/libfs/src/jffs2/src/flashio.c @@ -1,3 +1,5 @@ +#include "rtems-jffs2-config.h" + /* * JFFS2 -- Journalling Flash File System, Version 2. * diff --git a/cpukit/libfs/src/jffs2/src/fs-rtems.c b/cpukit/libfs/src/jffs2/src/fs-rtems.c index 652a8e7dbe..17a4985607 100644 --- a/cpukit/libfs/src/jffs2/src/fs-rtems.c +++ b/cpukit/libfs/src/jffs2/src/fs-rtems.c @@ -1,3 +1,5 @@ +#include "rtems-jffs2-config.h" + /* * JFFS2 -- Journalling Flash File System, Version 2. * diff --git a/cpukit/libfs/src/jffs2/src/gc.c b/cpukit/libfs/src/jffs2/src/gc.c index 2f42ee2d70..22963dc3a6 100644 --- a/cpukit/libfs/src/jffs2/src/gc.c +++ b/cpukit/libfs/src/jffs2/src/gc.c @@ -1,3 +1,5 @@ +#include "rtems-jffs2-config.h" + /* * JFFS2 -- Journalling Flash File System, Version 2. * diff --git a/cpukit/libfs/src/jffs2/src/malloc-rtems.c b/cpukit/libfs/src/jffs2/src/malloc-rtems.c index 100b619e07..d6b453347c 100644 --- a/cpukit/libfs/src/jffs2/src/malloc-rtems.c +++ b/cpukit/libfs/src/jffs2/src/malloc-rtems.c @@ -1,3 +1,5 @@ +#include "rtems-jffs2-config.h" + /* * JFFS2 -- Journalling Flash File System, Version 2. * diff --git a/cpukit/libfs/src/jffs2/src/nodelist.c b/cpukit/libfs/src/jffs2/src/nodelist.c index 975a1f562c..f0ad570b6f 100644 --- a/cpukit/libfs/src/jffs2/src/nodelist.c +++ b/cpukit/libfs/src/jffs2/src/nodelist.c @@ -1,3 +1,5 @@ +#include "rtems-jffs2-config.h" + /* * JFFS2 -- Journalling Flash File System, Version 2. * diff --git a/cpukit/libfs/src/jffs2/src/nodemgmt.c b/cpukit/libfs/src/jffs2/src/nodemgmt.c index 0331072171..40fa34c692 100644 --- a/cpukit/libfs/src/jffs2/src/nodemgmt.c +++ b/cpukit/libfs/src/jffs2/src/nodemgmt.c @@ -1,3 +1,5 @@ +#include "rtems-jffs2-config.h" + /* * JFFS2 -- Journalling Flash File System, Version 2. * diff --git a/cpukit/libfs/src/jffs2/src/read.c b/cpukit/libfs/src/jffs2/src/read.c index 0b042b1fc8..516ba43d95 100644 --- a/cpukit/libfs/src/jffs2/src/read.c +++ b/cpukit/libfs/src/jffs2/src/read.c @@ -1,3 +1,5 @@ +#include "rtems-jffs2-config.h" + /* * JFFS2 -- Journalling Flash File System, Version 2. * diff --git a/cpukit/libfs/src/jffs2/src/readinode.c b/cpukit/libfs/src/jffs2/src/readinode.c index 7c0f1bf631..a166da9c69 100644 --- a/cpukit/libfs/src/jffs2/src/readinode.c +++ b/cpukit/libfs/src/jffs2/src/readinode.c @@ -1,3 +1,5 @@ +#include "rtems-jffs2-config.h" + /* * JFFS2 -- Journalling Flash File System, Version 2. * diff --git a/cpukit/libfs/src/jffs2/src/rtems-jffs2-config.h b/cpukit/libfs/src/jffs2/src/rtems-jffs2-config.h new file mode 100644 index 0000000000..11d3646ae9 --- /dev/null +++ b/cpukit/libfs/src/jffs2/src/rtems-jffs2-config.h @@ -0,0 +1,2 @@ +#define __ECOS 1 +#define KBUILD_MODNAME "JFFS2" diff --git a/cpukit/libfs/src/jffs2/src/scan.c b/cpukit/libfs/src/jffs2/src/scan.c index 4d45ca2ea4..1cfa548335 100644 --- a/cpukit/libfs/src/jffs2/src/scan.c +++ b/cpukit/libfs/src/jffs2/src/scan.c @@ -1,3 +1,5 @@ +#include "rtems-jffs2-config.h" + /* * JFFS2 -- Journalling Flash File System, Version 2. * diff --git a/cpukit/libfs/src/jffs2/src/write.c b/cpukit/libfs/src/jffs2/src/write.c index b634de4c81..1b14cc650d 100644 --- a/cpukit/libfs/src/jffs2/src/write.c +++ b/cpukit/libfs/src/jffs2/src/write.c @@ -1,3 +1,5 @@ +#include "rtems-jffs2-config.h" + /* * JFFS2 -- Journalling Flash File System, Version 2. * -- cgit v1.2.3