kbuild: force to define UBOOT in all the C sources

PATCH In review Masahiro Yamada 4 participants 4 messages Aug 31, 2014 – Sep 17, 2014

Subsystems (9)

USB Kbuild Library code Memory technology devices (MTD) +5 more subsystems

lore

Share & tools

lore

Masahiro Yamada

author

2014-08-31 06:16 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---

I built all the boards and comfirmed the same results are produced with/without this patch.

 Makefile                               | 2 +-
 drivers/mtd/mtdconcat.c                | 1 -
 drivers/mtd/mtdcore.c                  | 1 -
 drivers/mtd/mtdpart.c                  | 1 -
 drivers/mtd/nand/nand_base.c           | 1 -
 drivers/mtd/nand/nand_bbt.c            | 1 -
 drivers/mtd/nand/nand_ids.c            | 1 -
 drivers/mtd/ubi/attach.c               | 1 -
 drivers/mtd/ubi/build.c                | 1 -
 drivers/mtd/ubi/crc32.c                | 1 -
 drivers/mtd/ubi/debug.c                | 1 -
 drivers/mtd/ubi/debug.h                | 1 -
 drivers/mtd/ubi/eba.c                  | 1 -
 drivers/mtd/ubi/fastmap.c              | 1 -
 drivers/mtd/ubi/io.c                   | 1 -
 drivers/mtd/ubi/kapi.c                 | 1 -
 drivers/mtd/ubi/ubi.h                  | 1 -
 drivers/mtd/ubi/upd.c                  | 1 -
 drivers/mtd/ubi/vmt.c                  | 1 -
 drivers/mtd/ubi/vtbl.c                 | 1 -
 drivers/mtd/ubi/wl.c                   | 1 -
 drivers/usb/musb-new/am35x.c           | 1 -
 drivers/usb/musb-new/musb_core.c       | 1 -
 drivers/usb/musb-new/musb_dsps.c       | 1 -
 drivers/usb/musb-new/musb_gadget.c     | 1 -
 drivers/usb/musb-new/musb_gadget_ep0.c | 1 -
 drivers/usb/musb-new/musb_host.c       | 1 -
 drivers/usb/musb-new/musb_uboot.c      | 1 -
 drivers/usb/musb-new/omap2430.c        | 1 -
 fs/ubifs/budget.c                      | 1 -
 fs/ubifs/debug.c                       | 1 -
 fs/ubifs/debug.h                       | 1 -
 fs/ubifs/io.c                          | 1 -
 fs/ubifs/log.c                         | 1 -
 fs/ubifs/lprops.c                      | 1 -
 fs/ubifs/lpt.c                         | 1 -
 fs/ubifs/lpt_commit.c                  | 1 -
 fs/ubifs/master.c                      | 1 -
 fs/ubifs/misc.h                        | 1 -
 fs/ubifs/recovery.c                    | 1 -
 fs/ubifs/replay.c                      | 1 -
 fs/ubifs/sb.c                          | 1 -
 fs/ubifs/scan.c                        | 1 -
 fs/ubifs/super.c                       | 1 -
 fs/ubifs/tnc.c                         | 1 -
 fs/ubifs/tnc_misc.c                    | 1 -
 fs/ubifs/ubifs.c                       | 1 -
 fs/ubifs/ubifs.h                       | 1 -
 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 -
 lib/list_sort.c                        | 1 -
 lib/rbtree.c                           | 1 -
 56 files changed, 1 insertion(+), 56 deletions(-)

Makefile +1 -1

index 9646859..0930661 100644
@@ -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 \

drivers/mtd/mtdconcat.c +0 -1

index 39daeab..3e36918 100644
@@ -10,7 +10,6 @@
  *
  */
 
-#define __UBOOT__
 #ifndef __UBOOT__
 #include <linux/kernel.h>
 #include <linux/module.h>

drivers/mtd/mtdcore.c +0 -1

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

drivers/mtd/mtdpart.c +0 -1

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

drivers/mtd/nand/nand_base.c +0 -1

index 085b154..7153e3c 100644
@@ -29,7 +29,6 @@
  *
  */
 
-#define __UBOOT__
 #ifndef __UBOOT__
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

drivers/mtd/nand/nand_bbt.c +0 -1

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

drivers/mtd/nand/nand_ids.c +0 -1

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

drivers/mtd/ubi/attach.c +0 -1

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

drivers/mtd/ubi/build.c +0 -1

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

drivers/mtd/ubi/crc32.c +0 -1

index 0d65bf4..9c54ea4 100644
@@ -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>

drivers/mtd/ubi/debug.c +0 -1

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

drivers/mtd/ubi/debug.h +0 -1

index 980eb11..bfa9dfb 100644
@@ -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

drivers/mtd/ubi/eba.c +0 -1

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

drivers/mtd/ubi/fastmap.c +0 -1

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

drivers/mtd/ubi/io.c +0 -1

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

drivers/mtd/ubi/kapi.c +0 -1

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

drivers/mtd/ubi/ubi.h +0 -1

index 20fd704..754b337 100644
@@ -10,7 +10,6 @@
 #ifndef __UBI_UBI_H__
 #define __UBI_UBI_H__
 
