Message ID | 1296734392-15203-4-git-send-email-daniel.schwierzeck@googlemail.com |
---|---|
State | Superseded, archived |
Headers | show |
Hi Daniel, On Thursday 03 February 2011 12:59:52 daniel.schwierzeck@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@denx.de
Hi Stefan, 2011/2/3 Stefan Roese <sr@denx.de>: > Hi Daniel, > > On Thursday 03 February 2011 12:59:52 daniel.schwierzeck@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
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
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)
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(-) -- 1.7.3.5