Commit 17a990b55008fd79636e4880d9d10b7172ca87ce

Authored by Daniel Schwierzeck
Committed by Shinya Kuribayashi
1 parent ec36d1f422

MIPS: dbau1x00: Remove unused flash driver stub

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>
Signed-off-by: Shinya Kuribayashi <skuribay@pobox.com>

Showing 2 changed files with 1 additions and 44 deletions Side-by-side Diff

board/dbau1x00/Makefile
... ... @@ -25,7 +25,7 @@
25 25  
26 26 LIB = $(obj)lib$(BOARD).o
27 27  
28   -COBJS = $(BOARD).o flash.o
  28 +COBJS = $(BOARD).o
29 29 SOBJS = lowlevel_init.o
30 30  
31 31 SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
board/dbau1x00/flash.c
1   -/*
2   - * (C) Copyright 2003
3   - * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
4   - *
5   - * See file CREDITS for list of people who contributed to this
6   - * project.
7   - *
8   - * This program is free software; you can redistribute it and/or
9   - * modify it under the terms of the GNU General Public License as
10   - * published by the Free Software Foundation; either version 2 of
11   - * the License, or (at your option) any later version.
12   - *
13   - * This program is distributed in the hope that it will be useful,
14   - * but WITHOUT ANY WARRANTY; without even the implied warranty of
15   - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16   - * GNU General Public License for more details.
17   - *
18   - * You should have received a copy of the GNU General Public License
19   - * along with this program; if not, write to the Free Software
20   - * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
21   - * MA 02111-1307 USA
22   - */
23   -
24   -#include <common.h>
25   -
26   -flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS]; /* info for FLASH chips */
27   -
28   -/*-----------------------------------------------------------------------
29   - * flash_init()
30   - *
31   - * sets up flash_info and returns size of FLASH (bytes)
32   - */
33   -unsigned long flash_init (void)
34   -{
35   - printf ("Skipping flash_init\n");
36   - return (0);
37   -}
38   -
39   -int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt)
40   -{
41   - printf ("write_buff not implemented\n");
42   - return (-1);
43   -}