aboutsummaryrefslogtreecommitdiff
path: root/hw/arm_boot.c
diff options
context:
space:
mode:
authorPaul Brook <paul@codesourcery.com>2009-11-19 16:45:21 +0000
committerPaul Brook <paul@codesourcery.com>2009-11-19 16:45:21 +0000
commitf7c703250cef231085f07352b719bb91d71ea8a1 (patch)
tree8a511980622c574aba59fd41d320a94bf025b010 /hw/arm_boot.c
parent100555620f4c825c3d2d37ed4d8b921b4604c1f6 (diff)
ARM PBX-A9 board support
Implement ARM RealView PBX-A9 board support. Signed-off-by: Paul Brook <paul@codesourcery.com>
Diffstat (limited to 'hw/arm_boot.c')
-rw-r--r--hw/arm_boot.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/hw/arm_boot.c b/hw/arm_boot.c
index e273803645..30a76a56d1 100644
--- a/hw/arm_boot.c
+++ b/hw/arm_boot.c
@@ -31,8 +31,7 @@ static uint32_t bootloader[] = {
/* Entry point for secondary CPUs. Enable interrupt controller and
Issue WFI until start address is written to system controller. */
static uint32_t smpboot[] = {
- 0xe3a00201, /* mov r0, #0x10000000 */
- 0xe3800601, /* orr r0, r0, #0x001000000 */
+ 0xe59f0020, /* ldr r0, privbase */
0xe3a01001, /* mov r1, #1 */
0xe5801100, /* str r1, [r0, #0x100] */
0xe3a00201, /* mov r0, #0x10000000 */
@@ -41,7 +40,8 @@ static uint32_t smpboot[] = {
0xe5901000, /* ldr r1, [r0] */
0xe1110001, /* tst r1, r1 */
0x0afffffb, /* beq <wfi> */
- 0xe12fff11 /* bx r1 */
+ 0xe12fff11, /* bx r1 */
+ 0 /* privbase: Private memory region base address. */
};
#define WRITE_WORD(p, value) do { \
@@ -268,6 +268,7 @@ void arm_load_kernel(CPUState *env, struct arm_boot_info *info)
rom_add_blob_fixed("bootloader", bootloader, sizeof(bootloader),
info->loader_start);
if (info->nb_cpus > 1) {
+ smpboot[10] = info->smp_priv_base;
for (n = 0; n < sizeof(smpboot) / 4; n++) {
smpboot[n] = tswap32(smpboot[n]);
}