[U-Boot] [PATCH 0/3] MIPS: Fix failed run of MAKEALL mips script

[U-Boot] [PATCH 0/3] MIPS: Fix failed run of MAKEALL mips script

[daniel.schwierzeck at googlemail.com]

Currently MAKEALL mips covers 21 boards and 15 of them have compile
errors with gcc-4.3.3. This patch series fixes these boards.

Daniel Schwierzeck (3):
  MIPS: VCT: Fix enabling of unwanted options if networking or USB
    support are disabled
  MIPS: Purple: Fix multiple definition error on final linking of
    u-boot binary
  MIPS: dbau1x00: Disable compilation of flash driver stub

 board/dbau1x00/Makefile |    2 +-
 board/purple/u-boot.lds |    5 -----
 include/configs/vct.h   |    7 +++++--
 3 files changed, 6 insertions(+), 8 deletions(-)

--
1.7.3.5

[U-Boot] [PATCH 1/3] MIPS: VCT: Fix enabling of unwanted options if networking or USB support are disabled

[daniel.schwierzeck at googlemail.com]

Some VCT boards lacks the support of networking or USB.
Additionally that support is disabled in small image
configurations.

If CONFIG_CMD_NET should not used the CONFIG_CMD_NFS option
have to be disabled too. Otherwise the linker fails with
unresolved symbols.

If CONFIG_VCT_SMALL_IMAGE is set than CONFIG_CMD_NET and
CONFIG_CMD_USB are disabled at the end of vct.h.
This is not adequate because CONFIG_CMD_USB enables additional
options and the linker fails again with unresolved symbols.

This patch adds an early check against CONFIG_VCT_SMALL_IMAGE
so the additional options are only enabled if they are really
needed.

Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
Cc: Stefan Roese <sr@denx.de>
---
 include/configs/vct.h |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/include/configs/vct.h b/include/configs/vct.h
index 4894969..8162217 100644
--- a/include/configs/vct.h
+++ b/include/configs/vct.h
@@ -109,17 +109,20 @@
 /*
  * Only Premium/Platinum have ethernet support right now
  */
-#if defined(CONFIG_VCT_PREMIUM) || defined(CONFIG_VCT_PLATINUM)
+#if (defined(CONFIG_VCT_PREMIUM) || defined(CONFIG_VCT_PLATINUM)) && \
+	!defined CONFIG_VCT_SMALL_IMAGE
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_SNTP
 #else
 #undef CONFIG_CMD_NET
+#undef CONFIG_CMD_NFS
 #endif

 /*
  * Only Premium/Platinum have USB-EHCI support right now
  */
-#if defined(CONFIG_VCT_PREMIUM) || defined(CONFIG_VCT_PLATINUM)
+#if (defined(CONFIG_VCT_PREMIUM) || defined(CONFIG_VCT_PLATINUM)) && \
+	!defined CONFIG_VCT_SMALL_IMAGE
 #define CONFIG_CMD_USB
 #define CONFIG_CMD_FAT
 #endif
--
1.7.3.5

[U-Boot] [PATCH 2/3] MIPS: Purple: Fix multiple definition error on final linking of u-boot binary

[daniel.schwierzeck at googlemail.com]

The linker of recent toolchains complains about multiple definitions
on final linking of u-boot binary. This patch removes all redundant
object files from u-boot.lds those are already added to .text section
by the linker.

That patch could not be tested but the resulting u-boot.map still looks
good. The start symbol is at 0xB0000000, the environment at 0xB0008000
so u-boot should boot.

Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
Cc: Wolfgang Denk <wd@denx.de>
---
 board/purple/u-boot.lds |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/board/purple/u-boot.lds b/board/purple/u-boot.lds
