Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-09 03:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "common.h: remove value from bool defines"

Browse source 
This reverts commit 914c9ee971
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>
This commit is contained in:
Wolfgang Denk 2012-01-06 07:36:44 +01:00
parent 9a420986cc
commit d0b8feef8b
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
include/common.h
View file

@ -22,10 +22,10 @@
*/ */
#ifndef __COMMON_H_ #ifndef __COMMON_H_
#define __COMMON_H_ #define __COMMON_H_ 1
#undef _LINUX_CONFIG_H #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 */ #ifndef __ASSEMBLY__ /* put C only stuff in this section */
@ -51,18 +51,18 @@ typedef volatile unsigned char vu_char;
defined(CONFIG_MPC859DSL) || \ defined(CONFIG_MPC859DSL) || \
defined(CONFIG_MPC866) || defined(CONFIG_MPC866T) || \ defined(CONFIG_MPC866) || defined(CONFIG_MPC866T) || \
defined(CONFIG_MPC866P) defined(CONFIG_MPC866P)
# define CONFIG_MPC866_FAMILY # define CONFIG_MPC866_FAMILY 1
#elif defined(CONFIG_MPC870) \ #elif defined(CONFIG_MPC870) \
|| defined(CONFIG_MPC875) \ || defined(CONFIG_MPC875) \
|| defined(CONFIG_MPC880) \ || defined(CONFIG_MPC880) \
|| defined(CONFIG_MPC885) || defined(CONFIG_MPC885)
# define CONFIG_MPC885_FAMILY # define CONFIG_MPC885_FAMILY 1
#endif #endif
#if defined(CONFIG_MPC860) \ #if defined(CONFIG_MPC860) \
|| defined(CONFIG_MPC860T) \ || defined(CONFIG_MPC860T) \
|| defined(CONFIG_MPC866_FAMILY) \ || defined(CONFIG_MPC866_FAMILY) \
|| defined(CONFIG_MPC885_FAMILY) || defined(CONFIG_MPC885_FAMILY)
# define CONFIG_MPC86x # define CONFIG_MPC86x 1
#endif #endif
#elif defined(CONFIG_5xx) #elif defined(CONFIG_5xx)
#include <asm/5xx_immap.h> #include <asm/5xx_immap.h>
@ -77,10 +77,10 @@ typedef volatile unsigned char vu_char;
|| defined(CONFIG_MPC8248) \ || defined(CONFIG_MPC8248) \
|| defined(CONFIG_MPC8271) \ || defined(CONFIG_MPC8271) \
|| defined(CONFIG_MPC8272) || defined(CONFIG_MPC8272)
#define CONFIG_MPC8272_FAMILY #define CONFIG_MPC8272_FAMILY 1
#endif #endif
#if defined(CONFIG_MPC8272_FAMILY) #if defined(CONFIG_MPC8272_FAMILY)
#define CONFIG_MPC8260 #define CONFIG_MPC8260 1
#endif #endif
#include <asm/immap_8260.h> #include <asm/immap_8260.h>
#endif #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_SCC1) || defined(CONFIG_8xx_CONS_SCC2) \
|| defined(CONFIG_8xx_CONS_SCC3) || defined(CONFIG_8xx_CONS_SCC4) || defined(CONFIG_8xx_CONS_SCC3) || defined(CONFIG_8xx_CONS_SCC4)
#define CONFIG_SERIAL_MULTI #define CONFIG_SERIAL_MULTI 1
#endif #endif