Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/evbarm Add RCSID when needed.
details: https://anonhg.NetBSD.org/src/rev/2b5d773c2592
branches: trunk
changeset: 761527:2b5d773c2592
user: matt <matt%NetBSD.org@localhost>
date: Mon Jan 31 06:28:02 2011 +0000
description:
Add RCSID when needed.
Don't include pmap.h or pte.h, include "assym.h" instead.
Use assym.h provided values.
diffstat:
sys/arch/evbarm/adi_brh/brh_start.S | 13 +++++---
sys/arch/evbarm/armadillo/armadillo9_start.S | 14 +++++----
sys/arch/evbarm/beagle/beagle_start.S | 15 ++++-----
sys/arch/evbarm/g42xxeb/g42xxeb_start.S | 13 ++++----
sys/arch/evbarm/gemini/gemini_start.S | 24 ++++++---------
sys/arch/evbarm/gumstix/gumstix_start.S | 18 ++++++------
sys/arch/evbarm/hdl_g/hdlg_start.S | 10 ++++--
sys/arch/evbarm/imx31/imx31lk_start.S | 42 +++++++++++++++++++++++----
sys/arch/evbarm/integrator/intmmu.S | 11 +++----
sys/arch/evbarm/iq80310/iq80310_start.S | 10 ++++--
sys/arch/evbarm/iq80321/iq80321_start.S | 10 ++++--
sys/arch/evbarm/ixdp425/ixdp425_start.S | 14 +++++----
sys/arch/evbarm/ixm1200/ixm1200_start.S | 11 ++++---
sys/arch/evbarm/lubbock/lubbock_start.S | 13 ++++----
sys/arch/evbarm/marvell/marvell_start.S | 13 ++++----
sys/arch/evbarm/mpcsa/mpcsa_start.S | 13 ++++----
sys/arch/evbarm/netwalker/netwalker_start.S | 17 +++++------
sys/arch/evbarm/nslu2/nslu2_start.S | 14 +++++----
sys/arch/evbarm/smdk2xx0/smdk2410_start.S | 16 ++++++----
sys/arch/evbarm/smdk2xx0/smdk2800_start.S | 15 +++++----
sys/arch/evbarm/tisdp24xx/sdp24xx_start.S | 13 ++++----
sys/arch/evbarm/tsarm/tsarm_start.S | 19 +++++++-----
sys/arch/evbarm/viper/viper_start.S | 35 ++++++++++++-----------
23 files changed, 210 insertions(+), 163 deletions(-)
diffs (truncated from 1194 to 300 lines):
diff -r 12bf413489e1 -r 2b5d773c2592 sys/arch/evbarm/adi_brh/brh_start.S
--- a/sys/arch/evbarm/adi_brh/brh_start.S Mon Jan 31 06:26:54 2011 +0000
+++ b/sys/arch/evbarm/adi_brh/brh_start.S Mon Jan 31 06:28:02 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: brh_start.S,v 1.1 2003/01/25 02:00:17 thorpej Exp $ */
+/* $NetBSD: brh_start.S,v 1.2 2011/01/31 06:28:02 matt Exp $ */
/*
* Copyright (c) 2002 Wasabi Systems, Inc.
@@ -35,14 +35,17 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+
#include <machine/asm.h>
#include <arm/armreg.h>
-#include <arm/arm32/pte.h>
+#include "assym.h"
#include <arm/xscale/beccreg.h>
#include <evbarm/adi_brh/brhreg.h>
+RCSID("$NetBSD: brh_start.S,v 1.2 2011/01/31 06:28:02 matt Exp $")
+
.section .start,"ax",%progbits
.global _C_LABEL(brh_start)
@@ -96,7 +99,7 @@
add r0, pc, #(.Ltable - . - 8)
ldr r0, [r0] /* r0 = &l1table */
- mov r3, #(L1_S_AP(AP_KRW))
+ mov r3, #(L1_S_AP_KRW)
orr r3, r3, #(L1_TYPE_S)
mov r2, #0x100000 /* advance by 1MB */
mov r1, #0x1000 /* 4096MB */
@@ -114,7 +117,7 @@
add r0, pc, #(.Ltable - . - 8) /* r0 = &l1table */
ldr r0, [r0]
- mov r3, #(L1_S_AP(AP_KRW))
+ mov r3, #(L1_S_AP_KRW)
orr r3, r3, #(L1_TYPE_S)
orr r3, r3, #(BECC_PCI_CONF_BASE)
add r0, r0, #((BRH_PCI_CONF_VBASE >> L1_S_SHIFT) * 4)
@@ -132,7 +135,7 @@
add r0, pc, #(.Ltable - . - 8) /* r0 = &l1table */
ldr r0, [r0]
- mov r3, #(L1_S_AP(AP_KRW))
+ mov r3, #(L1_S_AP_KRW)
orr r3, r3, #(L1_TYPE_S)
orr r3, r3, #(BECC_REG_BASE)
diff -r 12bf413489e1 -r 2b5d773c2592 sys/arch/evbarm/armadillo/armadillo9_start.S
--- a/sys/arch/evbarm/armadillo/armadillo9_start.S Mon Jan 31 06:26:54 2011 +0000
+++ b/sys/arch/evbarm/armadillo/armadillo9_start.S Mon Jan 31 06:28:02 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: armadillo9_start.S,v 1.4 2009/10/21 14:15:51 rmind Exp $ */
+/* $NetBSD: armadillo9_start.S,v 1.5 2011/01/31 06:28:02 matt Exp $ */
/*
* Copyright (c) 2003
@@ -26,11 +26,13 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
+#include "epcom.h"
#include <machine/asm.h>
#include <arm/armreg.h>
-#include <arm/arm32/pte.h>
-#include "epcom.h"
+#include "assym.h"
+
+RCSID("$NetBSD: armadillo9_start.S,v 1.5 2011/01/31 06:28:02 matt Exp $")
.section .start,"ax",%progbits
@@ -92,7 +94,7 @@
ldr r0, [r4] /* r0 = &l1table */
mov r1, #(L1_TABLE_SIZE / 4) /* 4096 entry */
mov r2, #(L1_S_SIZE) /* 1MB / section */
- mov r3, #(L1_S_AP(AP_KRW)) /* kernel read/write */
+ mov r3, #(L1_S_AP_KRW) /* kernel read/write */
orr r3, r3, #(L1_TYPE_S) /* L1 entry is section */
1:
str r3, [r0], #0x04
@@ -105,7 +107,7 @@
*/
ldr r0, [r4]
add r0, r0, #(0xf00 * 4) /* offset to 0xf0000000 */
- mov r3, #(L1_S_AP(AP_KRW)) /* kernel read/write */
+ mov r3, #(L1_S_AP_KRW) /* kernel read/write */
orr r3, r3, #(L1_TYPE_S) /* L1 entry is section */
orr r3, r3, #0x80000000
str r3, [r0], #4
@@ -113,7 +115,7 @@
/*
* Step 3: Map VA 0xf0100000->0xf02fffff to PA 0x80800000->0x809fffff.
*/
- mov r3, #(L1_S_AP(AP_KRW)) /* kernel read/write */
+ mov r3, #(L1_S_AP_KRW) /* kernel read/write */
orr r3, r3, #(L1_TYPE_S) /* L1 entry is section */
orr r3, r3, #0x80000000
orr r3, r3, #0x00800000
diff -r 12bf413489e1 -r 2b5d773c2592 sys/arch/evbarm/beagle/beagle_start.S
--- a/sys/arch/evbarm/beagle/beagle_start.S Mon Jan 31 06:26:54 2011 +0000
+++ b/sys/arch/evbarm/beagle/beagle_start.S Mon Jan 31 06:28:02 2011 +0000
@@ -84,16 +84,15 @@
#include "opt_omap.h"
#include "opt_com.h"
-#include "assym.h"
#include <machine/asm.h>
#include <arm/armreg.h>
-#undef DOMAIN_CLIENT /* assym.h defines as 1, but pte.h defines as 0x01 */
-#include <arm/arm32/pmap.h>
+#include "assym.h"
+
#include <arm/omap/omap2_obioreg.h>
#include <evbarm/beagle/beagle.h>
-RCSID("$NetBSD: beagle_start.S,v 1.4 2010/06/16 22:06:54 jmcneill Exp $")
+RCSID("$NetBSD: beagle_start.S,v 1.5 2011/01/31 06:28:02 matt Exp $")
#define Invalidate_I_cache(reg) \
mcr p15, 0, reg, c7, c5, 0 /* Invalidate Entire I cache */
@@ -271,22 +270,22 @@
/* Map KERNEL_BASE VA to SDRAM PA, write-back cacheable */
MMU_INIT(KERNEL_BASE, KERNEL_BASE,
(MEMSIZE * L1_S_SIZE + L1_S_SIZE - 1) / L1_S_SIZE,
- L1_S_PROTO | L1_S_AP(AP7_KRW) | L1_S_B | L1_S_C)
+ L1_S_PROTO | L1_S_APv7_KRW | L1_S_B | L1_S_C)
/* Map first 1MB of L4 CORE (so console will work) */
MMU_INIT(OMAP3530_L4_CORE_VBASE, OMAP3530_L4_CORE_BASE,
1,
- L1_S_PROTO | L1_S_AP(AP7_KRW))
+ L1_S_PROTO | L1_S_APv7_KRW)
/* Map first(all) 1MB of L4 PERIPHERAL (so console will work) */
MMU_INIT(OMAP3530_L4_PERIPHERAL_VBASE, OMAP3530_L4_PERIPHERAL_BASE,
1,
- L1_S_PROTO | L1_S_AP(AP7_KRW))
+ L1_S_PROTO | L1_S_APv7_KRW)
/* Map all 256KB of L4 WAKEUP (so console will work) */
MMU_INIT(OMAP3530_L4_WAKEUP_VBASE, OMAP3530_L4_WAKEUP_BASE,
1,
- L1_S_PROTO | L1_S_AP(AP7_KRW))
+ L1_S_PROTO | L1_S_APv7_KRW)
/* end of table */
MMU_INIT(0, 0, 0, 0)
diff -r 12bf413489e1 -r 2b5d773c2592 sys/arch/evbarm/g42xxeb/g42xxeb_start.S
--- a/sys/arch/evbarm/g42xxeb/g42xxeb_start.S Mon Jan 31 06:26:54 2011 +0000
+++ b/sys/arch/evbarm/g42xxeb/g42xxeb_start.S Mon Jan 31 06:28:02 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: g42xxeb_start.S,v 1.2 2005/12/11 12:17:08 christos Exp $ */
+/* $NetBSD: g42xxeb_start.S,v 1.3 2011/01/31 06:28:02 matt Exp $ */
/*
* Copyright (c) 2002, 2003 Genetec Corporation. All rights reserved.
@@ -31,8 +31,9 @@
#include <machine/asm.h>
#include <arm/armreg.h>
-#include <arm/arm32/pte.h>
-#include <arm/arm32/pmap.h> /* for PMAP_DOMAIN_KERNEL */
+#include "assym.h"
+
+RCSID("$NetBSD: g42xxeb_start.S,v 1.3 2011/01/31 06:28:02 matt Exp $")
#ifndef SDRAM_START
#define SDRAM_START 0xa0000000
@@ -151,12 +152,12 @@
Lstartup_pagetable .word STARTUP_PAGETABLE_ADDR
mmu_init_table:
/* fill all table VA==PA */
- MMU_INIT(0x00000000, 0x00000000, 1<<(32-L1_S_SHIFT), L1_TYPE_S|L1_S_AP(AP_KRW))
+ MMU_INIT(0x00000000, 0x00000000, 1<<(32-L1_S_SHIFT), L1_TYPE_S|L1_S_AP_KRW)
/* map SDRAM VA==PA, WT cacheable */
- MMU_INIT(SDRAM_START, SDRAM_START, 64, L1_TYPE_S|L1_S_C|L1_S_AP(AP_KRW))
+ MMU_INIT(SDRAM_START, SDRAM_START, 64, L1_TYPE_S|L1_S_C|L1_S_AP_KRW)
#endif
mmu_init_table2:
/* map VA 0xc0000000..0xc3ffffff to PA 0xa0000000..0xa3ffffff */
- MMU_INIT(0xc0000000, SDRAM_START, 64, L1_TYPE_S|L1_S_C|L1_S_AP(AP_KRW))
+ MMU_INIT(0xc0000000, SDRAM_START, 64, L1_TYPE_S|L1_S_C|L1_S_AP_KRW)
.word 0 /* end of table */
diff -r 12bf413489e1 -r 2b5d773c2592 sys/arch/evbarm/gemini/gemini_start.S
--- a/sys/arch/evbarm/gemini/gemini_start.S Mon Jan 31 06:26:54 2011 +0000
+++ b/sys/arch/evbarm/gemini/gemini_start.S Mon Jan 31 06:28:02 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: gemini_start.S,v 1.6 2009/10/21 14:15:51 rmind Exp $ */
+/* $NetBSD: gemini_start.S,v 1.7 2011/01/31 06:28:02 matt Exp $ */
/*
* Machine dependant startup code for GEMINI boards.
@@ -86,16 +86,12 @@
#include "opt_gemini.h"
#include "opt_com.h"
-#include "assym.h"
#include <machine/asm.h>
#include <arm/armreg.h>
-#undef DOMAIN_CLIENT /* assym.h defines as 1, but pte.h defines as 0x01 */
-#include <arm/arm32/pmap.h>
-#include <arm/gemini/gemini_reg.h>
-#include <evbarm/gemini/gemini.h>
+#include "assym.h"
-RCSID("$NetBSD: gemini_start.S,v 1.6 2009/10/21 14:15:51 rmind Exp $")
+RCSID("$NetBSD: gemini_start.S,v 1.7 2011/01/31 06:28:02 matt Exp $")
#if defined(VERBOSE_INIT_ARM)
@@ -363,37 +359,37 @@
/* Maintain current 1:1 addressability */
MMU_INIT(KERNEL_BASE_phys, KERNEL_BASE_phys,
(MEMSIZE * L1_S_SIZE + L1_S_SIZE - 1) / L1_S_SIZE,
- L1_S_PROTO | L1_S_AP(AP_KRW) | L1_S_B | L1_S_C)
+ L1_S_PROTO | L1_S_AP_KRW | L1_S_B | L1_S_C)
/* Map Kernel base VA:PA, write-back cacheable */
MMU_INIT(KERNEL_BASE_virt, KERNEL_BASE_phys,
(MEMSIZE * L1_S_SIZE + L1_S_SIZE - 1) / L1_S_SIZE,
- L1_S_PROTO | L1_S_AP(AP_KRW) | L1_S_B | L1_S_C)
+ L1_S_PROTO | L1_S_AP_KRW | L1_S_B | L1_S_C)
/* Map Gemini GLOBAL regs */
MMU_INIT(GEMINI_GLOBAL_VBASE, GEMINI_GLOBAL_BASE,
1,
- L1_S_PROTO | L1_S_AP(AP_KRW))
+ L1_S_PROTO | L1_S_AP_KRW)
/* Map Gemini UART */
MMU_INIT(GEMINI_UART_VBASE, GEMINI_UART_BASE,
1,
- L1_S_PROTO | L1_S_AP(AP_KRW))
+ L1_S_PROTO | L1_S_AP_KRW)
/* Map Gemini LPC Host Controlr Space */
MMU_INIT(GEMINI_LPCHC_VBASE, GEMINI_LPCHC_BASE,
1,
- L1_S_PROTO | L1_S_AP(AP_KRW))
+ L1_S_PROTO | L1_S_AP_KRW)
/* Map Gemini LPC IO Space */
MMU_INIT(GEMINI_LPCIO_VBASE, GEMINI_LPCIO_BASE,
1,
- L1_S_PROTO | L1_S_AP(AP_KRW))
+ L1_S_PROTO | L1_S_AP_KRW)
/* Map Gemini DRAM Controller Space */
MMU_INIT(GEMINI_DRAMC_VBASE, GEMINI_DRAMC_BASE,
1,
- L1_S_PROTO | L1_S_AP(AP_KRW))
+ L1_S_PROTO | L1_S_AP_KRW)
/* end of table */
MMU_INIT(0, 0, 0, 0)
diff -r 12bf413489e1 -r 2b5d773c2592 sys/arch/evbarm/gumstix/gumstix_start.S
--- a/sys/arch/evbarm/gumstix/gumstix_start.S Mon Jan 31 06:26:54 2011 +0000
+++ b/sys/arch/evbarm/gumstix/gumstix_start.S Mon Jan 31 06:28:02 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: gumstix_start.S,v 1.8 2010/08/28 04:12:40 kiyohara Exp $ */
+/* $NetBSD: gumstix_start.S,v 1.9 2011/01/31 06:28:03 matt Exp $ */
/*
* Copyright (C) 2005, 2006 WIDE Project and SOUM Corporation.
* All rights reserved.
@@ -63,10 +63,10 @@
#include "opt_gumstix.h"
#include <machine/asm.h>
-#include <machine/vmparam.h>
#include <arm/armreg.h>
-#include <arm/arm32/pte.h>
-#include <arm/arm32/pmap.h> /* for PMAP_DOMAIN_KERNEL */
+#include "assym.h"
+
+RCSID("$NetBSD: gumstix_start.S,v 1.9 2011/01/31 06:28:03 matt Exp $")
/*
* CPWAIT -- Canonical method to wait for CP15 update.
@@ -238,31 +238,31 @@
#define MMU_INIT(va, pa, n_sec, attr) \
.word n_sec ; \
- .word 4 * ((va) >> L1_S_SHIFT); \
+ .word (va) >> (L1_S_SHIFT-2) ; \
.word (pa) | (attr) ;
mmu_init_table:
/* fill all table VA==PA */
Home |
Main Index |
Thread Index |
Old Index