diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/kernel/head.S | 10 | ||||
| -rwxr-xr-x | arch/arm/mach-ux500/board-u5500.c | 2 |
2 files changed, 9 insertions, 3 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 diff --git a/arch/arm/mach-ux500/board-u5500.c b/arch/arm/mach-ux500/board-u5500.c index 3769bd68ddc..c8811b4e79e 100755 --- a/arch/arm/mach-ux500/board-u5500.c +++ b/arch/arm/mach-ux500/board-u5500.c @@ -132,7 +132,7 @@ static void __init u5500_init_machine(void) ARRAY_SIZE(u5500_platform_devices)); } -MACHINE_START(NOMADIK, "ST-Ericsson U5500 Platform") +MACHINE_START(U5500, "ST-Ericsson U5500 Platform") .phys_io = UX500_UART0_BASE, .io_pg_offst = (IO_ADDRESS(UX500_UART0_BASE) >> 18) & 0xfffc, .boot_params = 0x00000100, |