summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorMichael Brandt <michael.brandt@stericsson.com>2010-05-17 17:41:25 +0200
committerJonas ABERG <jonas.aberg@stericsson.com>2010-05-19 09:52:53 +0200
commit07967a694db6f9652453c302537d574ec10c63dc (patch)
tree3a08e67ce9f0f2c65385a8c67beb819e5ab453fb /board
parent83a5126ea67b3278d656f6f1b72962479de14320 (diff)
removed core2 related code
See ER 257608 Second core must not be woken up in U-Boot. If the kernel boots with only one core (nosmp), it cannot be guaranteed that the memory the second CPU is running from, is unused. Signed-off-by: Michael Brandt <michael.brandt@stericsson.com> Change-Id: If6acd1311d14be8514afde3dff4260db6a37cc54 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/310 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Tested-by: Jonas ABERG <jonas.aberg@stericsson.com>
Diffstat (limited to 'board')
-rw-r--r--board/st/u8500/Makefile1
-rwxr-xr-xboard/st/u8500/core2.S56
-rw-r--r--board/st/u8500/u8500.c13
3 files changed, 0 insertions, 70 deletions
diff --git a/board/st/u8500/Makefile b/board/st/u8500/Makefile
index 3ed1ab0e1..1dcc9e1a3 100644
--- a/board/st/u8500/Makefile
+++ b/board/st/u8500/Makefile
@@ -27,7 +27,6 @@ CFLAGS += -D__RELEASE -D__STN_8500
LIB = $(obj)lib$(BOARD).a
COBJS := u8500.o flash.o gpio.o u8500_i2c.o mmc.o mmc_utils.o init_mmc.o emmc.o clock.o
-SOBJS := core2.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS))
diff --git a/board/st/u8500/core2.S b/board/st/u8500/core2.S
deleted file mode 100755
index 7152e3077..000000000
--- a/board/st/u8500/core2.S
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * secondary_wfe()
- * Copyright (c) 2009 ST Ericsson
- * Author: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
- *
- * puts the secondary core in wfe. This is required for the locked
- * version of ST Ericsson SMP platform to attach the debugger at this stage.
- * This is a GCC generated code.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-.global secondary_startup
-secondary_startup:
- dsb @ WFI may enter a low-power mode
- wfi
- mov pc, lr
-
-.global secondary_wfe
-secondary_wfe:
-.L8: wfe
- ldr r0, .L9
- ldr r1, .L9+4
- ldr r3, [r0, #4080]
- str r3, [r1, #0]
- ldr r3, .L9+8
- ldr r2, [r1, #0]
- cmp r2, r3
- bne .L8
- ldr r3, [r0, #4084]
- str r3, [r1, #4]
- blx r3
- b .L8
-.L10:
- .align 2
-.L9:
- .word -2146103296
- .word .LANCHOR0
- .word -1577128703
- .size secondary_wfe, .-secondary_wfe
- .global handler
- .global magic_num
- .bss
- .align 2
-.LANCHOR0 = . + 0
- .type magic_num, %object
- .size magic_num, 4
-magic_num:
- .space 4
- .type handler, %object
- .size handler, 4
-handler:
- .space 4
- .ident "GCC: (GNU) 4.2.3"
- .section .note.GNU-stack,"",%progbits
diff --git a/board/st/u8500/u8500.c b/board/st/u8500/u8500.c
index d106f0195..cf6b70bdc 100644
--- a/board/st/u8500/u8500.c
+++ b/board/st/u8500/u8500.c
@@ -116,18 +116,6 @@ static struct clk_mgt_regs maja_clk_regs[] = {
{0, 0, NULL},
};
-extern void (*handler)(void);
-extern void secondary_wfe(void);
-
-void wake_up_other_cores(void)
-{
- handler = secondary_wfe;
- *((volatile unsigned int *)(NOMADIK_BACKUPRAM0_BASE+0x1FF4))= handler;
- *((volatile unsigned int *)(NOMADIK_BACKUPRAM0_BASE+0x1FF0))= 0xA1FEED01;
- asm("SEV");
- return;
-}
-
static void init_regs(void);
DECLARE_GLOBAL_DATA_PTR;
@@ -171,7 +159,6 @@ int dram_init(void)
{
gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
gd->bd->bi_dram[0].size = PHYS_SDRAM_SIZE_1;
- wake_up_other_cores();
return 0;
}