On 03/07/2012 11:22 AM, Menon, Nishanth wrote:
On Wed, Mar 7, 2012 at 00:52, R Sricharanr.sricharan@ti.com wrote:
Warm reset is not functional in case of omap5430ES1.0. So use cold reset instead.
Signed-off-by: R Sricharanr.sricharan@ti.com
[v3] Addressed Tom Rini's comments.trini@ti.com
arch/arm/cpu/armv7/omap-common/reset.S | 3 +++ arch/arm/cpu/armv7/omap5/hwinit.c | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/arch/arm/cpu/armv7/omap-common/reset.S b/arch/arm/cpu/armv7/omap-common/reset.S index 838b122..f2a522a 100644 --- a/arch/arm/cpu/armv7/omap-common/reset.S +++ b/arch/arm/cpu/armv7/omap-common/reset.S @@ -23,6 +23,8 @@
#include<config.h>
+#ifndef CONFIG_OMAP54XX +.type reset_cpu, %function .global reset_cpu reset_cpu: ldr r1, rstctl @ get addr for global reset @@ -36,3 +38,4 @@ rstctl: .word PRM_RSTCTRL rstbit: .word PRM_RSTCTRL_RESET +#endif
instead of doing the #ifdeffery, why not make this a C file with weak and override it in omap5 as needed?
Agreed, thanks.