Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-24 21:54:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

kbuild: force to define __UBOOT__ in all the C sources

Browse source 
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>
This commit is contained in:
Masahiro Yamada 2014-08-31 15:16:53 +09:00 committed by Tom Rini
parent 5d9f423ddb
commit 3b61297024
56 changed files with 1 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -341,7 +341,7 @@ CHECK = sparse
CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \
-Wbitwise -Wno-return-void -D__CHECK_ENDIAN__ $(CF)
KBUILD_CPPFLAGS := -D__KERNEL__
KBUILD_CPPFLAGS := -D__KERNEL__ -D__UBOOT__
KBUILD_CFLAGS := -Wall -Wstrict-prototypes \
-Wno-format-security \

1
drivers/mtd/mtdconcat.c
View file

@ -10,7 +10,6 @@
*
*/
#define __UBOOT__
#ifndef __UBOOT__
#include <linux/kernel.h>
#include <linux/module.h>

1
drivers/mtd/mtdcore.c
View file

@ -9,7 +9,6 @@
*
*/
#define __UBOOT__
#ifndef __UBOOT__
#include <linux/module.h>
#include <linux/kernel.h>

1
drivers/mtd/mtdpart.c
View file

@ -9,7 +9,6 @@
*
*/
#define __UBOOT__
#ifndef __UBOOT__
#include <linux/module.h>
#include <linux/types.h>

1
drivers/mtd/nand/nand_base.c
View file

@ -29,7 +29,6 @@
*
*/
#define __UBOOT__
#ifndef __UBOOT__
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

1
drivers/mtd/nand/nand_bbt.c
View file

@ -59,7 +59,6 @@
*
*/
#define __UBOOT__
#ifndef __UBOOT__
#include <linux/slab.h>
#include <linux/types.h>

1
drivers/mtd/nand/nand_ids.c
View file

@ -8,7 +8,6 @@
* published by the Free Software Foundation.
*
*/
#define __UBOOT__
#ifndef __UBOOT__
#include <linux/module.h>
#include <linux/mtd/nand.h>

1
drivers/mtd/ubi/attach.c
View file

@ -70,7 +70,6 @@
* o Otherwise this is corruption type 2.
*/
#define __UBOOT__
#ifndef __UBOOT__
#include <linux/err.h>
#include <linux/slab.h>

1
drivers/mtd/ubi/build.c
View file

@ -17,7 +17,6 @@
* later using the "UBI control device".
*/
#define __UBOOT__
#ifndef __UBOOT__
#include <linux/module.h>
#include <linux/moduleparam.h>

1
drivers/mtd/ubi/crc32.c
View file

@ -20,7 +20,6 @@
* Version 2. See the file COPYING for more details.
*/
#define __UBOOT__
#ifndef __UBOOT__
#include <linux/crc32.h>
#include <linux/kernel.h>

1
drivers/mtd/ubi/debug.c
View file

@ -8,7 +8,6 @@
#include <ubi_uboot.h>
#include "ubi.h"
#define __UBOOT__
#ifndef __UBOOT__
#include <linux/debugfs.h>
#include <linux/uaccess.h>

1
drivers/mtd/ubi/debug.h
View file

@ -13,7 +13,6 @@ void ubi_dump_flash(struct ubi_device *ubi, int pnum, int offset, int len);
void ubi_dump_ec_hdr(const struct ubi_ec_hdr *ec_hdr);
void ubi_dump_vid_hdr(const struct ubi_vid_hdr *vid_hdr);
#define __UBOOT__
#ifndef __UBOOT__
#include <linux/random.h>
#endif

1
drivers/mtd/ubi/eba.c
View file

@ -29,7 +29,6 @@
* 64 bits is enough to never overflow.
*/
#define __UBOOT__
#ifndef __UBOOT__
#include <linux/slab.h>
#include <linux/crc32.h>

1
drivers/mtd/ubi/fastmap.c
View file

@ -6,7 +6,6 @@
*
*/
#define __UBOOT__
#ifndef __UBOOT__
#include <linux/crc32.h>
#else

1
drivers/mtd/ubi/io.c
View file

@ -73,7 +73,6 @@
* back and writes the whole sub-page.
*/
#define __UBOOT__
#ifndef __UBOOT__
#include <linux/crc32.h>
#include <linux/err.h>

