| Message ID | 20191114103641.34085-2-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 |
>-----Original Message----- >From: Biwen Li <biwen.li@nxp.com> >Sent: Thursday, November 14, 2019 4:06 PM >To: Jagdish Gediya <jagdish.gediya@nxp.com>; Priyanka Jain ><priyanka.jain@nxp.com>; hs@denx.de; jagan@amarulasolutions.com; >aford173@gmail.com; Alison Wang <alison.wang@nxp.com>; >bhaskar.upadhaya@nxp.com; feng.li_2@nxp.com; jh80.chung@samsung.com; >Pramod Kumar <pramod.kumar_1@nxp.com>; Rajesh Bhagat ><rajesh.bhagat@nxp.com>; Ruchika Gupta <ruchika.gupta@nxp.com>; >olteanv@gmail.com >Cc: Xiaobo Xie <xiaobo.xie@nxp.com>; Jiafei Pan <jiafei.pan@nxp.com>; u- >boot@lists.denx.de; Biwen Li <biwen.li@nxp.com> >Subject: [PATCH 02/42] include/configs: arm: ls1012a: fix compilation error > >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@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 This error seems to appear because of "configs: ls1012a: enable CONFIG_DM_I2C" patch, Please merge this with first patch. Note that all patches should independently compile and should not break builds. -priyankajain
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
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@nxp.com> --- include/configs/ls1012a_common.h | 2 ++ 1 file changed, 2 insertions(+)