diff options
| author | Rabin Vincent <rabin.vincent@stericsson.com> | 2010-06-09 12:08:37 +0530 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2010-09-02 22:45:40 -0600 |
| commit | 4ce9043f3d87d561c79921fab695f137ecf84b22 (patch) | |
| tree | aeaef5a78c63b0b35635a4ef7caa38569aa5dfd6 /arch/arm/kernel | |
| parent | 0245b42e87f84e228e9ced0f84f1bc8411441bb3 (diff) | |
u5500: switch to MACH_TYPE_U5500
And also switch SVP8500 to MACH_TYPE_U8500.
ST-Ericsson ID: AP263392
Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>
Change-Id: Idbc545b7f53ca18e1d8bce2278db920a50aa88fd
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/2530
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/head.S | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index 10a812d8a88..3321756015c 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S @@ -77,6 +77,7 @@ __HEAD ENTRY(stext) #if (defined(CONFIG_MACH_U8500_SIMULATOR) || defined(CONFIG_MACH_U5500_SIMULATOR)) +#include <asm/mach-types.h> #ifdef CONFIG_DEBUG_LL #ifdef CONFIG_MACH_U8500_SIMULATOR /* Enable UART2 */ @@ -104,9 +105,14 @@ ENTRY(stext) mrc p15, 0, r1, c1, c0, 0 orr r1, r1, #1 << 10 @ Set the 10th bit in the System Control register as 1 to enable SWP ins mcr p15, 0, r1, c1, c0, 0 - mov r1, #0x100 - add r1, r1,#0xa4 mov r2, #0x100 + +#ifdef CONFIG_MACH_U5500_SIMULATOR + ldr r1, =MACH_TYPE_U5500 +#else + /* SVP8500 */ + ldr r1, =MACH_TYPE_U8500 +#endif #endif setmode PSR_F_BIT | PSR_I_BIT | SVC_MODE, r9 @ ensure svc mode @ and irqs disabled |