[U-Boot] [PATCH] mtdcore: Fix a build error with CONFIG_CMD_MTDPARTS_SPREAD

[U-Boot] [PATCH] mtdcore: Fix a build error with CONFIG_CMD_MTDPARTS_SPREAD

[Maxin B. John]

This patch fixes the build error for CONFIG_CMD_MTDPARTS_SPREAD
introduced by the commit:

commit dfe64e2c89731a3f9950d7acd8681b68df2bae03
Author: Sergey Lapin <slapin@ossfans.org>
Date:   Mon Jan 14 03:46:50 2013 +0000

    mtd: resync with Linux-3.7.1

Signed-off-by: Maxin B. John <maxin.john@enea.com>
---
 drivers/mtd/mtdcore.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index 0a38fbe..328a2b9 100644
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -167,7 +167,7 @@ void mtd_get_len_incl_bad(struct mtd_info *mtd, uint64_t offset,
 	*truncated = 0;
 	*len_incl_bad = 0;
 
-	if (!mtd->block_isbad) {
+	if (!mtd->_block_isbad) {
 		*len_incl_bad = length;
 		return;
 	}
@@ -183,7 +183,7 @@ void mtd_get_len_incl_bad(struct mtd_info *mtd, uint64_t offset,
 
 		block_len = mtd->erasesize - (offset & (mtd->erasesize - 1));
 
-		if (!mtd->block_isbad(mtd, offset & ~(mtd->erasesize - 1)))
+		if (!mtd->_block_isbad(mtd, offset & ~(mtd->erasesize - 1)))
 			len_excl_bad += block_len;
 
 		*len_incl_bad += block_len;
-- 
1.7.5.4

[U-Boot] [PATCH] mtdcore: Fix a build error with CONFIG_CMD_MTDPARTS_SPREAD

[Wolfgang Denk]

Dear Maxin,

In message <1404729444-10957-1-git-send-email-maxin.john@enea.com> you wrote:
> This patch fixes the build error for CONFIG_CMD_MTDPARTS_SPREAD
> introduced by the commit:
> 
> commit dfe64e2c89731a3f9950d7acd8681b68df2bae03
> Author: Sergey Lapin <slapin@ossfans.org>
> Date:   Mon Jan 14 03:46:50 2013 +0000
> 
>     mtd: resync with Linux-3.7.1

Can you please check if this patch is still needed with the updated
MTD code posted by Heiko [1] - and if so, rebase your patch against
Heiko's code base?

Thanks.

[1] http://article.gmane.org/gmane.comp.boot-loaders.u-boot/189358



Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Niklaus Wirth has lamented that, whereas Europeans pronounce his name
correctly  (Ni-klows  Virt),  Americans  invariably  mangle  it  into
(Nick-les  Worth).  Which  is to say that Europeans call him by name,
but Americans call him by value.

[U-Boot] [PATCH] mtdcore: Fix a build error with CONFIG_CMD_MTDPARTS_SPREAD

[Maxin B. John]

Dear Wolfgang,

On Mon, Jul 07, 2014 at 02:17:09PM +0200, Wolfgang Denk wrote:
> Dear Maxin,
> 
> In message <1404729444-10957-1-git-send-email-maxin.john@enea.com> you wrote:
> > This patch fixes the build error for CONFIG_CMD_MTDPARTS_SPREAD
> > introduced by the commit:
> > 
> > commit dfe64e2c89731a3f9950d7acd8681b68df2bae03
> > Author: Sergey Lapin <slapin@ossfans.org>
> > Date:   Mon Jan 14 03:46:50 2013 +0000
> > 
> >     mtd: resync with Linux-3.7.1
> 
> Can you please check if this patch is still needed with the updated
> MTD code posted by Heiko [1] - and if so, rebase your patch against
> Heiko's code base?
> 
> Thanks.
> 
> [1] http://article.gmane.org/gmane.comp.boot-loaders.u-boot/189358

Thank you very much for pointing this out. I have tested Heiko's code
available here:
repo:  git://git.denx.de/u-boot-testing.git
branch: update-v3-mtd+ubi-linux-v3.14

The build error that was mentioned in this mail is still valid there:

  LD      drivers/pcmcia/built-in.o
drivers/mtd/mtdcore.c: In function 'mtd_get_len_incl_bad':
drivers/mtd/mtdcore.c:805:10: error: 'struct mtd_info' has no member
named 'block_isbad'
drivers/mtd/mtdcore.c:821:11: error: 'struct mtd_info' has no member
named 'block_isbad'
  CC      drivers/rtc/date.o
make[1]: *** [drivers/mtd/mtdcore.o] Error 1
make: *** [drivers/mtd] Error 2
make: *** Waiting for unfinished jobs....

Also re-created patch against this. Should I send it as a separate
patch or would you suggest another branch for this fix ?
 
> 
> Best regards,
> Wolfgang Denk

Best Regards,
Maxin B. John

[U-Boot] [PATCH] mtdcore: Fix a build error with CONFIG_CMD_MTDPARTS_SPREAD

[Heiko Schocher]

Hello John,

Am 07.07.2014 15:17, schrieb Maxin B. John:
> Dear Wolfgang,
>
> On Mon, Jul 07, 2014 at 02:17:09PM +0200, Wolfgang Denk wrote:
>> Dear Maxin,
>>
>> In message<1404729444-10957-1-git-send-email-maxin.john@enea.com>  you wrote:
>>> This patch fixes the build error for CONFIG_CMD_MTDPARTS_SPREAD
>>> introduced by the commit:
>>>
>>> commit dfe64e2c89731a3f9950d7acd8681b68df2bae03
>>> Author: Sergey Lapin<slapin@ossfans.org>
>>> Date:   Mon Jan 14 03:46:50 2013 +0000
>>>
>>>      mtd: resync with Linux-3.7.1
>>
>> Can you please check if this patch is still needed with the updated
>> MTD code posted by Heiko [1] - and if so, rebase your patch against
>> Heiko's code base?
>>
>> Thanks.
>>
>> [1] http://article.gmane.org/gmane.comp.boot-loaders.u-boot/189358
>
> Thank you very much for pointing this out. I have tested Heiko's code
> available here:
> repo:  git://git.denx.de/u-boot-testing.git
> branch: update-v3-mtd+ubi-linux-v3.14

Please use the patches posted on the ML, not the branch in
u-boot-testing.git for testing. Also you tested with an older version,
please use the v5 version:

[U-Boot] [PATCH v5 0/5] mtd, ubi, ubifs: resync with Linux-3.14
http://lists.denx.de/pipermail/u-boot/2014-June/182501.html

Patchwork [U-Boot,v5,1/5] lib, rbtree: resync with Linux-3.14
http://patchwork.ozlabs.org/patch/363332/

Patchwork [U-Boot,v5,2/5] lib, list_sort: add list_sort from linux 3.14
http://patchwork.ozlabs.org/patch/363335/

Patchwork [U-Boot,v5,3/5] linux include: add ERR_CAST
http://patchwork.ozlabs.org/patch/363334/

Patchwork [U-Boot,v5,4/5] lib, linux: move linux specific defines to linux/compat.h
http://patchwork.ozlabs.org/patch/363333/

Patchwork [U-Boot,v5,5/5] mtd, ubi, ubifs: resync with Linux-3.14
waiting for administrator approval
http://patchwork.ozlabs.org/patch/363343/

> The build error that was mentioned in this mail is still valid there:
>
>    LD      drivers/pcmcia/built-in.o
> drivers/mtd/mtdcore.c: In function 'mtd_get_len_incl_bad':
> drivers/mtd/mtdcore.c:805:10: error: 'struct mtd_info' has no member
> named 'block_isbad'
> drivers/mtd/mtdcore.c:821:11: error: 'struct mtd_info' has no member
> named 'block_isbad'
>    CC      drivers/rtc/date.o
> make[1]: *** [drivers/mtd/mtdcore.o] Error 1
> make: *** [drivers/mtd] Error 2
> make: *** Waiting for unfinished jobs....
>
> Also re-created patch against this. Should I send it as a separate
> patch or would you suggest another branch for this fix ?

Looked in the v5 patches, yes it seems, there is the same problem,
when enabling CONFIG_CMD_MTDPARTS_SPREAD

Please test against the above patches, and resend your patch, thanks
for detecting this!

And if you test my v5 patches, feel free to send a "Tested-by" for
them to the ML!

bye,
Heiko
-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

[U-Boot] [PATCH] mtdcore: Fix a build error with CONFIG_CMD_MTDPARTS_SPREAD

[Wolfgang Denk]

Dear Maxin,

In message <20140707131710.GA14901@sestofb10.enea.se> you wrote:
> 
> The build error that was mentioned in this mail is still valid there:

Thanks for verifying this.

> Also re-created patch against this. Should I send it as a separate
> patch or would you suggest another branch for this fix ?

Please send it as patch against Heiko's code, and mention in the
comment section that it requires Heiko's update to be applied first.

Thanks a lot!

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
A failure will not appear until a unit has passed final inspection.

[U-Boot] [PATCH] mtdcore: Fix a build error with CONFIG_CMD_MTDPARTS_SPREAD

[Maxin B. John]

This patch fixes the build error for CONFIG_CMD_MTDPARTS_SPREAD

Signed-off-by: Maxin B. John <maxin.john@enea.com>
---
 drivers/mtd/mtdcore.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index 6ad0357..c9efb3f 100644
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -804,7 +804,7 @@ void mtd_get_len_incl_bad(struct mtd_info *mtd, uint64_t offset,
 	*truncated = 0;
 	*len_incl_bad = 0;
 
-	if (!mtd->block_isbad) {
+	if (!mtd->_block_isbad) {
 		*len_incl_bad = length;
 		return;
 	}
@@ -820,7 +820,7 @@ void mtd_get_len_incl_bad(struct mtd_info *mtd, uint64_t offset,
 
 		block_len = mtd->erasesize - (offset & (mtd->erasesize - 1));
 
-		if (!mtd->block_isbad(mtd, offset & ~(mtd->erasesize - 1)))
+		if (!mtd->_block_isbad(mtd, offset & ~(mtd->erasesize - 1)))
 			len_excl_bad += block_len;
 
 		*len_incl_bad += block_len;
-- 
1.9.1

[U-Boot] [PATCH] mtdcore: Fix a build error with CONFIG_CMD_MTDPARTS_SPREAD

[Maxin B. John]

Gentle ping.

On Mon, Sep 08, 2014 at 07:04:16PM +0200, Maxin B. John wrote:
> This patch fixes the build error for CONFIG_CMD_MTDPARTS_SPREAD
> 
> Signed-off-by: Maxin B. John <maxin.john@enea.com>
> ---
>  drivers/mtd/mtdcore.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
> index 6ad0357..c9efb3f 100644
> --- a/drivers/mtd/mtdcore.c
> +++ b/drivers/mtd/mtdcore.c
> @@ -804,7 +804,7 @@ void mtd_get_len_incl_bad(struct mtd_info *mtd, uint64_t offset,
>  	*truncated = 0;
>  	*len_incl_bad = 0;
>  
> -	if (!mtd->block_isbad) {
> +	if (!mtd->_block_isbad) {
>  		*len_incl_bad = length;
>  		return;
>  	}
> @@ -820,7 +820,7 @@ void mtd_get_len_incl_bad(struct mtd_info *mtd, uint64_t offset,
>  
>  		block_len = mtd->erasesize - (offset & (mtd->erasesize - 1));
>  
> -		if (!mtd->block_isbad(mtd, offset & ~(mtd->erasesize - 1)))
> +		if (!mtd->_block_isbad(mtd, offset & ~(mtd->erasesize - 1)))
>  			len_excl_bad += block_len;
>  
>  		*len_incl_bad += block_len;
> -- 
> 1.9.1