Skip to contentSkip to conversation

board/vpac270/onenand.c: Fix build errors

PATCH New Anatolij Gustschin 2 participants 2 messages Mar 28, 2012

lore
Share & tools
lore

Anatolij Gustschin

author
#0 lore raw

PATCH 1/1 board/vpac270/onenand.c: Fix build errors

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 <[email protected]>
Cc Marek Vasut <[email protected]>

---
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(-)
board/vpac270/onenand.c +0 -3
index c2ae9a7..47f44c3 100644
@@ -60,6 +60,3 @@ void __attribute__((noreturn)) hang(void)
 	for (;;)
 		;
 }
-
-void icache_disable(void) {}
-void dcache_disable(void) {}
Signature · 1 line
1.7.7.6
#1 lore raw

PATCH 1/1 board/vpac270/onenand.c: Fix build errors

Dear Anatolij Gustschin,

Quoted 13 lines

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. :-(

Quoted 19 lines
Signed-off-by Anatolij Gustschin <[email protected]>
Cc Marek Vasut <[email protected]>

---
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(-)
board/vpac270/onenand.c +0 -0
index c2ae9a7..47f44c3 100644

board/vpac270/onenand.c void __attribute__((noreturn)) hang(void) · line 65

Quoted 6 lines
board/vpac270/onenand.c +0 -3
@@ -60,6 +60,3 @@ void __attribute__((noreturn)) hang(void)
 	for (;;)
 		;
 }
-
-void icache_disable(void) {}
-void dcache_disable(void) {}

Looks ok:

Acked-by Marek Vasut <[email protected]>

Best regards,
Marek Vasut