summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2012-01-06 07:36:44 +0100
committerWolfgang Denk <wd@denx.de>2012-01-06 07:36:44 +0100
commitd0b8feef8b50335a58ffde7df3e6748adfaa7025 (patch)
treee866e5716d7775b204dc902cbd831100cb00c668
parent9a420986cccc9bd2c37affd931d627b3c3e72952 (diff)
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>
-rw-r--r--include/common.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/include/common.h b/include/common.h
index 59e0b00a91..3df1defab1 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