Patchwork [U-Boot,4/5] serial: reduce include platform file for marvell chip

login
register
mail settings
Submitter Lei Wen
Date Oct. 2, 2011, 2:16 p.m.
Message ID <1317565013-22438-5-git-send-email-leiwen@marvell.com>
Download mbox | patch
Permalink /patch/117293/
State Accepted
Commit 93554271b9849c273f312a9cdb53a39fede1f6be
Headers show

Comments

Lei Wen - Oct. 2, 2011, 2:16 p.m.
Build pass with following config:
dkb_config
aspenite_config
edminiv2_config
openrd_ultimate_config
sheevaplug_config
mv88f6281gtw_ge_config
rd6281a_config
guruplug_config
km_kirkwood_config

Signed-off-by: Lei Wen <leiwen@marvell.com>
---
 drivers/serial/serial.c |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)
Prafulla Wadaskar - Oct. 2, 2011, 7:25 p.m.
> -----Original Message-----
> From: Lei Wen [mailto:adrian.wenl@gmail.com]
> Sent: Sunday, October 02, 2011 7:47 PM
> To: Prafulla Wadaskar; u-boot@lists.denx.de
> Subject: [PATCH 4/5] serial: reduce include platform file for marvell
> chip
> 
> Build pass with following config:
> dkb_config
> aspenite_config
> edminiv2_config
> openrd_ultimate_config
> sheevaplug_config
> mv88f6281gtw_ge_config
> rd6281a_config
> guruplug_config
> km_kirkwood_config
> 
> Signed-off-by: Lei Wen <leiwen@marvell.com>
> ---
>  drivers/serial/serial.c |    9 ---------
>  1 files changed, 0 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
> index 0d56e78..0d6ad62 100644
> --- a/drivers/serial/serial.c
> +++ b/drivers/serial/serial.c
> @@ -28,15 +28,6 @@
>  #ifdef CONFIG_NS87308
>  #include <ns87308.h>
>  #endif
> -#ifdef CONFIG_KIRKWOOD
> -#include <asm/arch/kirkwood.h>
> -#elif defined(CONFIG_ORION5X)
> -#include <asm/arch/orion5x.h>
> -#elif defined(CONFIG_ARMADA100)
> -#include <asm/arch/armada100.h>
> -#elif defined(CONFIG_PANTHEON)
> -#include <asm/arch/pantheon.h>
> -#endif

Hi Lei
This is very good cleanup, I am okay with entire patch series.
Any more comments welcomed.

Regards..
Prafulla . .
Wolfgang Denk - Oct. 6, 2011, 5:51 p.m.
Dear Lei Wen,

In message <1317565013-22438-5-git-send-email-leiwen@marvell.com> you wrote:
> Build pass with following config:
> dkb_config
> aspenite_config
> edminiv2_config
> openrd_ultimate_config
> sheevaplug_config
> mv88f6281gtw_ge_config
> rd6281a_config
> guruplug_config
> km_kirkwood_config
> 
> Signed-off-by: Lei Wen <leiwen@marvell.com>
> ---
>  drivers/serial/serial.c |    9 ---------
>  1 files changed, 0 insertions(+), 9 deletions(-)

Acked-by: Wolfgang Denk <wd@denx.de>

Prafulla, please apply with the rest of the patch series.

Best regards,

Wolfgang Denk
Albert ARIBAUD - Oct. 24, 2011, 4:46 p.m.
Hi all,

Le 02/10/2011 16:16, Lei Wen a écrit :
> Build pass with following config:
> dkb_config
> aspenite_config
> edminiv2_config
> openrd_ultimate_config
> sheevaplug_config
> mv88f6281gtw_ge_config
> rd6281a_config
> guruplug_config
> km_kirkwood_config
>
> Signed-off-by: Lei Wen<leiwen@marvell.com>
> ---
>   drivers/serial/serial.c |    9 ---------
>   1 files changed, 0 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
> index 0d56e78..0d6ad62 100644
> --- a/drivers/serial/serial.c
> +++ b/drivers/serial/serial.c
> @@ -28,15 +28,6 @@
>   #ifdef CONFIG_NS87308
>   #include<ns87308.h>
>   #endif
> -#ifdef CONFIG_KIRKWOOD
> -#include<asm/arch/kirkwood.h>
> -#elif defined(CONFIG_ORION5X)
> -#include<asm/arch/orion5x.h>
> -#elif defined(CONFIG_ARMADA100)
> -#include<asm/arch/armada100.h>
> -#elif defined(CONFIG_PANTHEON)
> -#include<asm/arch/pantheon.h>
> -#endif
>
>   #if defined (CONFIG_SERIAL_MULTI)
>   #include<serial.h>

