summaryrefslogtreecommitdiff
path: root/include/linux
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 /include/linux
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 'include/linux')
-rw-r--r--include/linux/mtd/flashchip.h1
-rw-r--r--include/linux/mtd/mtd.h1
-rw-r--r--include/linux/mtd/nand.h1
-rw-r--r--include/linux/mtd/ubi.h1
-rw-r--r--include/linux/rbtree.h1
5 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/mtd/flashchip.h b/include/linux/mtd/flashchip.h
index 7028ee1..e5c7d1c 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 1526d07..8666413 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 67d2651..8438490 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 d9e58ae..05d0ab5 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 b5994e3..2cc16a3 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