[U-Boot] [PATCH] [trivial] common.h: remove value from bool defines

Wolfgang Denk wd at denx.de
Thu Jan 5 20:47:51 CET 2012


Dear Igor Grinberg,

In message <1324882432-8798-1-git-send-email-grinberg at compulab.co.il> you wrote:
> Several boolean defines have a value assigned.
> Remove the value as defining the symbol is enough.

trivial, but broken.

This patch breaks a ton of builds like this:

Configuring for MPC8308RDB board...
start.S:39:0: warning: "_LINUX_CONFIG_H" redefined [enabled by default]
/home/wd/git/u-boot/work/include/common.h:28:0: note: this is the location of the previous definition
   text    data     bss     dec     hex filename
 213352    6648   39212  259212   3f48c /work/wd/tmp-ppc/u-boot
Configuring for MPC8313ERDB_33 - Board: MPC8313ERDB, Options: SYS_33MHZ
start.S:39:0: warning: "_LINUX_CONFIG_H" redefined [enabled by default]
/home/wd/git/u-boot/work/include/common.h:28:0: note: this is the location of the previous definition
   text    data     bss     dec     hex filename
 266218   13360   42048  321626   4e85a /work/wd/tmp-ppc/u-boot
Configuring for MPC8313ERDB_66 - Board: MPC8313ERDB, Options: SYS_66MHZ
start.S:39:0: warning: "_LINUX_CONFIG_H" redefined [enabled by default]
/home/wd/git/u-boot/work/include/common.h:28:0: note: this is the location of the previous definition
   text    data     bss     dec     hex filename
 266218   13360   42048  321626   4e85a /work/wd/tmp-ppc/u-boot
Configuring for MPC8313ERDB_NAND_33 - Board: MPC8313ERDB, Options: SYS_33MHZ,NAND_U_BOOT
start.S:39:0: warning: "_LINUX_CONFIG_H" redefined [enabled by default]
/home/wd/git/u-boot/work/include/common.h:28:0: note: this is the location of the previous definition
/work/wd/tmp-ppc/nand_spl/board/freescale/mpc8313erdb/start.S:39:0: warning: "_LINUX_CONFIG_H" redefined [enabled by default]
/home/wd/git/u-boot/work/include/common.h:28:0: note: this is the location of the previous definition
   text    data     bss     dec     hex filename
 266621   13356   42064  322041   4e9f9 /work/wd/tmp-ppc/u-boot
Configuring for MPC8313ERDB_NAND_66 - Board: MPC8313ERDB, Options: SYS_66MHZ,NAND_U_BOOT
start.S:39:0: warning: "_LINUX_CONFIG_H" redefined [enabled by default]
/home/wd/git/u-boot/work/include/common.h:28:0: note: this is the location of the previous definition
/work/wd/tmp-ppc/nand_spl/board/freescale/mpc8313erdb/start.S:39:0: warning: "_LINUX_CONFIG_H" redefined [enabled by default]
/home/wd/git/u-boot/work/include/common.h:28:0: note: this is the location of the previous definition
   text    data     bss     dec     hex filename
 266621   13356   42064  322041   4e9f9 /work/wd/tmp-ppc/u-boot
Configuring for MPC8315ERDB board...
start.S:39:0: warning: "_LINUX_CONFIG_H" redefined [enabled by default]
/home/wd/git/u-boot/work/include/common.h:28:0: note: this is the location of the previous definition
   text    data     bss     dec     hex filename
 316680   13708   76464  406852   63544 /work/wd/tmp-ppc/u-boot
Configuring for MPC8315ERDB_NAND - Board: MPC8315ERDB, Options: NAND_U_BOOT
start.S:39:0: warning: "_LINUX_CONFIG_H" redefined [enabled by default]
/home/wd/git/u-boot/work/include/common.h:28:0: note: this is the location of the previous definition
/work/wd/tmp-ppc/nand_spl/board/freescale/mpc8315erdb/start.S:39:0: warning: "_LINUX_CONFIG_H" redefined [enabled by default]
/home/wd/git/u-boot/work/include/common.h:28:0: note: this is the location of the previous definition
   text    data     bss     dec     hex filename
 317099   13704   76464  407267   636e3 /work/wd/tmp-ppc/u-boot