This breaks ED Mini V2 (orion5x) with the following message:

serial.c:65: error: 'ORION5X_UART0_BASE' undeclared here (not in a function)
serial.c: In function 'calc_divisor':
serial.c:152: error: 'CONFIG_SYS_TCLK' undeclared (first use in this 
function)
serial.c:152: error: (Each undeclared identifier is reported only once
serial.c:152: error: for each function it appears in.)

Lei Wen, please provide a patch for orion5x as you provided for armada, 
pantheon and kirkwood.

Amicalement,
Lei Wen - Oct. 25, 2011, 1:30 a.m.
Hi Albert,

On Tue, Oct 25, 2011 at 12:46 AM, Albert ARIBAUD
<albert.u.boot@aribaud.net> wrote:
> Hi all,
>
> Le 02/10/2011 16:16, Lei Wen a écrit :
>>
>> Build pass with following config:
>> dkb_config
>> aspenite_config
>> edminiv2_config
>> openrd_ultimate_config
>> sheevaplug_config
>> mv88f6281gtw_ge_config
>> rd6281a_config
>> guruplug_config
>> km_kirkwood_config
>>
>> Signed-off-by: Lei Wen<leiwen@marvell.com>
>> ---
>>  drivers/serial/serial.c |    9 ---------
>>  1 files changed, 0 insertions(+), 9 deletions(-)
>>
>> diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
>> index 0d56e78..0d6ad62 100644
>> --- a/drivers/serial/serial.c
>> +++ b/drivers/serial/serial.c
>> @@ -28,15 +28,6 @@
>>  #ifdef CONFIG_NS87308
>>  #include<ns87308.h>
>>  #endif
>> -#ifdef CONFIG_KIRKWOOD
>> -#include<asm/arch/kirkwood.h>
>> -#elif defined(CONFIG_ORION5X)
>> -#include<asm/arch/orion5x.h>
>> -#elif defined(CONFIG_ARMADA100)
>> -#include<asm/arch/armada100.h>
>> -#elif defined(CONFIG_PANTHEON)
>> -#include<asm/arch/pantheon.h>
>> -#endif
>>
>>  #if defined (CONFIG_SERIAL_MULTI)
>>  #include<serial.h>
>
> This breaks ED Mini V2 (orion5x) with the following message:
>
> serial.c:65: error: 'ORION5X_UART0_BASE' undeclared here (not in a function)
> serial.c: In function 'calc_divisor':
> serial.c:152: error: 'CONFIG_SYS_TCLK' undeclared (first use in this
> function)
> serial.c:152: error: (Each undeclared identifier is reported only once
> serial.c:152: error: for each function it appears in.)
>
> Lei Wen, please provide a patch for orion5x as you provided for armada,
> pantheon and kirkwood.
>

I see... My fault for this...
I would post another patch to fix it.

Thanks,
Lei
Wolfgang Denk - Oct. 25, 2011, 7:40 a.m.
Dear Lei Wen,

In message <CALZhoSQRKK_Mjf8zt3a__sn3raap706NrrySQPe6bU_yot07QA@mail.gmail.com> you wrote:
> 
> > Lei Wen, please provide a patch for orion5x as you provided for armada,
> > pantheon and kirkwood.
> >
> 
> I see... My fault for this...
> I would post another patch to fix it.

Instead, please submit a fixed patch.  I will not pull these broken
comits into mainline.

Best regards,

Wolfgang Denk

Patch

diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index 0d56e78..0d6ad62 100644
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -28,15 +28,6 @@ 
 #ifdef CONFIG_NS87308
 #include <ns87308.h>
 #endif
-#ifdef CONFIG_KIRKWOOD
-#include <asm/arch/kirkwood.h>
-#elif defined(CONFIG_ORION5X)
-#include <asm/arch/orion5x.h>
-#elif defined(CONFIG_ARMADA100)
-#include <asm/arch/armada100.h>
-#elif defined(CONFIG_PANTHEON)
-#include <asm/arch/pantheon.h>
-#endif
 
 #if defined (CONFIG_SERIAL_MULTI)
 #include <serial.h>