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

newer
[U-Boot] stuck after redirecting...

older
[U-Boot] Parameter restriction in...

Igor Grinberg

26 Dec 2011 26 Dec '11

7:53 a.m.

Several boolean defines have a value assigned. Remove the value as defining the symbol is enough.

Signed-off-by: Igor Grinberg grinberg@compulab.co.il --- include/common.h | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/common.h b/include/common.h index 5cfdd76..695e43c 100644 --- a/include/common.h +++ b/include/common.h @@ -22,10 +22,10 @@ */

#ifndef __COMMON_H_ -#define __COMMON_H_ 1 +#define __COMMON_H_

#undef _LINUX_CONFIG_H -#define _LINUX_CONFIG_H 1 /* avoid reading Linux autoconf.h file */ +#define _LINUX_CONFIG_H /* avoid reading Linux autoconf.h file */

#ifndef __ASSEMBLY__ /* put C only stuff in this section */

@@ -51,18 +51,18 @@ typedef volatile unsigned char vu_char; defined(CONFIG_MPC859DSL) || \ defined(CONFIG_MPC866) || defined(CONFIG_MPC866T) || \ defined(CONFIG_MPC866P) -# define CONFIG_MPC866_FAMILY 1 +# define CONFIG_MPC866_FAMILY #elif defined(CONFIG_MPC870) \ || defined(CONFIG_MPC875) \ || defined(CONFIG_MPC880) \ || defined(CONFIG_MPC885) -# define CONFIG_MPC885_FAMILY 1 +# define CONFIG_MPC885_FAMILY #endif #if defined(CONFIG_MPC860) \ || defined(CONFIG_MPC860T) \ || defined(CONFIG_MPC866_FAMILY) \ || defined(CONFIG_MPC885_FAMILY) -# define CONFIG_MPC86x 1 +# define CONFIG_MPC86x #endif #elif defined(CONFIG_5xx) #include <asm/5xx_immap.h> @@ -77,10 +77,10 @@ typedef volatile unsigned char vu_char; || defined(CONFIG_MPC8248) \ || defined(CONFIG_MPC8271) \ || defined(CONFIG_MPC8272) -#define CONFIG_MPC8272_FAMILY 1 +#define CONFIG_MPC8272_FAMILY #endif #if defined(CONFIG_MPC8272_FAMILY) -#define CONFIG_MPC8260 1 +#define CONFIG_MPC8260 #endif #include <asm/immap_8260.h> #endif @@ -200,7 +200,7 @@ typedef void (interrupt_handler_t)(void *); || defined(CONFIG_8xx_CONS_SCC1) || defined(CONFIG_8xx_CONS_SCC2) \ || defined(CONFIG_8xx_CONS_SCC3) || defined(CONFIG_8xx_CONS_SCC4)

-#define CONFIG_SERIAL_MULTI 1 +#define CONFIG_SERIAL_MULTI

#endif

-- 1.7.3.4

Show replies by date

Mike Frysinger

1 Jan 1 Jan

12:05 a.m.

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

Acked-by: Mike Frysinger vapier@gentoo.org -mike

Wolfgang Denk

5 Jan 5 Jan

4:35 p.m.

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

Dear Igor Grinberg,

In message 1324882432-8798-1-git-send-email-grinberg@compulab.co.il you wrote:

...

Several boolean defines have a value assigned. Remove the value as defining the symbol is enough.

Signed-off-by: Igor Grinberg grinberg@compulab.co.il

include/common.h | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-)

Applied, thanks.

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@denx.de Committee, n.: A group of men who individually can do nothing but as a group decide that nothing can be done. - Fred Allen

Wolfgang Denk

8:47 p.m.

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

Dear Igor Grinberg,

In message 1324882432-8798-1-git-send-email-grinberg@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@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.

Wolfgang Denk

6 Jan 6 Jan

10:20 a.m.

New subject: [U-Boot] [PATCH] Revert "common.h: remove value from bool defines"

This reverts commit 914c9ee971924665c9d2927fe83d8d70060b1eb8 which is causing tons of build warnings like 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 etc.

Signed-off-by: Wolfgang Denk wd@denx.de --- include/common.h | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/common.h b/include/common.h index 59e0b00..3df1def 100644 --- a/include/common.h +++ b/include/common.h @@ -22,10 +22,10 @@ */

#ifndef __COMMON_H_ -#define __COMMON_H_ +#define __COMMON_H_ 1

#undef _LINUX_CONFIG_H -#define _LINUX_CONFIG_H /* avoid reading Linux autoconf.h file */ +#define _LINUX_CONFIG_H 1 /* avoid reading Linux autoconf.h file */

#ifndef __ASSEMBLY__ /* put C only stuff in this section */

@@ -51,18 +51,18 @@ typedef volatile unsigned char vu_char; defined(CONFIG_MPC859DSL) || \ defined(CONFIG_MPC866) || defined(CONFIG_MPC866T) || \ defined(CONFIG_MPC866P) -# define CONFIG_MPC866_FAMILY +# define CONFIG_MPC866_FAMILY 1 #elif defined(CONFIG_MPC870) \ || defined(CONFIG_MPC875) \ || defined(CONFIG_MPC880) \ || defined(CONFIG_MPC885) -# define CONFIG_MPC885_FAMILY +# define CONFIG_MPC885_FAMILY 1 #endif #if defined(CONFIG_MPC860) \ || defined(CONFIG_MPC860T) \ || defined(CONFIG_MPC866_FAMILY) \ || defined(CONFIG_MPC885_FAMILY) -# define CONFIG_MPC86x +# define CONFIG_MPC86x 1 #endif #elif defined(CONFIG_5xx) #include <asm/5xx_immap.h> @@ -77,10 +77,10 @@ typedef volatile unsigned char vu_char; || defined(CONFIG_MPC8248) \ || defined(CONFIG_MPC8271) \ || defined(CONFIG_MPC8272) -#define CONFIG_MPC8272_FAMILY +#define CONFIG_MPC8272_FAMILY 1 #endif #if defined(CONFIG_MPC8272_FAMILY) -#define CONFIG_MPC8260 +#define CONFIG_MPC8260 1 #endif #include <asm/immap_8260.h> #endif @@ -200,7 +200,7 @@ typedef void (interrupt_handler_t)(void *); || defined(CONFIG_8xx_CONS_SCC1) || defined(CONFIG_8xx_CONS_SCC2) \ || defined(CONFIG_8xx_CONS_SCC3) || defined(CONFIG_8xx_CONS_SCC4)

-#define CONFIG_SERIAL_MULTI +#define CONFIG_SERIAL_MULTI 1

#endif

-- 1.7.7.5

Wolfgang Denk

7 Jan 7 Jan

12:12 a.m.

New subject: [U-Boot] [PATCH] Revert "common.h: remove value from bool defines"

Dear Wolfgang Denk,

In message 1325841606-24698-1-git-send-email-wd@denx.de you wrote:

...

This reverts commit 914c9ee971924665c9d2927fe83d8d70060b1eb8 which is causing tons of build warnings like 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 etc.

Signed-off-by: Wolfgang Denk wd@denx.de

include/common.h | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-)

Applied, thanks.

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@denx.de The universe does not have laws - it has habits, and habits can be broken.

4874

Age (days ago)

4885

Last active (days ago)

List overview

Download

5 comments

3 participants

tags (0)

participants (3)

Igor Grinberg
Mike Frysinger
Wolfgang Denk