MIPS: Fix failed run of MAKEALL mips script

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

Changes for v2:
- make brace style consistent in vct.h
- delete unused board/dbau1x00/flash.c

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: Remove unused flash driver stub

 board/dbau1x00/Makefile |    2 +-
 board/dbau1x00/flash.c  |   43 -------------------------------------------
 board/purple/u-boot.lds |    5 -----
 include/configs/vct.h   |    7 +++++--
 4 files changed, 6 insertions(+), 51 deletions(-)
 delete mode 100644 board/dbau1x00/flash.c

--
1.7.3.5

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.

---
 include/configs/vct.h |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

index 4894969..325ac8c 100644
@@ -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

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.

---
 board/purple/u-boot.lds |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

index 542601a..719f268 100644
@@ -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

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

---
 board/dbau1x00/Makefile |    2 +-
 board/dbau1x00/flash.c  |   43 -------------------------------------------
 2 files changed, 1 insertions(+), 44 deletions(-)
 delete mode 100644 board/dbau1x00/flash.c

index f1594a2..e36a9d2 100644
@@ -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

All three patches applied, thanks.