summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2014-08-31 15:16:53 +0900
committerTom Rini <trini@ti.com>2014-09-16 12:23:56 -0400
commit3b6129702489ef4e327adeeef79ad73da8f6b59d (patch)
tree4a43e75d8d2151e3b3f8eef277f0e18adee1a380 /fs
parent5d9f423ddb2d4739eeee14990f5369508dee5e9d (diff)
downloadu-boot-imx-3b6129702489ef4e327adeeef79ad73da8f6b59d.zip
u-boot-imx-3b6129702489ef4e327adeeef79ad73da8f6b59d.tar.gz
u-boot-imx-3b6129702489ef4e327adeeef79ad73da8f6b59d.tar.bz2
kbuild: force to define __UBOOT__ in all the C sources
U-Boot has imported various source files from other projects, mostly Linux. Something like #ifdef __UBOOT__ [ modification for U-Boot ] #else [ original code ] #endif is an often used strategy for clarification of adjusted parts, that is, easier re-sync in future. Instead of defining __UBOOT__ in each source file, passing it from the top Makefile would be easier. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Acked-by: Marek Vasut <marex@denx.de> Acked-by: Heiko Schocher <hs@denx.de>
Diffstat (limited to 'fs')
-rw-r--r--fs/ubifs/budget.c1
-rw-r--r--fs/ubifs/debug.c1
-rw-r--r--fs/ubifs/debug.h1
-rw-r--r--fs/ubifs/io.c1
-rw-r--r--fs/ubifs/log.c1
-rw-r--r--fs/ubifs/lprops.c1
-rw-r--r--fs/ubifs/lpt.c1
-rw-r--r--fs/ubifs/lpt_commit.c1
-rw-r--r--fs/ubifs/master.c1
-rw-r--r--fs/ubifs/misc.h1
-rw-r--r--fs/ubifs/recovery.c1
-rw-r--r--fs/ubifs/replay.c1
-rw-r--r--fs/ubifs/sb.c1
-rw-r--r--fs/ubifs/scan.c1
-rw-r--r--fs/ubifs/super.c1
-rw-r--r--fs/ubifs/tnc.c1
-rw-r--r--fs/ubifs/tnc_misc.c1
-rw-r--r--fs/ubifs/ubifs.c1
-rw-r--r--fs/ubifs/ubifs.h1
19 files changed, 0 insertions, 19 deletions
diff --git a/fs/ubifs/budget.c b/fs/ubifs/budget.c
index 9ed4017..c626cbf 100644
--- a/fs/ubifs/budget.c
+++ b/fs/ubifs/budget.c
@@ -20,7 +20,6 @@
*/
#include "ubifs.h"
-#define __UBOOT__
#ifndef __UBOOT__
#include <linux/writeback.h>
#else
diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c
index 2f50a55..6e6f018 100644
--- a/fs/ubifs/debug.c
+++ b/fs/ubifs/debug.c
@@ -16,7 +16,6 @@
* various local functions of those subsystems.
*/
-#define __UBOOT__
#ifndef __UBOOT__
#include <linux/module.h>
#include <linux/debugfs.h>
diff --git a/fs/ubifs/debug.h b/fs/ubifs/debug.h
index 6d325af..807ce1b 100644
--- a/fs/ubifs/debug.h
+++ b/fs/ubifs/debug.h
@@ -12,7 +12,6 @@
#ifndef __UBIFS_DEBUG_H__
#define __UBIFS_DEBUG_H__
-#define __UBOOT__
/* Checking helper functions */
typedef int (*dbg_leaf_callback)(struct ubifs_info *c,
struct ubifs_zbranch *zbr, void *priv);
diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
index f87341e..bdccdc4 100644
--- a/fs/ubifs/io.c
+++ b/fs/ubifs/io.c
@@ -59,7 +59,6 @@
* they are read from the flash media.
*/
-#define __UBOOT__
#ifndef __UBOOT__
#include <linux/crc32.h>
#include <linux/slab.h>
diff --git a/fs/ubifs/log.c b/fs/ubifs/log.c
index ced0424..0355fe2 100644
--- a/fs/ubifs/log.c
+++ b/fs/ubifs/log.c
@@ -16,7 +16,6 @@
* journal.
*/
-#define __UBOOT__
#ifdef __UBOOT__
#include <linux/err.h>
#endif
diff --git a/fs/ubifs/lprops.c b/fs/ubifs/lprops.c
index fc6686b..a1a814f 100644
--- a/fs/ubifs/lprops.c
+++ b/fs/ubifs/lprops.c
@@ -17,7 +17,6 @@
* an empty LEB for the journal, or a very dirty LEB for garbage collection.
*/
-#define __UBOOT__
#ifdef __UBOOT__
#include <linux/err.h>
#endif
diff --git a/fs/ubifs/lpt.c b/fs/ubifs/lpt.c
index c49d3b0..8489e90 100644
--- a/fs/ubifs/lpt.c
+++ b/fs/ubifs/lpt.c
@@ -33,7 +33,6 @@
*/
#include "ubifs.h"
-#define __UBOOT__
#ifndef __UBOOT__
#include <linux/crc16.h>
#include <linux/math64.h>
diff --git a/fs/ubifs/lpt_commit.c b/fs/ubifs/lpt_commit.c
index cad422e..c818d4c 100644
--- a/fs/ubifs/lpt_commit.c
+++ b/fs/ubifs/lpt_commit.c
@@ -14,7 +14,6 @@
* subsystem.
*/
-#define __UBOOT__
#ifndef __UBOOT__
#include <linux/crc16.h>
#include <linux/slab.h>
diff --git a/fs/ubifs/master.c b/fs/ubifs/master.c
index 00ca855..761e070 100644
--- a/fs/ubifs/master.c
+++ b/fs/ubifs/master.c
@@ -11,7 +11,6 @@
/* This file implements reading and writing the master node */
-#define __UBOOT__
#include "ubifs.h"
#ifdef __UBOOT__
#include <linux/compat.h>
diff --git a/fs/ubifs/misc.h b/fs/ubifs/misc.h
index 4316d3c..7cad2be 100644
--- a/fs/ubifs/misc.h
+++ b/fs/ubifs/misc.h
@@ -16,7 +16,6 @@
#ifndef __UBIFS_MISC_H__
#define __UBIFS_MISC_H__
-#define __UBOOT__
/**
* ubifs_zn_dirty - check if znode is dirty.
* @znode: znode to check
diff --git a/fs/ubifs/recovery.c b/fs/ubifs/recovery.c
index f54a440..7637707 100644
--- a/fs/ubifs/recovery.c
+++ b/fs/ubifs/recovery.c
@@ -36,7 +36,6 @@
* refuses to mount.
*/
-#define __UBOOT__
#ifndef __UBOOT__
#include <linux/crc32.h>
#include <linux/slab.h>
diff --git a/fs/ubifs/replay.c b/fs/ubifs/replay.c
index 6393b15..7268b37 100644
--- a/fs/ubifs/replay.c
+++ b/fs/ubifs/replay.c
@@ -21,7 +21,6 @@
* larger is the journal, the more memory its index may consume.
*/
-#define __UBOOT__
#ifdef __UBOOT__
#include <linux/compat.h>
#include <linux/err.h>
diff --git a/fs/ubifs/sb.c b/fs/ubifs/sb.c
index fc0194a..4983bf6 100644
--- a/fs/ubifs/sb.c
+++ b/fs/ubifs/sb.c
@@ -16,7 +16,6 @@
*/
#include "ubifs.h"
-#define __UBOOT__
#ifndef __UBOOT__
#include <linux/slab.h>
#include <linux/random.h>
diff --git a/fs/ubifs/scan.c b/fs/ubifs/scan.c
index 5523d4e..6fc464b 100644
--- a/fs/ubifs/scan.c
+++ b/fs/ubifs/scan.c
@@ -16,7 +16,6 @@
* debugging functions.
*/
-#define __UBOOT__
#ifdef __UBOOT__
#include <linux/err.h>
#endif
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index dd9b668..01d449a 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -15,7 +15,6 @@
* corresponding subsystems, but most of it is here.
*/
-#define __UBOOT__
#ifndef __UBOOT__
#include <linux/init.h>
#include <linux/slab.h>
diff --git a/fs/ubifs/tnc.c b/fs/ubifs/tnc.c
index eda5070..95cae54 100644
--- a/fs/ubifs/tnc.c
+++ b/fs/ubifs/tnc.c
@@ -19,7 +19,6 @@
* the mutex locked.
*/
-#define __UBOOT__
#ifndef __UBOOT__
#include <linux/crc32.h>
#include <linux/slab.h>
diff --git a/fs/ubifs/tnc_misc.c b/fs/ubifs/tnc_misc.c
index 81bdad9..f808e0b 100644
--- a/fs/ubifs/tnc_misc.c
+++ b/fs/ubifs/tnc_misc.c
@@ -16,7 +16,6 @@
* putting it all in one file would make that file too big and unreadable.
*/
-#define __UBOOT__
#ifdef __UBOOT__
#include <linux/err.h>
#endif
diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c
index b91a6fd..49e6f46 100644
--- a/fs/ubifs/ubifs.c
+++ b/fs/ubifs/ubifs.c
@@ -26,7 +26,6 @@
#include "ubifs.h"
#include <u-boot/zlib.h>
-#define __UBOOT__
#include <linux/err.h>
#include <linux/lzo.h>
diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h
index acc6a40..0ce2475 100644
--- a/fs/ubifs/ubifs.h
+++ b/fs/ubifs/ubifs.h
@@ -15,7 +15,6 @@
#ifndef __UBIFS_H__
#define __UBIFS_H__
-#define __UBOOT__
#ifndef __UBOOT__
#include <asm/div64.h>
#include <linux/statfs.h>