1
drivers/mtd/ubi/kapi.c
View file

@ -8,7 +8,6 @@
/* This file mostly implements UBI kernel API functions */
#define __UBOOT__
#ifndef __UBOOT__
#include <linux/module.h>
#include <linux/slab.h>

1
drivers/mtd/ubi/ubi.h
View file

@ -10,7 +10,6 @@
#ifndef __UBI_UBI_H__
#define __UBI_UBI_H__
#define __UBOOT__
#ifndef __UBOOT__
#include <linux/types.h>
#include <linux/list.h>

1
drivers/mtd/ubi/upd.c
View file

@ -26,7 +26,6 @@
* transaction with a roll-back capability.
*/
#define __UBOOT__
#ifndef __UBOOT__
#include <linux/uaccess.h>
#else

1
drivers/mtd/ubi/vmt.c
View file

@ -11,7 +11,6 @@
* resizing.
*/
#define __UBOOT__
#ifndef __UBOOT__
#include <linux/err.h>
#include <linux/slab.h>

1
drivers/mtd/ubi/vtbl.c
View file

@ -43,7 +43,6 @@
* damaged.
*/
#define __UBOOT__
#ifndef __UBOOT__
#include <linux/crc32.h>
#include <linux/err.h>

1
drivers/mtd/ubi/wl.c
View file

@ -86,7 +86,6 @@
* room for future re-works of the WL sub-system.
*/
#define __UBOOT__
#ifndef __UBOOT__
#include <linux/slab.h>
#include <linux/crc32.h>

1
drivers/usb/musb-new/am35x.c
View file

@ -26,7 +26,6 @@
*
*/
#define __UBOOT__
#ifndef __UBOOT__
#include <linux/init.h>
#include <linux/module.h>

1
drivers/usb/musb-new/musb_core.c
View file

@ -89,7 +89,6 @@
* Most of the conditional compilation will (someday) vanish.
*/
#define __UBOOT__
#ifndef __UBOOT__
#include <linux/module.h>
#include <linux/kernel.h>

1
drivers/usb/musb-new/musb_dsps.c
View file

@ -29,7 +29,6 @@
* da8xx.c would be merged to this file after testing.
*/
#define __UBOOT__
#ifndef __UBOOT__
#include <linux/init.h>
#include <linux/io.h>

1
drivers/usb/musb-new/musb_gadget.c
View file

@ -33,7 +33,6 @@
*
*/
#define __UBOOT__
#ifndef __UBOOT__
#include <linux/kernel.h>
#include <linux/list.h>

1
drivers/usb/musb-new/musb_gadget_ep0.c
View file

@ -33,7 +33,6 @@
*
*/
#define __UBOOT__
#ifndef __UBOOT__
#include <linux/kernel.h>
#include <linux/list.h>

1
drivers/usb/musb-new/musb_host.c
View file

@ -33,7 +33,6 @@
*
*/
#define __UBOOT__
#ifndef __UBOOT__
#include <linux/module.h>
#include <linux/kernel.h>

1
drivers/usb/musb-new/musb_uboot.c
View file

@ -4,7 +4,6 @@
#include <linux/usb/ch9.h>
#include <linux/usb/gadget.h>
#define __UBOOT__
#include <usb.h>
#include "linux-compat.h"
#include "usb-compat.h"

1
drivers/usb/musb-new/omap2430.c
View file

@ -24,7 +24,6 @@
* Suite 330, Boston, MA 02111-1307 USA
*
*/
#define __UBOOT__
#ifndef __UBOOT__
#include <linux/module.h>
#include <linux/kernel.h>

1
fs/ubifs/budget.c
View file

@ -20,7 +20,6 @@
*/
#include "ubifs.h"
#define __UBOOT__
#ifndef __UBOOT__
#include <linux/writeback.h>
#else

1
fs/ubifs/debug.c
View file

@ -16,7 +16,6 @@
* various local functions of those subsystems.
*/
#define __UBOOT__
#ifndef __UBOOT__
#include <linux/module.h>
#include <linux/debugfs.h>

1
fs/ubifs/debug.h
View file

@ -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);

1
fs/ubifs/io.c
View file

@ -59,7 +59,6 @@
* they are read from the flash media.
*/
#define __UBOOT__
#ifndef __UBOOT__
#include <linux/crc32.h>
#include <linux/slab.h>