or even

Configuring for TQM8272 board...
In file included from /home/wd/git/u-boot/work/lib/asm-offsets.c:18:0:
/home/wd/git/u-boot/work/include/common.h:83:0: warning: "CONFIG_MPC8260" redefined [enabled by default]
/home/wd/git/u-boot/work/include/configs/TQM8272.h:36:0: note: this is the location of the previous definition
In file included from traps.c:35:0:
/home/wd/git/u-boot/work/include/common.h:83:0: warning: "CONFIG_MPC8260" redefined [enabled by default]
/home/wd/git/u-boot/work/include/configs/TQM8272.h:36:0: note: this is the location of the previous definition
In file included from serial_smc.c:33:0:
/home/wd/git/u-boot/work/include/common.h:83:0: warning: "CONFIG_MPC8260" redefined [enabled by default]
/home/wd/git/u-boot/work/include/configs/TQM8272.h:36:0: note: this is the location of the previous definition
In file included from part.c:24:0:
/home/wd/git/u-boot/work/include/common.h:83:0: warning: "CONFIG_MPC8260" redefined [enabled by default]
/home/wd/git/u-boot/work/include/configs/TQM8272.h:36:0: note: this is the location of the previous definition
In file included from serial_scc.c:31:0:
/home/wd/git/u-boot/work/include/common.h:83:0: warning: "CONFIG_MPC8260" redefined [enabled by default]
/home/wd/git/u-boot/work/include/configs/TQM8272.h:36:0: note: this is the location of the previous definition
In file included from cpu.c:43:0:
/home/wd/git/u-boot/work/include/common.h:83:0: warning: "CONFIG_MPC8260" redefined [enabled by default]
/home/wd/git/u-boot/work/include/configs/TQM8272.h:36:0: note: this is the location of the previous definition
In file included from cpu_init.c:24:0:
/home/wd/git/u-boot/work/include/common.h:83:0: warning: "CONFIG_MPC8260" redefined [enabled by default]
/home/wd/git/u-boot/work/include/configs/TQM8272.h:36:0: note: this is the location of the previous definition
In file included from speed.c:24:0:
/home/wd/git/u-boot/work/include/common.h:83:0: warning: "CONFIG_MPC8260" redefined [enabled by default]
/home/wd/git/u-boot/work/include/configs/TQM8272.h:36:0: note: this is the location of the previous definition
In file included from interrupts.c:26:0:
/home/wd/git/u-boot/work/include/common.h:83:0: warning: "CONFIG_MPC8260" redefined [enabled by default]
/home/wd/git/u-boot/work/include/configs/TQM8272.h:36:0: note: this is the location of the previous definition
In file included from ether_fcc.c:42:0:
/home/wd/git/u-boot/work/include/common.h:83:0: warning: "CONFIG_MPC8260" redefined [enabled by default]
/home/wd/git/u-boot/work/include/configs/TQM8272.h:36:0: note: this is the location of the previous definition
In file included from i2c.c:27:0:
/home/wd/git/u-boot/work/include/common.h:83:0: warning: "CONFIG_MPC8260" redefined [enabled by default]In file included from board.c:24:0:
/home/wd/git/u-boot/work/include/common.h:83:0: warning: "CONFIG_MPC8260" redefined [enabled by default]
/home/wd/git/u-boot/work/include/configs/TQM8272.h:36:0: note: this is the location of the previous definition

/home/wd/git/u-boot/work/include/configs/TQM8272.h:36:0: note: this is the location of the previous definition
In file included from commproc.c:20:0:
/home/wd/git/u-boot/work/include/common.h:83:0: warning: "CONFIG_MPC8260" redefined [enabled by default]In file included from bedbug_603e.c:5:0:
/home/wd/git/u-boot/work/include/common.h:83:0: warning: "CONFIG_MPC8260" redefined [enabled by default]
/home/wd/git/u-boot/work/include/configs/TQM8272.h:36:0: note: this is the location of the previous definition
...



Do you want to provide a fix, or shall I just revert the commit?

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Q:  How many IBM CPU's does it take to execute a job?
A:  Four; three to hold it down, and one to rip its head off.


More information about the U-Boot mailing list