The ARM AT91 port calls a customized board_reset() function after
disabling interrupts and stopping the serial console.
Since this function is not architecture-generic and not compatible with
the new platform-independent meaning for __board_restart(), we rename it
here to be at91_board_reset().
Signed-off-by: Kyle Moffett <kyle.d.moff...@boeing.com>
Cc: Albert Aribaud <albert.arib...@free.fr>
Cc: Reinhard Meyer <u-b...@emk-elektronik.de>
---
arch/arm/cpu/arm920t/at91/reset.c | 4 ++--
arch/arm/cpu/arm920t/at91rm9200/reset.c | 6 +++---
board/atmel/at91rm9200dk/at91rm9200dk.c | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm/cpu/arm920t/at91/reset.c
b/arch/arm/cpu/arm920t/at91/reset.c
index 51043ec..c82a431 100644
--- a/arch/arm/cpu/arm920t/at91/reset.c
+++ b/arch/arm/cpu/arm920t/at91/reset.c
@@ -35,7 +35,7 @@
#include <asm/arch/hardware.h>
#include <asm/arch/at91_st.h>
-void __attribute__((weak)) board_reset(void)
+void __attribute__((weak)) at91_board_reset(void)
{
/* true empty function for defining weak symbol */
}
@@ -48,7 +48,7 @@ void reset_cpu(ulong ignored)
serial_exit();
#endif
- board_reset();
+ at91_board_reset();
/* Reset the cpu by setting up the watchdog timer */
writel(AT91_ST_WDMR_RSTEN | AT91_ST_WDMR_EXTEN | AT91_ST_WDMR_WDV(2),
diff --git a/arch/arm/cpu/arm920t/at91rm9200/reset.c
b/arch/arm/cpu/arm920t/at91rm9200/reset.c
index 945ea2c..523f835 100644
--- a/arch/arm/cpu/arm920t/at91rm9200/reset.c
+++ b/arch/arm/cpu/arm920t/at91rm9200/reset.c
@@ -33,7 +33,7 @@
#include <common.h>
#include <asm/arch/hardware.h>
-void board_reset(void) __attribute__((__weak__));
+void at91_board_reset(void) __attribute__((__weak__));
/*
* Reset the cpu by setting up the watchdog timer and let him time out
@@ -47,8 +47,8 @@ void reset_cpu (ulong ignored)
serial_exit();
#endif
- if (board_reset)
- board_reset();
+ if (at91_board_reset)
+ at91_board_reset();
/* this is the way Linux does it */
diff --git a/board/atmel/at91rm9200dk/at91rm9200dk.c
b/board/atmel/at91rm9200dk/at91rm9200dk.c
index 49b5fe3..0fbf2a9 100644
--- a/board/atmel/at91rm9200dk/at91rm9200dk.c
+++ b/board/atmel/at91rm9200dk/at91rm9200dk.c
@@ -60,7 +60,7 @@ int board_init (void)
return 0;
}
-void board_reset (void)
+void at91_board_reset (void)
{
AT91PS_PIO pio = AT91C_BASE_PIOA;
--
1.7.2.3
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