1
fs/ubifs/log.c
View file

@ -16,7 +16,6 @@
* journal.
*/
#define __UBOOT__
#ifdef __UBOOT__
#include <linux/err.h>
#endif

1
fs/ubifs/lprops.c
View file

@ -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

1
fs/ubifs/lpt.c
View file

@ -33,7 +33,6 @@
*/
#include "ubifs.h"
#define __UBOOT__
#ifndef __UBOOT__
#include <linux/crc16.h>
#include <linux/math64.h>

1
fs/ubifs/lpt_commit.c
View file

@ -14,7 +14,6 @@
* subsystem.
*/
#define __UBOOT__
#ifndef __UBOOT__
#include <linux/crc16.h>
#include <linux/slab.h>

1
fs/ubifs/master.c
View file

@ -11,7 +11,6 @@
/* This file implements reading and writing the master node */
#define __UBOOT__
#include "ubifs.h"
#ifdef __UBOOT__
#include <linux/compat.h>

1
fs/ubifs/misc.h
View file

@ -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

1
fs/ubifs/recovery.c
View file

@ -36,7 +36,6 @@
* refuses to mount.
*/
#define __UBOOT__
#ifndef __UBOOT__
#include <linux/crc32.h>
#include <linux/slab.h>

1
fs/ubifs/replay.c
View file

@ -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>

1
fs/ubifs/sb.c
View file

@ -16,7 +16,6 @@
*/
#include "ubifs.h"
#define __UBOOT__
#ifndef __UBOOT__
#include <linux/slab.h>
#include <linux/random.h>

1
fs/ubifs/scan.c
View file

@ -16,7 +16,6 @@
* debugging functions.
*/
#define __UBOOT__
#ifdef __UBOOT__
#include <linux/err.h>
#endif

1
fs/ubifs/super.c
View file

@ -15,7 +15,6 @@
* corresponding subsystems, but most of it is here.
*/
#define __UBOOT__
#ifndef __UBOOT__
#include <linux/init.h>
#include <linux/slab.h>

1
fs/ubifs/tnc.c
View file

@ -19,7 +19,6 @@
* the mutex locked.
*/
#define __UBOOT__
#ifndef __UBOOT__
#include <linux/crc32.h>
#include <linux/slab.h>

1
fs/ubifs/tnc_misc.c
View file

@ -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

1
fs/ubifs/ubifs.c
View file

@ -26,7 +26,6 @@
#include "ubifs.h"
#include <u-boot/zlib.h>
#define __UBOOT__
#include <linux/err.h>
#include <linux/lzo.h>

1
fs/ubifs/ubifs.h
View file

@ -15,7 +15,6 @@
#ifndef __UBIFS_H__
#define __UBIFS_H__
#define __UBOOT__
#ifndef __UBOOT__
#include <asm/div64.h>
#include <linux/statfs.h>

1
include/linux/mtd/flashchip.h
View file

@ -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

1
include/linux/mtd/mtd.h
View file

@ -8,7 +8,6 @@
#ifndef __MTD_MTD_H__
#define __MTD_MTD_H__
#define __UBOOT__
#ifndef __UBOOT__
#include <linux/types.h>
#include <linux/uio.h>

1
include/linux/mtd/nand.h
View file

@ -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>

1
include/linux/mtd/ubi.h
View file

@ -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>

1
include/linux/rbtree.h
View file

@ -17,7 +17,6 @@
#ifndef _LINUX_RBTREE_H
#define _LINUX_RBTREE_H
#define __UBOOT__
#ifndef __UBOOT__
#include <linux/kernel.h>
#endif

1
include/mtd/mtd-abi.h
View file

@ -8,7 +8,6 @@
#ifndef __MTD_ABI_H__
#define __MTD_ABI_H__
#define __UBOOT__
#ifdef __UBOOT__
#include <linux/compat.h>
#endif

1
lib/list_sort.c
View file

@ -1,4 +1,3 @@
#define __UBOOT__
#ifndef __UBOOT__
#include <linux/kernel.h>
#include <linux/module.h>

1
lib/rbtree.c
View file

@ -9,7 +9,6 @@
linux/lib/rbtree.c
*/
#define __UBOOT__
#include <linux/rbtree_augmented.h>
#ifndef __UBOOT__
#include <linux/export.h>