[U-Boot] [PATCH] ARM:OMAP3 Change mmc_init to mmc_legacy_init

[U-Boot] [PATCH] ARM:OMAP3 Change mmc_init to mmc_legacy_init

[Tom Rix]

omap3_mmc.c was changed to define mmc_legacy_init.  Definition of mmc_read was
changed to match declaration in mmc.h

cmd_mmc.c ifndef was strengthened to disable use of generic mmc functions if
the generic mmc interface is not used.

Compile tested on all arm
Runtime tested on Zoom1.

Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
---
 common/cmd_mmc.c        |    5 ++++-
 drivers/mmc/omap3_mmc.c |    5 +++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c
index 73ec7bf..111f169 100644
--- a/common/cmd_mmc.c
+++ b/common/cmd_mmc.c
@@ -40,7 +40,8 @@ U_BOOT_CMD(
 	"init mmc card",
 	NULL
 );
-#endif /* !CONFIG_GENERIC_MMC */
+
+#else
 
 static void print_mmcinfo(struct mmc *mmc)
 {
@@ -171,3 +172,5 @@ U_BOOT_CMD(
 	"mmc write <device num> addr blk# cnt\n"
 	"mmc rescan <device num>\n"
 	"mmc list - lists available devices\n");
+
+#endif
diff --git a/drivers/mmc/omap3_mmc.c b/drivers/mmc/omap3_mmc.c
index 0148702..dc9a9ed 100644
--- a/drivers/mmc/omap3_mmc.c
+++ b/drivers/mmc/omap3_mmc.c
@@ -28,6 +28,7 @@
 #include <mmc.h>
 #include <part.h>
 #include <i2c.h>
+#include <asm/arch/mmc.h>
 
 const unsigned short mmc_transspeed_val[15][4] = {
 	{CLKD(10, 1), CLKD(10, 10), CLKD(10, 100), CLKD(10, 1000)},
@@ -521,7 +522,7 @@ unsigned long mmc_bread(int dev_num, unsigned long blknr, lbaint_t blkcnt,
 	return 1;
 }
 
-int mmc_init(int verbose)
+int mmc_legacy_init(int verbose)
 {
 	if (configure_mmc(&cur_card_data) != 1)
 		return 1;
@@ -542,7 +543,7 @@ int mmc_init(int verbose)
 	return 0;
 }
 
-int mmc_read(ulong src, uchar *dst, int size)
+int mmc_read(struct mmc *mmc, u64 src, uchar *dst, int size)
 {
 	return 0;
 }
-- 
1.5.4.3

[U-Boot] [PATCH] ARM:OMAP3 Change mmc_init to mmc_legacy_init

[Dirk Behme]

Tom Rix wrote:
> omap3_mmc.c was changed to define mmc_legacy_init.  Definition of mmc_read was
> changed to match declaration in mmc.h
> 
> cmd_mmc.c ifndef was strengthened to disable use of generic mmc functions if
> the generic mmc interface is not used.
> 
> Compile tested on all arm
> Runtime tested on Zoom1.
> 
> Signed-off-by: Tom Rix <Tom.Rix@windriver.com>

Acked-by: <dirk.behme@googlemail.com>

for the basic functionality in this patch.

> ---
>  common/cmd_mmc.c        |    5 ++++-
>  drivers/mmc/omap3_mmc.c |    5 +++--
>  2 files changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c
> index 73ec7bf..111f169 100644
> --- a/common/cmd_mmc.c
> +++ b/common/cmd_mmc.c
> @@ -40,7 +40,8 @@ U_BOOT_CMD(
>  	"init mmc card",
>  	NULL
>  );
> -#endif /* !CONFIG_GENERIC_MMC */
> +
> +#else
>  
>  static void print_mmcinfo(struct mmc *mmc)
>  {
> @@ -171,3 +172,5 @@ U_BOOT_CMD(
>  	"mmc write <device num> addr blk# cnt\n"
>  	"mmc rescan <device num>\n"
>  	"mmc list - lists available devices\n");
> +
> +#endif

This is already done by

http://lists.denx.de/pipermail/u-boot/2009-February/047916.html

As I (wrongly?) learned from Jean-Christophe not to mix generic 
changes and board specific changes in one patch, my plan was to send a 
separate OMAP3 patch. If the patch is accepted this way, I'm fine with 
this.

> diff --git a/drivers/mmc/omap3_mmc.c b/drivers/mmc/omap3_mmc.c
> index 0148702..dc9a9ed 100644
> --- a/drivers/mmc/omap3_mmc.c
> +++ b/drivers/mmc/omap3_mmc.c
> @@ -28,6 +28,7 @@
>  #include <mmc.h>
>  #include <part.h>
>  #include <i2c.h>
> +#include <asm/arch/mmc.h>
>  
>  const unsigned short mmc_transspeed_val[15][4] = {
>  	{CLKD(10, 1), CLKD(10, 10), CLKD(10, 100), CLKD(10, 1000)},
> @@ -521,7 +522,7 @@ unsigned long mmc_bread(int dev_num, unsigned long blknr, lbaint_t blkcnt,
>  	return 1;
>  }
>  
> -int mmc_init(int verbose)
> +int mmc_legacy_init(int verbose)
>  {
>  	if (configure_mmc(&cur_card_data) != 1)
>  		return 1;
> @@ -542,7 +543,7 @@ int mmc_init(int verbose)
>  	return 0;
>  }
>  
> -int mmc_read(ulong src, uchar *dst, int size)
> +int mmc_read(struct mmc *mmc, u64 src, uchar *dst, int size)
>  {
>  	return 0;
>  }

I additionally removed some now unused functions like in

http://pastebin.com/m43f9d61

But this is only an additional improvement of this patch and not 
strictly necessary to make things work again.

Best regards

Dirk

[U-Boot] [PATCH] ARM:OMAP3 Change mmc_init to mmc_legacy_init

[Dirk Behme]

Tom,

Dirk Behme wrote:
> Tom Rix wrote:
>> omap3_mmc.c was changed to define mmc_legacy_init.  Definition of 
>> mmc_read was
>> changed to match declaration in mmc.h
>>
>> cmd_mmc.c ifndef was strengthened to disable use of generic mmc 
>> functions if
>> the generic mmc interface is not used.
>>
>> Compile tested on all arm
>> Runtime tested on Zoom1.
>>
>> Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
> 
> Acked-by: <dirk.behme@googlemail.com>

After

http://lists.denx.de/pipermail/u-boot/2009-February/048052.html

it seems that we still need only the OMAP3 part of this patch. Do you 
like to resend the OMAP3 part (omap3_mmc.c)? And maybe you like to add 
the additional removal of unused functions I mentioned below like in

http://pastebin.com/m43f9d61

?

Many thanks

Dirk

>> ---
>>  common/cmd_mmc.c        |    5 ++++-
>>  drivers/mmc/omap3_mmc.c |    5 +++--
>>  2 files changed, 7 insertions(+), 3 deletions(-)
>>
>> diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c
>> index 73ec7bf..111f169 100644
>> --- a/common/cmd_mmc.c
>> +++ b/common/cmd_mmc.c
>> @@ -40,7 +40,8 @@ U_BOOT_CMD(
>>      "init mmc card",
>>      NULL
>>  );
>> -#endif /* !CONFIG_GENERIC_MMC */
>> +
>> +#else
>>  
>>  static void print_mmcinfo(struct mmc *mmc)
>>  {
>> @@ -171,3 +172,5 @@ U_BOOT_CMD(
>>      "mmc write <device num> addr blk# cnt\n"
>>      "mmc rescan <device num>\n"
>>      "mmc list - lists available devices\n");
>> +
>> +#endif
> 
> This is already done by
> 
> http://lists.denx.de/pipermail/u-boot/2009-February/047916.html
> 
> As I (wrongly?) learned from Jean-Christophe not to mix generic changes 
> and board specific changes in one patch, my plan was to send a separate 
> OMAP3 patch. If the patch is accepted this way, I'm fine with this.
> 
>> diff --git a/drivers/mmc/omap3_mmc.c b/drivers/mmc/omap3_mmc.c
>> index 0148702..dc9a9ed 100644
>> --- a/drivers/mmc/omap3_mmc.c
>> +++ b/drivers/mmc/omap3_mmc.c
>> @@ -28,6 +28,7 @@
>>  #include <mmc.h>
>>  #include <part.h>
>>  #include <i2c.h>
>> +#include <asm/arch/mmc.h>
>>  
>>  const unsigned short mmc_transspeed_val[15][4] = {
>>      {CLKD(10, 1), CLKD(10, 10), CLKD(10, 100), CLKD(10, 1000)},
>> @@ -521,7 +522,7 @@ unsigned long mmc_bread(int dev_num, unsigned long 
>> blknr, lbaint_t blkcnt,
>>      return 1;
>>  }
>>  
>> -int mmc_init(int verbose)
>> +int mmc_legacy_init(int verbose)
>>  {
>>      if (configure_mmc(&cur_card_data) != 1)
>>          return 1;
>> @@ -542,7 +543,7 @@ int mmc_init(int verbose)
>>      return 0;
>>  }
>>  
>> -int mmc_read(ulong src, uchar *dst, int size)
>> +int mmc_read(struct mmc *mmc, u64 src, uchar *dst, int size)
>>  {
>>      return 0;
>>  }
> 
> I additionally removed some now unused functions like in
> 
> http://pastebin.com/m43f9d61
> 
> But this is only an additional improvement of this patch and not 
> strictly necessary to make things work again.
> 
> Best regards
> 
> Dirk
> 
> 

[U-Boot] [PATCH] ARM:OMAP3 Change mmc_init to mmc_legacy_init

[Wolfgang Denk]

Dear Tom Rix,

In message <1235062231-21917-1-git-send-email-Tom.Rix@windriver.com> you wrote:
> omap3_mmc.c was changed to define mmc_legacy_init.  Definition of mmc_read was
> changed to match declaration in mmc.h
> 
> cmd_mmc.c ifndef was strengthened to disable use of generic mmc functions if
> the generic mmc interface is not used.
> 
> Compile tested on all arm
> Runtime tested on Zoom1.
> 
> Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
> ---
>  common/cmd_mmc.c        |    5 ++++-
>  drivers/mmc/omap3_mmc.c |    5 +++--
>  2 files changed, 7 insertions(+), 3 deletions(-)

Sorry, doesn't apply any more.

Please rebase and repost.  Thanks

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
Presidency:  The greased pig in the field game of American politics.
- Ambrose Bierce

[U-Boot] [PATCH] ARM:OMAP3 Change mmc_init to mmc_legacy_init

[Tom Rix]

omap3_mmc.c was changed to define mmc_legacy_init.
Remove unused functions.

Compile tested on all arm
Runtime tested on Zoom1.

Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
---
 drivers/mmc/omap3_mmc.c |   17 ++---------------
 1 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/drivers/mmc/omap3_mmc.c b/drivers/mmc/omap3_mmc.c
index 0148702..987adb0 100644
--- a/drivers/mmc/omap3_mmc.c
+++ b/drivers/mmc/omap3_mmc.c
@@ -28,6 +28,7 @@
 #include <mmc.h>
 #include <part.h>
 #include <i2c.h>
+#include <asm/arch/mmc.h>
 
 const unsigned short mmc_transspeed_val[15][4] = {
 	{CLKD(10, 1), CLKD(10, 10), CLKD(10, 100), CLKD(10, 1000)},
@@ -521,7 +522,7 @@ unsigned long mmc_bread(int dev_num, unsigned long blknr, lbaint_t blkcnt,
 	return 1;
 }
 
-int mmc_init(int verbose)
+int mmc_legacy_init(int verbose)
 {
 	if (configure_mmc(&cur_card_data) != 1)
 		return 1;
@@ -542,17 +543,3 @@ int mmc_init(int verbose)
 	return 0;
 }
 
-int mmc_read(ulong src, uchar *dst, int size)
-{
-	return 0;
-}
-
-int mmc_write(uchar *src, ulong dst, int size)
-{
-	return 0;
-}
-
-int mmc2info(ulong addr)
-{
-	return 0;
-}
-- 
1.6.0.5

[U-Boot] [PATCH] ARM:OMAP3 Change mmc_init to mmc_legacy_init

[Wolfgang Denk]

Dear Tom Rix,

In message <1235083543-4659-1-git-send-email-Tom.Rix@windriver.com> you wrote:
> omap3_mmc.c was changed to define mmc_legacy_init.
> Remove unused functions.
> 
> Compile tested on all arm
> Runtime tested on Zoom1.
> 
> Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
> ---
>  drivers/mmc/omap3_mmc.c |   17 ++---------------
>  1 files changed, 2 insertions(+), 15 deletions(-)

Applied, thanks.

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
To the systems programmer,  users  and  applications  serve  only  to
provide a test load.

[U-Boot] [PATCH] ARM:OMAP3 Change mmc_init to mmc_legacy_init

[Wolfgang Denk]

Dear Tom,

in message <20090219225148.01866832E43F@gemini.denx.de> I wrote:
> 
> > omap3_mmc.c was changed to define mmc_legacy_init.
> > Remove unused functions.
> > 
> > Compile tested on all arm
> > Runtime tested on Zoom1.
> > 
> > Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
> > ---
> >  drivers/mmc/omap3_mmc.c |   17 ++---------------
> >  1 files changed, 2 insertions(+), 15 deletions(-)
> 
> Applied, thanks.

...but there are still build errors on ARM:

Configuring for cerf250 board...
In file included from mmc.c:31:
mmc.h:139: error: redefinition of 'struct mmc_cid'
mmc.h:151: error: redefinition of 'struct mmc_csd'
make[1]: *** [mmc.o] Error 1
make: *** [cpu/pxa/libpxa.a] Error 2
make: *** Waiting for unfinished jobs....
arm-linux-size: './u-boot': No such file
Configuring for cradle board...
In file included from mmc.c:31:
mmc.h:139: error: redefinition of 'struct mmc_cid'
mmc.h:151: error: redefinition of 'struct mmc_csd'
make[1]: *** [mmc.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [cpu/pxa/libpxa.a] Error 2
make: *** Waiting for unfinished jobs....
arm-linux-size: './u-boot': No such file
Configuring for csb226 board...
In file included from mmc.c:31:
mmc.h:139: error: redefinition of 'struct mmc_cid'
mmc.h:151: error: redefinition of 'struct mmc_csd'
make[1]: *** [mmc.o] Error 1
make: *** [cpu/pxa/libpxa.a] Error 2
make: *** Waiting for unfinished jobs....
make: *** wait: No child processes.  Stop.
arm-linux-size: './u-boot': No such file
Configuring for delta board...
In file included from mmc.c:31:
mmc.h:139: error: redefinition of 'struct mmc_cid'
mmc.h:151: error: redefinition of 'struct mmc_csd'
make[1]: *** [mmc.o] Error 1
make: *** [cpu/pxa/libpxa.a] Error 2
make: *** Waiting for unfinished jobs....
arm-linux-size: './u-boot': No such file
Configuring for innokom board...
In file included from mmc.c:31:
mmc.h:139: error: redefinition of 'struct mmc_cid'
mmc.h:151: error: redefinition of 'struct mmc_csd'
make[1]: *** [mmc.o] Error 1
make: *** [cpu/pxa/libpxa.a] Error 2
make: *** Waiting for unfinished jobs....
make: *** wait: No child processes.  Stop.
arm-linux-size: './u-boot': No such file
Configuring for lubbock board...
In file included from mmc.c:31:
mmc.h:139: error: redefinition of 'struct mmc_cid'
mmc.h:151: error: redefinition of 'struct mmc_csd'
mmc.c: In function 'mmc_block_write':
mmc.c:184: error: 'MMC_CMD_WRITE_BLOCK' undeclared (first use in this function)
mmc.c:184: error: (Each undeclared identifier is reported only once
mmc.c:184: error: for each function it appears in.)
mmc.c: At top level:
mmc.c:223: error: conflicting types for 'mmc_read'
/home/wd/git/u-boot/work/include/mmc.h:272: error: previous declaration of 'mmc_read' was here
make[1]: *** [mmc.o] Error 1
make: *** [cpu/pxa/libpxa.a] Error 2
make: *** Waiting for unfinished jobs....
arm-linux-size: './u-boot': No such file
Configuring for pleb2 board...
In file included from mmc.c:31:
mmc.h:139: error: redefinition of 'struct mmc_cid'
mmc.h:151: error: redefinition of 'struct mmc_csd'
make[1]: *** [mmc.o] Error 1
make: *** [cpu/pxa/libpxa.a] Error 2
make: *** Waiting for unfinished jobs....
make: *** wait: No child processes.  Stop.
arm-linux-size: './u-boot': No such file
Configuring for pxa255_idp board...
In file included from mmc.c:31:
mmc.h:139: error: redefinition of 'struct mmc_cid'
mmc.h:151: error: redefinition of 'struct mmc_csd'
mmc.c: In function 'mmc_block_write':
mmc.c:184: error: 'MMC_CMD_WRITE_BLOCK' undeclared (first use in this function)
mmc.c:184: error: (Each undeclared identifier is reported only once
mmc.c:184: error: for each function it appears in.)
mmc.c: At top level:
mmc.c:223: error: conflicting types for 'mmc_read'
/home/wd/git/u-boot/work/include/mmc.h:272: error: previous declaration of 'mmc_read' was here
make[1]: *** [mmc.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [cpu/pxa/libpxa.a] Error 2
make: *** Waiting for unfinished jobs....
make: *** wait: No child processes.  Stop.
arm-linux-size: './u-boot': No such file
Configuring for wepep250 board...
In file included from mmc.c:31:
mmc.h:139: error: redefinition of 'struct mmc_cid'
mmc.h:151: error: redefinition of 'struct mmc_csd'
make[1]: *** [mmc.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [cpu/pxa/libpxa.a] Error 2
make: *** Waiting for unfinished jobs....
make: *** wait: No child processes.  Stop.
arm-linux-size: './u-boot': No such file
Configuring for xaeniax board...
In file included from mmc.c:31:
mmc.h:139: error: redefinition of 'struct mmc_cid'
mmc.h:151: error: redefinition of 'struct mmc_csd'
make[1]: *** [mmc.o] Error 1
make: *** [cpu/pxa/libpxa.a] Error 2
make: *** Waiting for unfinished jobs....
make: *** wait: No child processes.  Stop.
arm-linux-size: './u-boot': No such file
Configuring for xm250 board...
In file included from mmc.c:31:
mmc.h:139: error: redefinition of 'struct mmc_cid'
mmc.h:151: error: redefinition of 'struct mmc_csd'
make[1]: *** [mmc.o] Error 1
make: *** [cpu/pxa/libpxa.a] Error 2
make: *** Waiting for unfinished jobs....
arm-linux-size: './u-boot': No such file
Configuring for xsengine board...
In file included from mmc.c:31:
mmc.h:139: error: redefinition of 'struct mmc_cid'
mmc.h:151: error: redefinition of 'struct mmc_csd'
mmc.c: In function 'mmc_block_write':
mmc.c:184: error: 'MMC_CMD_WRITE_BLOCK' undeclared (first use in this function)
mmc.c:184: error: (Each undeclared identifier is reported only once
mmc.c:184: error: for each function it appears in.)
mmc.c: At top level:
mmc.c:223: error: conflicting types for 'mmc_read'
/home/wd/git/u-boot/work/include/mmc.h:272: error: previous declaration of 'mmc_read' was here
make[1]: *** [mmc.o] Error 1
make: *** [cpu/pxa/libpxa.a] Error 2
make: *** Waiting for unfinished jobs....
arm-linux-size: './u-boot': No such file
Configuring for zylonite board...
In file included from mmc.c:31:
mmc.h:139: error: redefinition of 'struct mmc_cid'
mmc.h:151: error: redefinition of 'struct mmc_csd'
make[1]: *** [mmc.o] Error 1
make: *** [cpu/pxa/libpxa.a] Error 2
make: *** Waiting for unfinished jobs....
make: *** wait: No child processes.  Stop.
arm-linux-size: './u-boot': No such file


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
I wish I had a bronze torc for every user who didn't read the manual.
                             - Terry Pratchett, _The Light Fantastic_

[U-Boot] [PATCH] ARM:OMAP3 Change mmc_init to mmc_legacy_init

[Tom]

I will take a look at these failures.
Tom

Wolfgang Denk wrote:
> Dear Tom,
>
> in message <20090219225148.01866832E43F@gemini.denx.de> I wrote:
>   
>>> omap3_mmc.c was changed to define mmc_legacy_init.
>>> Remove unused functions.
>>>
>>> Compile tested on all arm
>>> Runtime tested on Zoom1.
>>>
>>> Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
>>> ---
>>>  drivers/mmc/omap3_mmc.c |   17 ++---------------
>>>  1 files changed, 2 insertions(+), 15 deletions(-)
>>>       
>> Applied, thanks.
>>     
>
> ...but there are still build errors on ARM:
>
> Configuring for cerf250 board...
> In file included from mmc.c:31:
> mmc.h:139: error: redefinition of 'struct mmc_cid'
> mmc.h:151: error: redefinition of 'struct mmc_csd'
> make[1]: *** [mmc.o] Error 1
> make: *** [cpu/pxa/libpxa.a] Error 2
> make: *** Waiting for unfinished jobs....
> arm-linux-size: './u-boot': No such file
> Configuring for cradle board...
> In file included from mmc.c:31:
> mmc.h:139: error: redefinition of 'struct mmc_cid'
> mmc.h:151: error: redefinition of 'struct mmc_csd'
> make[1]: *** [mmc.o] Error 1
> make[1]: *** Waiting for unfinished jobs....
> make: *** [cpu/pxa/libpxa.a] Error 2
> make: *** Waiting for unfinished jobs....
> arm-linux-size: './u-boot': No such file
> Configuring for csb226 board...
> In file included from mmc.c:31:
> mmc.h:139: error: redefinition of 'struct mmc_cid'
> mmc.h:151: error: redefinition of 'struct mmc_csd'
> make[1]: *** [mmc.o] Error 1
> make: *** [cpu/pxa/libpxa.a] Error 2
> make: *** Waiting for unfinished jobs....
> make: *** wait: No child processes.  Stop.
> arm-linux-size: './u-boot': No such file
> Configuring for delta board...
> In file included from mmc.c:31:
> mmc.h:139: error: redefinition of 'struct mmc_cid'
> mmc.h:151: error: redefinition of 'struct mmc_csd'
> make[1]: *** [mmc.o] Error 1
> make: *** [cpu/pxa/libpxa.a] Error 2
> make: *** Waiting for unfinished jobs....
> arm-linux-size: './u-boot': No such file
> Configuring for innokom board...
> In file included from mmc.c:31:
> mmc.h:139: error: redefinition of 'struct mmc_cid'
> mmc.h:151: error: redefinition of 'struct mmc_csd'
> make[1]: *** [mmc.o] Error 1
> make: *** [cpu/pxa/libpxa.a] Error 2
> make: *** Waiting for unfinished jobs....
> make: *** wait: No child processes.  Stop.
> arm-linux-size: './u-boot': No such file
> Configuring for lubbock board...
> In file included from mmc.c:31:
> mmc.h:139: error: redefinition of 'struct mmc_cid'
> mmc.h:151: error: redefinition of 'struct mmc_csd'
> mmc.c: In function 'mmc_block_write':
> mmc.c:184: error: 'MMC_CMD_WRITE_BLOCK' undeclared (first use in this function)
> mmc.c:184: error: (Each undeclared identifier is reported only once
> mmc.c:184: error: for each function it appears in.)
> mmc.c: At top level:
> mmc.c:223: error: conflicting types for 'mmc_read'
> /home/wd/git/u-boot/work/include/mmc.h:272: error: previous declaration of 'mmc_read' was here
> make[1]: *** [mmc.o] Error 1
> make: *** [cpu/pxa/libpxa.a] Error 2
> make: *** Waiting for unfinished jobs....
> arm-linux-size: './u-boot': No such file
> Configuring for pleb2 board...
> In file included from mmc.c:31:
> mmc.h:139: error: redefinition of 'struct mmc_cid'
> mmc.h:151: error: redefinition of 'struct mmc_csd'
> make[1]: *** [mmc.o] Error 1
> make: *** [cpu/pxa/libpxa.a] Error 2
> make: *** Waiting for unfinished jobs....
> make: *** wait: No child processes.  Stop.
> arm-linux-size: './u-boot': No such file
> Configuring for pxa255_idp board...
> In file included from mmc.c:31:
> mmc.h:139: error: redefinition of 'struct mmc_cid'
> mmc.h:151: error: redefinition of 'struct mmc_csd'
> mmc.c: In function 'mmc_block_write':
> mmc.c:184: error: 'MMC_CMD_WRITE_BLOCK' undeclared (first use in this function)
> mmc.c:184: error: (Each undeclared identifier is reported only once
> mmc.c:184: error: for each function it appears in.)
> mmc.c: At top level:
> mmc.c:223: error: conflicting types for 'mmc_read'
> /home/wd/git/u-boot/work/include/mmc.h:272: error: previous declaration of 'mmc_read' was here
> make[1]: *** [mmc.o] Error 1
> make[1]: *** Waiting for unfinished jobs....
> make: *** [cpu/pxa/libpxa.a] Error 2
> make: *** Waiting for unfinished jobs....
> make: *** wait: No child processes.  Stop.
> arm-linux-size: './u-boot': No such file
> Configuring for wepep250 board...
> In file included from mmc.c:31:
> mmc.h:139: error: redefinition of 'struct mmc_cid'
> mmc.h:151: error: redefinition of 'struct mmc_csd'
> make[1]: *** [mmc.o] Error 1
> make[1]: *** Waiting for unfinished jobs....
> make: *** [cpu/pxa/libpxa.a] Error 2
> make: *** Waiting for unfinished jobs....
> make: *** wait: No child processes.  Stop.
> arm-linux-size: './u-boot': No such file
> Configuring for xaeniax board...
> In file included from mmc.c:31:
> mmc.h:139: error: redefinition of 'struct mmc_cid'
> mmc.h:151: error: redefinition of 'struct mmc_csd'
> make[1]: *** [mmc.o] Error 1
> make: *** [cpu/pxa/libpxa.a] Error 2
> make: *** Waiting for unfinished jobs....
> make: *** wait: No child processes.  Stop.
> arm-linux-size: './u-boot': No such file
> Configuring for xm250 board...
> In file included from mmc.c:31:
> mmc.h:139: error: redefinition of 'struct mmc_cid'
> mmc.h:151: error: redefinition of 'struct mmc_csd'
> make[1]: *** [mmc.o] Error 1
> make: *** [cpu/pxa/libpxa.a] Error 2
> make: *** Waiting for unfinished jobs....
> arm-linux-size: './u-boot': No such file
> Configuring for xsengine board...
> In file included from mmc.c:31:
> mmc.h:139: error: redefinition of 'struct mmc_cid'
> mmc.h:151: error: redefinition of 'struct mmc_csd'
> mmc.c: In function 'mmc_block_write':
> mmc.c:184: error: 'MMC_CMD_WRITE_BLOCK' undeclared (first use in this function)
> mmc.c:184: error: (Each undeclared identifier is reported only once
> mmc.c:184: error: for each function it appears in.)
> mmc.c: At top level:
> mmc.c:223: error: conflicting types for 'mmc_read'
> /home/wd/git/u-boot/work/include/mmc.h:272: error: previous declaration of 'mmc_read' was here
> make[1]: *** [mmc.o] Error 1
> make: *** [cpu/pxa/libpxa.a] Error 2
> make: *** Waiting for unfinished jobs....
> arm-linux-size: './u-boot': No such file
> Configuring for zylonite board...
> In file included from mmc.c:31:
> mmc.h:139: error: redefinition of 'struct mmc_cid'
> mmc.h:151: error: redefinition of 'struct mmc_csd'
> make[1]: *** [mmc.o] Error 1
> make: *** [cpu/pxa/libpxa.a] Error 2
> make: *** Waiting for unfinished jobs....
> make: *** wait: No child processes.  Stop.
> arm-linux-size: './u-boot': No such file
>
>
> Best regards,
>
> Wolfgang Denk
>
>   

[U-Boot] [PATCH] ARM:OMAP3 Change mmc_init to mmc_legacy_init

[Tom]

Wolfgang Denk wrote:
> Dear Tom,
>
> in message <20090219225148.01866832E43F@gemini.denx.de> I wrote:
>   
>>> omap3_mmc.c was changed to define mmc_legacy_init.
>>> Remove unused functions.
>>>
>>> Compile tested on all arm
>>> Runtime tested on Zoom1.
>>>
>>> Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
>>> ---
>>>  drivers/mmc/omap3_mmc.c |   17 ++---------------
>>>  1 files changed, 2 insertions(+), 15 deletions(-)
>>>       
>> Applied, thanks.
>>     
>
> ...but there are still build errors on ARM:
>
> Configuring for cerf250 board...
> In file included from mmc.c:31:
> mmc.h:139: error: redefinition of 'struct mmc_cid'
> mmc.h:151: error: redefinition of 'struct mmc_csd'
>   

The recent patches I posted should fix this problems.
They appear to be only in pxa.
The changes looked obvious.
MAKEBUILDALL arm and grep-ing for  mmc in the *.ERR file were used to 
test the compile.
I do not have a pxa target so I was unable to do a runtime test.

It would be a good idea for someone with a pxa board like cerf250 to 
test these changes.

Tom