Mon Jun 17 20:30:49 2013 UTC ()
a9_cpuinit -> arm_cpuinit


(matt)
diff -r1.4 -r1.5 src/sys/arch/evbarm/bcm53xx/bcm53xx_start.S
cvs diff -r1.4 -r1.5 src/sys/arch/evbarm/bcm53xx/Attic/bcm53xx_start.S (expand / switch to unified diff)

--- src/sys/arch/evbarm/bcm53xx/Attic/bcm53xx_start.S 2012/09/27 00:22:39 1.4
+++ src/sys/arch/evbarm/bcm53xx/Attic/bcm53xx_start.S 2013/06/17 20:30:49 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: bcm53xx_start.S,v 1.4 2012/09/27 00:22:39 matt Exp $ */ 1/* $NetBSD: bcm53xx_start.S,v 1.5 2013/06/17 20:30:49 matt Exp $ */
2/*- 2/*-
3 * Copyright (c) 2012 The NetBSD Foundation, Inc. 3 * Copyright (c) 2012 The NetBSD Foundation, Inc.
4 * All rights reserved. 4 * All rights reserved.
5 * 5 *
6 * This code is derived from software contributed to The NetBSD Foundation 6 * This code is derived from software contributed to The NetBSD Foundation
7 * by Matt Thomas of 3am Software Foundry. 7 * by Matt Thomas of 3am Software Foundry.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -35,27 +35,27 @@ @@ -35,27 +35,27 @@
35#include "opt_cputypes.h" 35#include "opt_cputypes.h"
36#include "opt_multiprocessor.h" 36#include "opt_multiprocessor.h"
37 37
38#include <arm/asm.h> 38#include <arm/asm.h>
39#include <arm/armreg.h> 39#include <arm/armreg.h>
40#include "assym.h" 40#include "assym.h"
41 41
42#include <arm/cortex/a9tmr_reg.h> 42#include <arm/cortex/a9tmr_reg.h>
43 43
44#ifndef CONADDR 44#ifndef CONADDR
45#define CONADDR 0x18000300 45#define CONADDR 0x18000300
46#endif 46#endif
47 47
48RCSID("$NetBSD: bcm53xx_start.S,v 1.4 2012/09/27 00:22:39 matt Exp $") 48RCSID("$NetBSD: bcm53xx_start.S,v 1.5 2013/06/17 20:30:49 matt Exp $")
49 49
50#undef VERBOSE_INIT_ARM 50#undef VERBOSE_INIT_ARM
51#define VERBOSE_INIT_ARM 51#define VERBOSE_INIT_ARM
52 52
53#if defined(VERBOSE_INIT_ARM) 53#if defined(VERBOSE_INIT_ARM)
54#define XPUTC(n) mov r0, n; bl xputc 54#define XPUTC(n) mov r0, n; bl xputc
55#define XPUTC_COM 1 55#define XPUTC_COM 1
56#else 56#else
57#define XPUTC(n) 57#define XPUTC(n)
58#endif 58#endif
59 59
60/* 60/*
61 * Kernel start routine for BCM5301X boards. 61 * Kernel start routine for BCM5301X boards.
@@ -99,27 +99,27 @@ _C_LABEL(bcm53xx_start): @@ -99,27 +99,27 @@ _C_LABEL(bcm53xx_start):
99 * routine.  99 * routine.
100 */ 100 */
101 ldr r1, .Lsku_rom_lut 101 ldr r1, .Lsku_rom_lut
102 adr r2, a9_mpstart 102 adr r2, a9_mpstart
103 str r2, [r1] 103 str r2, [r1]
104 sev /* wake up the others */ 104 sev /* wake up the others */
105 105
106 /* 106 /*
107 * init the CPU TLB, Cache, MMU. 107 * init the CPU TLB, Cache, MMU.
108 */ 108 */
109 XPUTC(#69) 109 XPUTC(#69)
110 110
111 ldr r0, .Ltemp_l1_table /* The page table address */ 111 ldr r0, .Ltemp_l1_table /* The page table address */
112 bl a9_cpuinit 112 bl arm_cpuinit
113 113
114 XPUTC(#33) 114 XPUTC(#33)
115 XPUTC(#10) 115 XPUTC(#10)
116 XPUTC(#13) 116 XPUTC(#13)
117 117
118 /* 118 /*
119 * Let's turn off the CCA watchdog since nothing went horribly wrong. 119 * Let's turn off the CCA watchdog since nothing went horribly wrong.
120 */ 120 */
121 ldr r0, .Lcca_wdog 121 ldr r0, .Lcca_wdog
122 mov r1, #0 122 mov r1, #0
123 str r1, [r0] 123 str r1, [r0]
124 124
125 /* 125 /*