This caused namespace clash with same macro defined in include/config.h:

cmd_bc3450.c:55:0: warning: "CONFIG_SYS_CPU" redefined [enabled by default]
In file included from /tmp/u-boot-marex/include/command.h:30:0,
                 from /tmp/u-boot-marex/include/image.h:49,
                 from /tmp/u-boot-marex/include/common.h:117,
                 from cmd_bc3450.c:27:
/tmp/u-boot-marex/include/config.h:3:0: note: this is the location of the 
previous definition

Signed-off-by: Marek Vasut <ma...@denx.de>
Cc: Detlev Zundel <d...@denx.de>
---
 board/bc3450/cmd_bc3450.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/board/bc3450/cmd_bc3450.c b/board/bc3450/cmd_bc3450.c
index a9e4902..b1f24ce 100644
--- a/board/bc3450/cmd_bc3450.c
+++ b/board/bc3450/cmd_bc3450.c
@@ -52,9 +52,9 @@
 #define THERM_WRITE_TL         0x02
 #define THERM_WRITE_TH         0x01
 
-#define CONFIG_SYS_CPU                 2
-#define CONFIG_SYS_1SHOT               1
-#define CONFIG_SYS_STANDALONE          0
+#define DS1620_CFG_CPU                 2
+#define DS1620_CFG_1SHOT               1
+#define DS1620_CFG_STANDALONE          0
 
 struct therm {
        int hi;
@@ -513,7 +513,7 @@ static int cmd_temp (cmd_tbl_t * cmdtp, int flag, int argc, 
char * const argv[])
                        therm.hi <<= 1;
                        therm.lo <<= 1;
                        ds1620_write_state (&therm);
-                       ds1620_out (THERM_WRITE_CONFIG, 8, 
CONFIG_SYS_STANDALONE);
+                       ds1620_out (THERM_WRITE_CONFIG, 8, 
DS1620_CFG_STANDALONE);
                        return 0;
                }
        }
-- 
1.7.10.4

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Reply via email to