[U-Boot] [PATCH 02/42] include/configs: arm: ls1012a: fix compilation error

Biwen Li biwen.li at nxp.com
Thu Nov 14 10:36:01 UTC 2019


This fixes a compilation error as follow:
	- In file included from include/config.h:9:0,
                 from ./include/common.h:23:
	  include/config_fallbacks.h:51:4: error: #error "Cannot define CONFIG_SYS_I2C when CONFIG_DM_I2C is used"
	  #  error "Cannot define CONFIG_SYS_I2C when CONFIG_DM_I2C is used"
	    ^~~~~
	  In file included from include/config.h:9:0,
			 from ./include/common.h:23:
	  include/config_fallbacks.h:51:4: error: #error "Cannot define CONFIG_SYS_I2C when CONFIG_DM_I2C is used"
	  #  error "Cannot define CONFIG_SYS_I2C when CONFIG_DM_I2C is used"
	    ^~~~~
	  scripts/Makefile.autoconf:48: recipe for target include/autoconf.mk.dep failed
	  make[1]: *** [include/autoconf.mk.dep] Error 1
	  make[1]: *** Waiting for unfinished jobs....
	  scripts/Makefile.autoconf:77: recipe for target u-boot.cfg failed
	  make[1]: *** [u-boot.cfg] Error 1
	  make: *** No rule to make target include/config/auto.conf, needed by include/config/uboot.release.  Stop.

Signed-off-by: Biwen Li <biwen.li at nxp.com>
---
 include/configs/ls1012a_common.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h
index dd2a679b79..c5be1d33cc 100644
--- a/include/configs/ls1012a_common.h
+++ b/include/configs/ls1012a_common.h
@@ -74,7 +74,9 @@
 						CONFIG_SYS_SCSI_MAX_LUN)
 
 /* I2C */
+#ifndef CONFIG_DM_I2C
 #define CONFIG_SYS_I2C
+#endif
 
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE     1
-- 
2.17.1



More information about the U-Boot mailing list