From: Biwen Li Date: Thu, 14 Nov 2019 18:36:17 +0800 Subject: [U-Boot] [PATCH 18/42] include/configs: arm: ls1046a: fix compilation error In-Reply-To: <20191114103641.34085-1-biwen.li@nxp.com> References: <20191114103641.34085-1-biwen.li@nxp.com> Message-ID: <20191114103641.34085-18-biwen.li@nxp.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de This fixes 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 --- include/configs/ls1046a_common.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index cc8f4c0210..932aa55af5 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -127,7 +127,9 @@ #endif /* I2C */ +#ifndef CONFIG_DM_I2C #define CONFIG_SYS_I2C +#endif /* PCIe */ #define CONFIG_PCIE1 /* PCIE controller 1 */ -- 2.17.1