From: Alessandro Rubini rubini@unipv.it
There is only one public release of the Nomadik chip, so the ifdef in reset code as well as a define in the config file are not needed
Signed-off-by: Alessandro Rubini rubini@unipv.it Acked-by: Andrea Gallo andrea.gallo@stericsson.com --- cpu/arm926ejs/nomadik/reset.S | 13 +------------ include/configs/nhk8815.h | 5 ++--- 2 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/cpu/arm926ejs/nomadik/reset.S b/cpu/arm926ejs/nomadik/reset.S index 948996b..ec95472 100644 --- a/cpu/arm926ejs/nomadik/reset.S +++ b/cpu/arm926ejs/nomadik/reset.S @@ -6,20 +6,9 @@ .align 5 .globl reset_cpu reset_cpu: -#if defined CONFIG_NOMADIK_8815 - ldr r0, =NOMADIK_SRC_BASE + ldr r0, =NOMADIK_SRC_BASE /* System and Reset Controller */ ldr r1, =0x1 str r1, [r0, #0x18] -#else - ldr r1, rstctl1 /* get clkm1 reset ctl */ - mov r3, #0x0 - strh r3, [r1] /* clear it */ - mov r3, #0x8 - strh r3, [r1] /* force dsp+arm reset */ -#endif
_loop_forever: b _loop_forever - -rstctl1: - .word 0xfffece10 diff --git a/include/configs/nhk8815.h b/include/configs/nhk8815.h index df9d523..321adfa 100644 --- a/include/configs/nhk8815.h +++ b/include/configs/nhk8815.h @@ -30,9 +30,8 @@
#define CONFIG_ARM926EJS #define CONFIG_NOMADIK -#define CONFIG_NOMADIK_8815 -#define CONFIG_NOMADIK_NDK15 -#define CONFIG_NOMADIK_NHK15 +#define CONFIG_NOMADIK_8815 /* cpu variant */ +#define CONFIG_NOMADIK_NHK8815 /* board variant */
#define CONFIG_SKIP_LOWLEVEL_INIT /* we have already been loaded to RAM */