index 542601a..719f268 100644
--- a/board/purple/u-boot.lds
+++ b/board/purple/u-boot.lds
@@ -36,11 +36,6 @@ SECTIONS
 	{
 	  arch/mips/cpu/start.o		(.text)
 	  board/purple/lowlevel_init.o	(.text)
-	  arch/mips/cpu/cache.o		(.text)
-	  common/main.o			(.text)
-	  common/dlmalloc.o		(.text)
-	  common/cmd_boot.o		(.text)
-	  lib/zlib.o		(.text)
 	  . = DEFINED(env_offset) ? env_offset : .;
 	  common/env_embedded.o	(.ppcenv)

--
1.7.3.5

[U-Boot] [PATCH 3/3] MIPS: dbau1x00: Disable compilation of flash driver stub

[daniel.schwierzeck at googlemail.com]

All dbau1x00 boards use the CFI driver so this stub driver is useless
and should not be compiled.

This patch fixes the error:

u-boot-git/board/dbau1x00/flash.c:34: multiple definition of `flash_init'
drivers/mtd/libmtd.o:u-boot-git/drivers/mtd/cfi_flash.c:2084: first defined here
board/dbau1x00/libdbau1x00.o: In function `write_buff':
u-boot-git/board/dbau1x00/flash.c:40: multiple definition of `write_buff'
drivers/mtd/libmtd.o:u-boot-git/drivers/mtd/cfi_flash.c:1265: first defined here

Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
Cc: Wolfgang Denk <wd@denx.de>
---
 board/dbau1x00/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/board/dbau1x00/Makefile b/board/dbau1x00/Makefile
index f1594a2..e36a9d2 100644
--- a/board/dbau1x00/Makefile
+++ b/board/dbau1x00/Makefile
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk

 LIB	= $(obj)lib$(BOARD).o

-COBJS	= $(BOARD).o flash.o
+COBJS	= $(BOARD).o
 SOBJS	= lowlevel_init.o

 SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
--
1.7.3.5

[U-Boot] [PATCH 1/3] MIPS: VCT: Fix enabling of unwanted options if networking or USB support are disabled

[Stefan Roese]

Hi Daniel,

On Thursday 03 February 2011 12:59:50 daniel.schwierzeck at googlemail.com wrote:
> Some VCT boards lacks the support of networking or USB.
> Additionally that support is disabled in small image
> configurations.
> 
> If CONFIG_CMD_NET should not used the CONFIG_CMD_NFS option
> have to be disabled too. Otherwise the linker fails with
> unresolved symbols.
> 
> If CONFIG_VCT_SMALL_IMAGE is set than CONFIG_CMD_NET and
> CONFIG_CMD_USB are disabled at the end of vct.h.
> This is not adequate because CONFIG_CMD_USB enables additional
> options and the linker fails again with unresolved symbols.
> 
> This patch adds an early check against CONFIG_VCT_SMALL_IMAGE
> so the additional options are only enabled if they are really
> needed.
> 
> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
> Cc: Stefan Roese <sr@denx.de>
> ---
>  include/configs/vct.h |    7 +++++--
>  1 files changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/include/configs/vct.h b/include/configs/vct.h
> index 4894969..8162217 100644
> --- a/include/configs/vct.h
> +++ b/include/configs/vct.h
> @@ -109,17 +109,20 @@
>  /*
>   * Only Premium/Platinum have ethernet support right now
>   */
> -#if defined(CONFIG_VCT_PREMIUM) || defined(CONFIG_VCT_PLATINUM)
> +#if (defined(CONFIG_VCT_PREMIUM) || defined(CONFIG_VCT_PLATINUM)) && \
> +	!defined CONFIG_VCT_SMALL_IMAGE

I would prefer consistent style with braces around CONFIG_VCT_SMALL_IMAGE 
here.

>  #define CONFIG_CMD_PING
>  #define CONFIG_CMD_SNTP
>  #else
>  #undef CONFIG_CMD_NET
> +#undef CONFIG_CMD_NFS
>  #endif
> 
>  /*
>   * Only Premium/Platinum have USB-EHCI support right now
>   */
> -#if defined(CONFIG_VCT_PREMIUM) || defined(CONFIG_VCT_PLATINUM)
> +#if (defined(CONFIG_VCT_PREMIUM) || defined(CONFIG_VCT_PLATINUM)) && \
> +	!defined CONFIG_VCT_SMALL_IMAGE

Same here. Otherwise:

Acked-by: Stefan Roese <sr@denx.de>

Thanks.

Cheers,
Stefan

--
DENX Software Engineering GmbH,      MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich,  Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office at denx.de

[U-Boot] [PATCH 3/3] MIPS: dbau1x00: Disable compilation of flash driver stub

[Stefan Roese]

Hi Daniel,

On Thursday 03 February 2011 12:59:52 daniel.schwierzeck at googlemail.com wrote:
> All dbau1x00 boards use the CFI driver so this stub driver is useless
> and should not be compiled.
> 
> This patch fixes the error:
> 
> u-boot-git/board/dbau1x00/flash.c:34: multiple definition of `flash_init'
> drivers/mtd/libmtd.o:u-boot-git/drivers/mtd/cfi_flash.c:2084: first defined
> here board/dbau1x00/libdbau1x00.o: In function `write_buff':
> u-boot-git/board/dbau1x00/flash.c:40: multiple definition of `write_buff'
> drivers/mtd/libmtd.o:u-boot-git/drivers/mtd/cfi_flash.c:1265: first defined
> here

I suggest that you not only disable the compilation of this file, but remove 
it completely.
 
Cheers,
Stefan

--
DENX Software Engineering GmbH,      MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich,  Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office at denx.de

[U-Boot] [PATCH 1/3] MIPS: VCT: Fix enabling of unwanted options if networking or USB support are disabled

[Daniel Schwierzeck]

Hi Stefan,

>
>> * Only Premium/Platinum have ethernet support right now
>
>> */
>
>> -#if defined(CONFIG_VCT_PREMIUM) || defined(CONFIG_VCT_PLATINUM)
>
>> +#if (defined(CONFIG_VCT_PREMIUM) || defined(CONFIG_VCT_PLATINUM)) && \
>
>> + !defined CONFIG_VCT_SMALL_IMAGE
>
> I would prefer consistent style with braces around CONFIG_VCT_SMALL_IMAGE
> here.
Ok I'll change this.

>
>> #define CONFIG_CMD_PING
>
>> #define CONFIG_CMD_SNTP
>
>> #else
>
>> #undef CONFIG_CMD_NET
>
>> +#undef CONFIG_CMD_NFS
>
>> #endif
>
>>
>
>> /*
>
>> * Only Premium/Platinum have USB-EHCI support right now
>
>> */
>
>> -#if defined(CONFIG_VCT_PREMIUM) || defined(CONFIG_VCT_PLATINUM)
>
>> +#if (defined(CONFIG_VCT_PREMIUM) || defined(CONFIG_VCT_PLATINUM)) && \
>
>> + !defined CONFIG_VCT_SMALL_IMAGE
>
> Same here. Otherwise:
Dito.

Thanks

Daniel

[U-Boot] [PATCH 3/3] MIPS: dbau1x00: Disable compilation of flash driver stub

[Daniel Schwierzeck]

Hi Stefan,

2011/2/3 Stefan Roese <sr@denx.de>:
> Hi Daniel,
>
> On Thursday 03 February 2011 12:59:52 daniel.schwierzeck at googlemail.com
> wrote:
>
>> All dbau1x00 boards use the CFI driver so this stub driver is useless
>
>> and should not be compiled.
>
>>
>
>> This patch fixes the error:
>
>>
>
>> u-boot-git/board/dbau1x00/flash.c:34: multiple definition of `flash_init'
>
>> drivers/mtd/libmtd.o:u-boot-git/drivers/mtd/cfi_flash.c:2084: first
>> defined
>
>> here board/dbau1x00/libdbau1x00.o: In function `write_buff':
>
>> u-boot-git/board/dbau1x00/flash.c:40: multiple definition of `write_buff'
>
>> drivers/mtd/libmtd.o:u-boot-git/drivers/mtd/cfi_flash.c:1265: first
>> defined
>
>> here
>
> I suggest that you not only disable the compilation of this file, but remove
> it completely.

Ok  I can do that if you and Wolfgang agree

Daniel

[U-Boot] [PATCH 3/3] MIPS: dbau1x00: Disable compilation of flash driver stub

[Wolfgang Denk]

Dear Daniel Schwierzeck,

In message <AANLkTikFFKJqhgo8s4973p919BCWc7fjwpJ+8d_gy2BU@mail.gmail.com> you wrote:
> 
> > I suggest that you not only disable the compilation of this file, but remove
> > it completely.
> 
> Ok  I can do that if you and Wolfgang agree

I do.

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
The moral of the story is: "Don't stop to  tighten  your  shoe  laces
during the Olympics 100m finals".
                             - Kevin Jones in <DEJo68.K1t@bri.hp.com>

[U-Boot] [PATCH 2/3] MIPS: Purple: Fix multiple definition error on final linking of u-boot binary

[Shinya Kuribayashi]

On 02/03/2011 08:59 PM, daniel.schwierzeck at googlemail.com wrote:
> The linker of recent toolchains complains about multiple definitions
> on final linking of u-boot binary. This patch removes all redundant
> object files from u-boot.lds those are already added to .text section
> by the linker.

Confirmed.

> That patch could not be tested but the resulting u-boot.map still looks
> good. The start symbol is at 0xB0000000, the environment at 0xB0008000
> so u-boot should boot.

Agreed.

> --- a/board/purple/u-boot.lds
> +++ b/board/purple/u-boot.lds
> @@ -36,11 +36,6 @@ SECTIONS
>  	{
>  	  arch/mips/cpu/start.o		(.text)
>  	  board/purple/lowlevel_init.o	(.text)
> -	  arch/mips/cpu/cache.o		(.text)
> -	  common/main.o			(.text)
> -	  common/dlmalloc.o		(.text)
> -	  common/cmd_boot.o		(.text)
> -	  lib/zlib.o		(.text)
>  	  . = DEFINED(env_offset) ? env_offset : .;
>  	  common/env_embedded.o	(.ppcenv)

This is ok, though we have some room for further cealnups.  With having
.text statement in the lowlevel_init.S, we could remove all these lines.

Applied anyway, thanks for the patch.

[U-Boot] [PATCH 2/3] MIPS: Purple: Fix multiple definition error on final linking of u-boot binary

[Wolfgang Denk]

Dear Shinya Kuribayashi,

In message <4D4D3E6B.2040605@pobox.com> you wrote:
>
> > --- a/board/purple/u-boot.lds
> > +++ b/board/purple/u-boot.lds
> > @@ -36,11 +36,6 @@ SECTIONS
> >  	{
> >  	  arch/mips/cpu/start.o		(.text)
> >  	  board/purple/lowlevel_init.o	(.text)
> > -	  arch/mips/cpu/cache.o		(.text)
> > -	  common/main.o			(.text)
> > -	  common/dlmalloc.o		(.text)
> > -	  common/cmd_boot.o		(.text)
> > -	  lib/zlib.o		(.text)
> >  	  . = DEFINED(env_offset) ? env_offset : .;
> >  	  common/env_embedded.o	(.ppcenv)
> 
> This is ok, though we have some room for further cealnups.  With having
> .text statement in the lowlevel_init.S, we could remove all these lines.

The prupose of explicitly pulling in these objects at that place is to
fill in the first flash sector below the sector(s) that is/are
reserved for the environment (we call this setup "embedded
environment").

But then, the Purple board has not been actively maintained for years,
and I guess we could as well remove it.  At least I have not had
access to this board for several yars.

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
The more complex the mind, the greater the need for the simplicity of
play.
	-- Kirk, "Shore Leave", stardate 3025.8