diff mbox series

[U-Boot,11/42] include/configs: arm: ls1043a: fix a compilation error

Message ID 20191114103641.34085-11-biwen.li@nxp.com
State Changes Requested
Delegated to: Priyanka Jain
Headers show
Series [U-Boot,01/42] configs: ls1012a: enable CONFIG_DM_I2C | expand

Commit Message

Biwen Li Nov. 14, 2019, 10:36 a.m. UTC
This fixes a compilation error as follows:
	- In file included from include/config.h:8: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:8: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@nxp.com>
---
 include/configs/ls1043a_common.h | 2 ++
 1 file changed, 2 insertions(+)
diff mbox series

Patch

diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index e237012626..bbee26a4de 100644
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -141,7 +141,9 @@ 
 #endif
 
 /* I2C */
+#ifndef CONFIG_DM_I2C
 #define CONFIG_SYS_I2C
+#endif
 
 /* PCIe */
 #ifndef SPL_NO_PCIE