-#define __UBOOT__
 #ifndef __UBOOT__
 #include <linux/types.h>
 #include <linux/list.h>

drivers/mtd/ubi/upd.c +0 -1

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

drivers/mtd/ubi/vmt.c +0 -1

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

drivers/mtd/ubi/vtbl.c +0 -1

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

drivers/mtd/ubi/wl.c +0 -1

index 1023090..6886f89 100644
@@ -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>

drivers/usb/musb-new/am35x.c +0 -1

index 57c9bd3..857d7eb 100644
@@ -26,7 +26,6 @@
  *
  */
 
-#define __UBOOT__
 #ifndef __UBOOT__
 #include <linux/init.h>
 #include <linux/module.h>

drivers/usb/musb-new/musb_core.c +0 -1

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

drivers/usb/musb-new/musb_dsps.c +0 -1

index 9a03917..17ed224 100644
@@ -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>

drivers/usb/musb-new/musb_gadget.c +0 -1

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

drivers/usb/musb-new/musb_gadget_ep0.c +0 -1

index 8c3b0a1..5a71501 100644
@@ -33,7 +33,6 @@
  *
  */
 
-#define __UBOOT__
 #ifndef __UBOOT__
 #include <linux/kernel.h>
 #include <linux/list.h>

drivers/usb/musb-new/musb_host.c +0 -1

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

drivers/usb/musb-new/musb_uboot.c +0 -1

index 0d7b89f..2676f09 100644
@@ -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"

drivers/usb/musb-new/omap2430.c +0 -1

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

fs/ubifs/budget.c +0 -1

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

fs/ubifs/debug.c +0 -1

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

fs/ubifs/debug.h +0 -1

index 6d325af..807ce1b 100644
@@ -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);

fs/ubifs/io.c +0 -1

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

fs/ubifs/log.c +0 -1

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

fs/ubifs/lprops.c +0 -1

index fc6686b..a1a814f 100644
@@ -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

fs/ubifs/lpt.c +0 -1

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

fs/ubifs/lpt_commit.c +0 -1

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

fs/ubifs/master.c +0 -1

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

fs/ubifs/misc.h +0 -1

index 4316d3c..7cad2be 100644
@@ -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

fs/ubifs/recovery.c +0 -1

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

fs/ubifs/replay.c +0 -1

index 6393b15..7268b37 100644
@@ -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>

fs/ubifs/sb.c +0 -1

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

fs/ubifs/scan.c +0 -1

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

fs/ubifs/super.c +0 -1

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

fs/ubifs/tnc.c +0 -1

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

fs/ubifs/tnc_misc.c +0 -1

index 81bdad9..f808e0b 100644
@@ -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

fs/ubifs/ubifs.c +0 -1

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

fs/ubifs/ubifs.h +0 -1

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

include/linux/mtd/flashchip.h +0 -1

index 7028ee1..e5c7d1c 100644
@@ -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

include/linux/mtd/mtd.h +0 -1

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

include/linux/mtd/nand.h +0 -1

index 67d2651..8438490 100644
@@ -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>

include/linux/mtd/ubi.h +0 -1

index d9e58ae..05d0ab5 100644
@@ -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>

include/linux/rbtree.h +0 -1

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

include/mtd/mtd-abi.h +0 -1

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

lib/list_sort.c +0 -1

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

lib/rbtree.c +0 -1

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

Signature · 1 line

1.9.1

Marek Vasut

2014-08-31 08:48 UTC #1 lore raw

PATCH 1/1 kbuild: force to define __UBOOT__ in all the C sources

Quoted 11 lines · Masahiro Yamada

U-Boot has imported various source files from other projects, mostly Linux.
Something like
  #ifdef __UBOOT__
    [ modification for U-Boot ]
  #else
    [ original code ]
  #endif

Quoted 8 lines

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 <[email protected]>
---

Nice idea,

Acked-by Marek Vasut <[email protected]>

Best regards,
Marek Vasut

Heiko Schocher

2014-09-01 08:51 UTC #2 lore raw

PATCH 1/1 kbuild: force to define __UBOOT__ in all the C sources

Hello Masahiro,

Am 31.08.2014 10:48, schrieb Marek Vasut:

Quoted 18 lines · Masahiro Yamada

Quoted 17 lines
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.

Quoted 6 lines

Quoted 2 lines
Signed-off-by Masahiro Yamada<[email protected]>
---
Nice idea,
Acked-by Marek Vasut<[email protected]>

Acked-by Heiko Schocher <[email protected]>

Maybe we should add an entry in README too?

bye,
Heiko

Signature · 2 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Tom Rini

2014-09-17 00:44 UTC #3 lore raw

In reply to Masahiro Yamada

Quoted 14 lines · Masahiro Yamada

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.

Quoted 6 lines

Instead of defining __UBOOT__ in each source file, passing it from the top Makefile would be easier.
Signed-off-by Masahiro Yamada <[email protected]>
Acked-by Marek Vasut <[email protected]>
Acked-by Heiko Schocher <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140916/1c8d2d71/attachment.pgp>