| Message ID | 1332949122-5453-1-git-send-email-agust@denx.de |
|---|---|
| State | Accepted |
| Commit | 4af7692026ed23fc0424af7eb54595f05acedfce |
| Delegated to: | Albert ARIBAUD |
| Headers | show |
Dear Anatolij Gustschin, > Building for vpac270_ond_256 configuration fails: > > arch/arm/lib/libarm.o: In function `icache_disable': > /home/ag/git/u-boot/arch/arm/lib/cache-cp15.c:156: multiple > definition of `icache_disable' > board/vpac270/libvpac270.o:/home/ag/git/u-boot/board/vpac270/onenand.c:65: > first defined here > arch/arm/lib/libarm.o: In function `dcache_disable': > /home/ag/git/u-boot/arch/arm/lib/cache-cp15.c:188: multiple > definition of `dcache_disable' > board/vpac270/libvpac270.o:/home/ag/git/u-boot/board/vpac270/onenand.c:66: > first defined here > make[1]: *** [/home/ag/git/u-boot/spl/u-boot-spl] Error 1 Awwww ... bad, bad maintainer I am. :-( > > Signed-off-by: Anatolij Gustschin <agust@denx.de> > Cc: Marek Vasut <marek.vasut@gmail.com> > --- > Hi Marek, > > After pulling Albert's u-boot-arm.git master and running > build tests I see this error. Is this fix correct? > > Anatolij > > board/vpac270/onenand.c | 3 --- > 1 files changed, 0 insertions(+), 3 deletions(-) > > diff --git a/board/vpac270/onenand.c b/board/vpac270/onenand.c > index c2ae9a7..47f44c3 100644 > --- a/board/vpac270/onenand.c > +++ b/board/vpac270/onenand.c > @@ -60,6 +60,3 @@ void __attribute__((noreturn)) hang(void) > for (;;) > ; > } > - > -void icache_disable(void) {} > -void dcache_disable(void) {} Looks ok: Acked-by: Marek Vasut <marex@denx.de> Best regards, Marek Vasut
diff --git a/board/vpac270/onenand.c b/board/vpac270/onenand.c index c2ae9a7..47f44c3 100644 --- a/board/vpac270/onenand.c +++ b/board/vpac270/onenand.c @@ -60,6 +60,3 @@ void __attribute__((noreturn)) hang(void) for (;;) ; } - -void icache_disable(void) {} -void dcache_disable(void) {}
Building for vpac270_ond_256 configuration fails: arch/arm/lib/libarm.o: In function `icache_disable': /home/ag/git/u-boot/arch/arm/lib/cache-cp15.c:156: multiple definition of `icache_disable' board/vpac270/libvpac270.o:/home/ag/git/u-boot/board/vpac270/onenand.c:65: first defined here arch/arm/lib/libarm.o: In function `dcache_disable': /home/ag/git/u-boot/arch/arm/lib/cache-cp15.c:188: multiple definition of `dcache_disable' board/vpac270/libvpac270.o:/home/ag/git/u-boot/board/vpac270/onenand.c:66: first defined here make[1]: *** [/home/ag/git/u-boot/spl/u-boot-spl] Error 1 Signed-off-by: Anatolij Gustschin <agust@denx.de> Cc: Marek Vasut <marek.vasut@gmail.com> --- Hi Marek, After pulling Albert's u-boot-arm.git master and running build tests I see this error. Is this fix correct? Anatolij board/vpac270/onenand.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-)