| Message ID | 20220928114235.32210-1-rogerq@kernel.org |
|---|---|
| State | Accepted |
| Delegated to: | Dario Binacchi |
| Headers | show |
| Series | [u-boot] mtd: nand: Fix SPL build after migration of CONFIG_SYS_NAND_SELF_INIT to Kconfig | expand |
Hi Il mer 28 set 2022, 13:42 Roger Quadros <rogerq@kernel.org> ha scritto: > This fixes the below build error if nand.c is included in > an SPL build. > > /work/u-boot/drivers/mtd/nand/raw/nand.c: In function ‘nand_init_chip’: > /work/u-boot/drivers/mtd/nand/raw/nand.c:82:28: error: ‘nand_chip’ > undeclared (first use in this function) > 82 | struct nand_chip *nand = &nand_chip[i]; > | ^~~~~~~~~ > /work/u-boot/drivers/mtd/nand/raw/nand.c:82:28: note: each undeclared > identifier is reported only once for each function it appears in > /work/u-boot/drivers/mtd/nand/raw/nand.c:84:20: error: ‘base_address’ > undeclared (first use in this function); did you mean ‘base_addr’? > 84 | ulong base_addr = base_address[i]; > | ^~~~~~~~~~~~ > | base_addr > > Fixes: 068c41f1cc77 ("Finish conversion CONFIG_SYS_NAND_SELF_INIT to > Kconfig") > Signed-off-by: Roger Quadros <rogerq@kernel.org> > --- > drivers/mtd/nand/raw/nand.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/mtd/nand/raw/nand.c b/drivers/mtd/nand/raw/nand.c > index 4b5560dd24..14bca12024 100644 > --- a/drivers/mtd/nand/raw/nand.c > +++ b/drivers/mtd/nand/raw/nand.c > @@ -19,7 +19,7 @@ int nand_curr_device = -1; > > static struct mtd_info *nand_info[CONFIG_SYS_MAX_NAND_DEVICE]; > > -#ifndef CONFIG_SYS_NAND_SELF_INIT > +#if !CONFIG_IS_ENABLED(SYS_NAND_SELF_INIT) > static struct nand_chip nand_chip[CONFIG_SYS_MAX_NAND_DEVICE]; > static ulong base_address[CONFIG_SYS_MAX_NAND_DEVICE] = > CONFIG_SYS_NAND_BASE_LIST; > #endif > Reviewed-by: Michael Trimarchi <michael@amarulasolutions.com>
Hello Michael, On 29/09/2022 09:08, Michael Nazzareno Trimarchi wrote: > Hi > > Il mer 28 set 2022, 13:42 Roger Quadros <rogerq@kernel.org <mailto:rogerq@kernel.org>> ha scritto: > > This fixes the below build error if nand.c is included in > an SPL build. > > /work/u-boot/drivers/mtd/nand/raw/nand.c: In function ‘nand_init_chip’: > /work/u-boot/drivers/mtd/nand/raw/nand.c:82:28: error: ‘nand_chip’ undeclared (first use in this function) > 82 | struct nand_chip *nand = &nand_chip[i]; > | ^~~~~~~~~ > /work/u-boot/drivers/mtd/nand/raw/nand.c:82:28: note: each undeclared identifier is reported only once for each function it appears in > /work/u-boot/drivers/mtd/nand/raw/nand.c:84:20: error: ‘base_address’ undeclared (first use in this function); did you mean ‘base_addr’? > 84 | ulong base_addr = base_address[i]; > | ^~~~~~~~~~~~ > | base_addr > > Fixes: 068c41f1cc77 ("Finish conversion CONFIG_SYS_NAND_SELF_INIT to Kconfig") > Signed-off-by: Roger Quadros <rogerq@kernel.org <mailto:rogerq@kernel.org>> > --- > drivers/mtd/nand/raw/nand.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/mtd/nand/raw/nand.c b/drivers/mtd/nand/raw/nand.c > index 4b5560dd24..14bca12024 100644 > --- a/drivers/mtd/nand/raw/nand.c > +++ b/drivers/mtd/nand/raw/nand.c > @@ -19,7 +19,7 @@ int nand_curr_device = -1; > > static struct mtd_info *nand_info[CONFIG_SYS_MAX_NAND_DEVICE]; > > -#ifndef CONFIG_SYS_NAND_SELF_INIT > +#if !CONFIG_IS_ENABLED(SYS_NAND_SELF_INIT) > static struct nand_chip nand_chip[CONFIG_SYS_MAX_NAND_DEVICE]; > static ulong base_address[CONFIG_SYS_MAX_NAND_DEVICE] = CONFIG_SYS_NAND_BASE_LIST; > #endif > > > Reviewed-by: Michael Trimarchi <michael@amarulasolutions.com <mailto:michael@amarulasolutions.com>> Thanks. Could you please fix your email client to use plain text format when responding on u-boot mailing list? ;) > > -- > 2.17.1 > cheers, -roger
Hi On Thu, Oct 6, 2022 at 3:29 PM Roger Quadros <rogerq@kernel.org> wrote: > > Hello Michael, > > On 29/09/2022 09:08, Michael Nazzareno Trimarchi wrote: > > Hi > > > > Il mer 28 set 2022, 13:42 Roger Quadros <rogerq@kernel.org <mailto:rogerq@kernel.org>> ha scritto: > > > > This fixes the below build error if nand.c is included in > > an SPL build. > > > > /work/u-boot/drivers/mtd/nand/raw/nand.c: In function ‘nand_init_chip’: > > /work/u-boot/drivers/mtd/nand/raw/nand.c:82:28: error: ‘nand_chip’ undeclared (first use in this function) > > 82 | struct nand_chip *nand = &nand_chip[i]; > > | ^~~~~~~~~ > > /work/u-boot/drivers/mtd/nand/raw/nand.c:82:28: note: each undeclared identifier is reported only once for each function it appears in > > /work/u-boot/drivers/mtd/nand/raw/nand.c:84:20: error: ‘base_address’ undeclared (first use in this function); did you mean ‘base_addr’? > > 84 | ulong base_addr = base_address[i]; > > | ^~~~~~~~~~~~ > > | base_addr > > > > Fixes: 068c41f1cc77 ("Finish conversion CONFIG_SYS_NAND_SELF_INIT to Kconfig") > > Signed-off-by: Roger Quadros <rogerq@kernel.org <mailto:rogerq@kernel.org>> > > --- > > drivers/mtd/nand/raw/nand.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/mtd/nand/raw/nand.c b/drivers/mtd/nand/raw/nand.c > > index 4b5560dd24..14bca12024 100644 > > --- a/drivers/mtd/nand/raw/nand.c > > +++ b/drivers/mtd/nand/raw/nand.c > > @@ -19,7 +19,7 @@ int nand_curr_device = -1; > > > > static struct mtd_info *nand_info[CONFIG_SYS_MAX_NAND_DEVICE]; > > > > -#ifndef CONFIG_SYS_NAND_SELF_INIT > > +#if !CONFIG_IS_ENABLED(SYS_NAND_SELF_INIT) > > static struct nand_chip nand_chip[CONFIG_SYS_MAX_NAND_DEVICE]; > > static ulong base_address[CONFIG_SYS_MAX_NAND_DEVICE] = CONFIG_SYS_NAND_BASE_LIST; > > #endif > > > > > > Reviewed-by: Michael Trimarchi <michael@amarulasolutions.com <mailto:michael@amarulasolutions.com>> > > Thanks. > Could you please fix your email client to use plain text format > when responding on u-boot mailing list? ;) > Sorry, It's for no-obvious bad behavior to read from mobile phone, and forget about gmail Michael > > > > -- > > 2.17.1 > > > > cheers, > -roger
Hi Roger, On Wed, Sep 28, 2022 at 1:42 PM Roger Quadros <rogerq@kernel.org> wrote: > This fixes the below build error if nand.c is included in > an SPL build. > > /work/u-boot/drivers/mtd/nand/raw/nand.c: In function ‘nand_init_chip’: > /work/u-boot/drivers/mtd/nand/raw/nand.c:82:28: error: ‘nand_chip’ > undeclared (first use in this function) > 82 | struct nand_chip *nand = &nand_chip[i]; > | ^~~~~~~~~ > /work/u-boot/drivers/mtd/nand/raw/nand.c:82:28: note: each undeclared > identifier is reported only once for each function it appears in > /work/u-boot/drivers/mtd/nand/raw/nand.c:84:20: error: ‘base_address’ > undeclared (first use in this function); did you mean ‘base_addr’? > 84 | ulong base_addr = base_address[i]; > | ^~~~~~~~~~~~ > | base_addr > > Fixes: 068c41f1cc77 ("Finish conversion CONFIG_SYS_NAND_SELF_INIT to > Kconfig") > Signed-off-by: Roger Quadros <rogerq@kernel.org> > --- > drivers/mtd/nand/raw/nand.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/mtd/nand/raw/nand.c b/drivers/mtd/nand/raw/nand.c > index 4b5560dd24..14bca12024 100644 > --- a/drivers/mtd/nand/raw/nand.c > +++ b/drivers/mtd/nand/raw/nand.c > @@ -19,7 +19,7 @@ int nand_curr_device = -1; > > static struct mtd_info *nand_info[CONFIG_SYS_MAX_NAND_DEVICE]; > > -#ifndef CONFIG_SYS_NAND_SELF_INIT > +#if !CONFIG_IS_ENABLED(SYS_NAND_SELF_INIT) > static struct nand_chip nand_chip[CONFIG_SYS_MAX_NAND_DEVICE]; > static ulong base_address[CONFIG_SYS_MAX_NAND_DEVICE] = > CONFIG_SYS_NAND_BASE_LIST; > #endif > -- > 2.17.1 > > Applied to nand-next, thanks! Dario
diff --git a/drivers/mtd/nand/raw/nand.c b/drivers/mtd/nand/raw/nand.c index 4b5560dd24..14bca12024 100644 --- a/drivers/mtd/nand/raw/nand.c +++ b/drivers/mtd/nand/raw/nand.c @@ -19,7 +19,7 @@ int nand_curr_device = -1; static struct mtd_info *nand_info[CONFIG_SYS_MAX_NAND_DEVICE]; -#ifndef CONFIG_SYS_NAND_SELF_INIT +#if !CONFIG_IS_ENABLED(SYS_NAND_SELF_INIT) static struct nand_chip nand_chip[CONFIG_SYS_MAX_NAND_DEVICE]; static ulong base_address[CONFIG_SYS_MAX_NAND_DEVICE] = CONFIG_SYS_NAND_BASE_LIST; #endif
This fixes the below build error if nand.c is included in an SPL build. /work/u-boot/drivers/mtd/nand/raw/nand.c: In function ‘nand_init_chip’: /work/u-boot/drivers/mtd/nand/raw/nand.c:82:28: error: ‘nand_chip’ undeclared (first use in this function) 82 | struct nand_chip *nand = &nand_chip[i]; | ^~~~~~~~~ /work/u-boot/drivers/mtd/nand/raw/nand.c:82:28: note: each undeclared identifier is reported only once for each function it appears in /work/u-boot/drivers/mtd/nand/raw/nand.c:84:20: error: ‘base_address’ undeclared (first use in this function); did you mean ‘base_addr’? 84 | ulong base_addr = base_address[i]; | ^~~~~~~~~~~~ | base_addr Fixes: 068c41f1cc77 ("Finish conversion CONFIG_SYS_NAND_SELF_INIT to Kconfig") Signed-off-by: Roger Quadros <rogerq@kernel.org> --- drivers/mtd/nand/raw/nand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)