From 3b6129702489ef4e327adeeef79ad73da8f6b59d Mon Sep 17 00:00:00 2001
From: Masahiro Yamada <yamada.m@jp.panasonic.com>
Date: Sun, 31 Aug 2014 15:16:53 +0900
Subject: 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>
---
 include/linux/mtd/flashchip.h | 1 -
 include/linux/mtd/mtd.h       | 1 -
 include/linux/mtd/nand.h      | 1 -
 include/linux/mtd/ubi.h       | 1 -
 include/linux/rbtree.h        | 1 -
 include/mtd/mtd-abi.h         | 1 -
 6 files changed, 6 deletions(-)

(limited to 'include')

diff --git a/include/linux/mtd/flashchip.h b/include/linux/mtd/flashchip.h
index 7028ee1e77..e5c7d1cf0d 100644
--- a/include/linux/mtd/flashchip.h
+++ b/include/linux/mtd/flashchip.h
@@ -9,7 +9,6 @@
 #ifndef __MTD_FLASHCHIP_H__
 #define __MTD_FLASHCHIP_H__
 
-#define __UBOOT__
 #ifndef __UBOOT__
 /* For spinlocks. sched.h includes spinlock.h from whichever directory it
  * happens to be in - so we don't have to care whether we're on 2.2, which
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index 1526d075c7..8666413275 100644
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -8,7 +8,6 @@
 #ifndef __MTD_MTD_H__
 #define __MTD_MTD_H__
 
-#define __UBOOT__
 #ifndef __UBOOT__
 #include <linux/types.h>
 #include <linux/uio.h>
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index 67d2651481..8438490fe4 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -16,7 +16,6 @@
 #ifndef __LINUX_MTD_NAND_H
 #define __LINUX_MTD_NAND_H
 
-#define __UBOOT__
 #ifndef __UBOOT__
 #include <linux/wait.h>
 #include <linux/spinlock.h>
diff --git a/include/linux/mtd/ubi.h b/include/linux/mtd/ubi.h
index d9e58aedf6..05d0ab54c0 100644
--- a/include/linux/mtd/ubi.h
+++ b/include/linux/mtd/ubi.h
@@ -10,7 +10,6 @@
 #define __LINUX_UBI_H__
 
 #include <linux/types.h>
-#define __UBOOT__
 #ifndef __UBOOT__
 #include <linux/ioctl.h>
 #include <mtd/ubi-user.h>
diff --git a/include/linux/rbtree.h b/include/linux/rbtree.h
index b5994e3799..2cc16a3e7d 100644
--- a/include/linux/rbtree.h
+++ b/include/linux/rbtree.h
@@ -17,7 +17,6 @@
 #ifndef	_LINUX_RBTREE_H
 #define	_LINUX_RBTREE_H
 
-#define __UBOOT__
 #ifndef __UBOOT__
 #include <linux/kernel.h>
 #endif
diff --git a/include/mtd/mtd-abi.h b/include/mtd/mtd-abi.h
index b9f4bcb154..0ef582aeec 100644
--- a/include/mtd/mtd-abi.h
+++ b/include/mtd/mtd-abi.h
@@ -8,7 +8,6 @@
 #ifndef __MTD_ABI_H__
 #define __MTD_ABI_H__
 
-#define __UBOOT__
 #ifdef __UBOOT__
 #include <linux/compat.h>
 #endif
-- 
cgit v1.2.1