Module Name: src Committed By: matt Date: Mon Jan 31 06:28:06 UTC 2011
Modified Files: src/sys/arch/evbarm/adi_brh: brh_start.S src/sys/arch/evbarm/armadillo: armadillo9_start.S src/sys/arch/evbarm/beagle: beagle_start.S src/sys/arch/evbarm/g42xxeb: g42xxeb_start.S src/sys/arch/evbarm/gemini: gemini_start.S src/sys/arch/evbarm/gumstix: gumstix_start.S src/sys/arch/evbarm/hdl_g: hdlg_start.S src/sys/arch/evbarm/imx31: imx31lk_start.S src/sys/arch/evbarm/integrator: intmmu.S src/sys/arch/evbarm/iq80310: iq80310_start.S src/sys/arch/evbarm/iq80321: iq80321_start.S src/sys/arch/evbarm/ixdp425: ixdp425_start.S src/sys/arch/evbarm/ixm1200: ixm1200_start.S src/sys/arch/evbarm/lubbock: lubbock_start.S src/sys/arch/evbarm/marvell: marvell_start.S src/sys/arch/evbarm/mpcsa: mpcsa_start.S src/sys/arch/evbarm/netwalker: netwalker_start.S src/sys/arch/evbarm/nslu2: nslu2_start.S src/sys/arch/evbarm/smdk2xx0: smdk2410_start.S smdk2800_start.S src/sys/arch/evbarm/tisdp24xx: sdp24xx_start.S src/sys/arch/evbarm/tsarm: tsarm_start.S src/sys/arch/evbarm/viper: viper_start.S Log Message: Add RCSID when needed. Don't include pmap.h or pte.h, include "assym.h" instead. Use assym.h provided values. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/adi_brh/brh_start.S cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/armadillo/armadillo9_start.S cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/beagle/beagle_start.S cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/g42xxeb/g42xxeb_start.S cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/gemini/gemini_start.S cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/gumstix/gumstix_start.S cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/hdl_g/hdlg_start.S cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/imx31/imx31lk_start.S cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/integrator/intmmu.S cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/iq80310/iq80310_start.S cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/iq80321/iq80321_start.S cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/ixdp425/ixdp425_start.S cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/ixm1200/ixm1200_start.S cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/lubbock/lubbock_start.S cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/marvell/marvell_start.S cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/mpcsa/mpcsa_start.S cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/netwalker/netwalker_start.S cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/nslu2/nslu2_start.S cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/smdk2xx0/smdk2410_start.S cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/smdk2xx0/smdk2800_start.S cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/tisdp24xx/sdp24xx_start.S cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/tsarm/tsarm_start.S cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/viper/viper_start.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/evbarm/adi_brh/brh_start.S diff -u src/sys/arch/evbarm/adi_brh/brh_start.S:1.1 src/sys/arch/evbarm/adi_brh/brh_start.S:1.2 --- src/sys/arch/evbarm/adi_brh/brh_start.S:1.1 Sat Jan 25 02:00:17 2003 +++ src/sys/arch/evbarm/adi_brh/brh_start.S Mon Jan 31 06:28:02 2011 @@ -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) Index: src/sys/arch/evbarm/armadillo/armadillo9_start.S diff -u src/sys/arch/evbarm/armadillo/armadillo9_start.S:1.4 src/sys/arch/evbarm/armadillo/armadillo9_start.S:1.5 --- src/sys/arch/evbarm/armadillo/armadillo9_start.S:1.4 Wed Oct 21 14:15:51 2009 +++ src/sys/arch/evbarm/armadillo/armadillo9_start.S Mon Jan 31 06:28:02 2011 @@ -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 Index: src/sys/arch/evbarm/beagle/beagle_start.S diff -u src/sys/arch/evbarm/beagle/beagle_start.S:1.4 src/sys/arch/evbarm/beagle/beagle_start.S:1.5 --- src/sys/arch/evbarm/beagle/beagle_start.S:1.4 Wed Jun 16 22:06:54 2010 +++ src/sys/arch/evbarm/beagle/beagle_start.S Mon Jan 31 06:28:02 2011 @@ -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) Index: src/sys/arch/evbarm/g42xxeb/g42xxeb_start.S diff -u src/sys/arch/evbarm/g42xxeb/g42xxeb_start.S:1.2 src/sys/arch/evbarm/g42xxeb/g42xxeb_start.S:1.3 --- src/sys/arch/evbarm/g42xxeb/g42xxeb_start.S:1.2 Sun Dec 11 12:17:08 2005 +++ src/sys/arch/evbarm/g42xxeb/g42xxeb_start.S Mon Jan 31 06:28:02 2011 @@ -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 */ Index: src/sys/arch/evbarm/gemini/gemini_start.S diff -u src/sys/arch/evbarm/gemini/gemini_start.S:1.6 src/sys/arch/evbarm/gemini/gemini_start.S:1.7 --- src/sys/arch/evbarm/gemini/gemini_start.S:1.6 Wed Oct 21 14:15:51 2009 +++ src/sys/arch/evbarm/gemini/gemini_start.S Mon Jan 31 06:28:02 2011 @@ -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) Index: src/sys/arch/evbarm/gumstix/gumstix_start.S diff -u src/sys/arch/evbarm/gumstix/gumstix_start.S:1.8 src/sys/arch/evbarm/gumstix/gumstix_start.S:1.9 --- src/sys/arch/evbarm/gumstix/gumstix_start.S:1.8 Sat Aug 28 04:12:40 2010 +++ src/sys/arch/evbarm/gumstix/gumstix_start.S Mon Jan 31 06:28:03 2011 @@ -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 */ MMU_INIT(0x00000000, 0x00000000, - 1 << (32 - L1_S_SHIFT), L1_S_PROTO | L1_S_AP(AP_KRW)) + 1 << (32 - L1_S_SHIFT), L1_S_PROTO | L1_S_AP_KRW) #if defined(GUMSTIX) #define SDRAM_START 0xa0000000 /* map SDRAM VA==PA, write-back cacheable (first 64M only)*/ MMU_INIT(SDRAM_START, SDRAM_START, - 64, L1_S_PROTO | L1_S_C | L1_S_AP(AP_KRW)) + 64, L1_S_PROTO | L1_S_C | L1_S_AP_KRW) /* map VA 0xc0000000..0xc3ffffff to PA 0xa0000000..0xa3ffffff */ MMU_INIT(0xc0000000, SDRAM_START, - 64, L1_S_PROTO | L1_S_C | L1_S_AP(AP_KRW)) + 64, L1_S_PROTO | L1_S_C | L1_S_AP_KRW) #elif defined(OVERO) #define SDRAM_START 0x80000000 /* Map VA to PA, write-back cacheable (first 64M only) */ MMU_INIT(KERNEL_BASE, SDRAM_START, - 64, L1_S_PROTO | L1_S_B | L1_S_C | L1_S_AP(AP_KRW)) + 64, L1_S_PROTO | L1_S_B | L1_S_C | L1_S_APv7_KRW) #endif MMU_INIT(0, 0, 0, 0) /* end of table */ Index: src/sys/arch/evbarm/hdl_g/hdlg_start.S diff -u src/sys/arch/evbarm/hdl_g/hdlg_start.S:1.1 src/sys/arch/evbarm/hdl_g/hdlg_start.S:1.2 --- src/sys/arch/evbarm/hdl_g/hdlg_start.S:1.1 Sun Apr 16 02:22:33 2006 +++ src/sys/arch/evbarm/hdl_g/hdlg_start.S Mon Jan 31 06:28:03 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: hdlg_start.S,v 1.1 2006/04/16 02:22:33 nonaka Exp $ */ +/* $NetBSD: hdlg_start.S,v 1.2 2011/01/31 06:28:03 matt Exp $ */ /* * Copyright (c) 2002 Wasabi Systems, Inc. @@ -37,7 +37,9 @@ #include <machine/asm.h> #include <arm/armreg.h> -#include <arm/arm32/pte.h> +#include "assym.h" + +RCSID("$NetBSD: hdlg_start.S,v 1.2 2011/01/31 06:28:03 matt Exp $") .section .start,"ax",%progbits @@ -130,7 +132,7 @@ adr r0, Ltable 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 */ @@ -146,7 +148,7 @@ adr r0, Ltable /* 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, #0xa0000000 add r0, r0, #(0xc00 * 4) /* offset to 0xc00xxxxx */ Index: src/sys/arch/evbarm/imx31/imx31lk_start.S diff -u src/sys/arch/evbarm/imx31/imx31lk_start.S:1.3 src/sys/arch/evbarm/imx31/imx31lk_start.S:1.4 --- src/sys/arch/evbarm/imx31/imx31lk_start.S:1.3 Thu Nov 5 16:28:09 2009 +++ src/sys/arch/evbarm/imx31/imx31lk_start.S Mon Jan 31 06:28:03 2011 @@ -1,10 +1,38 @@ -/* $NetBSD: imx31lk_start.S,v 1.3 2009/11/05 16:28:09 uebayasi Exp $ */ +/* $NetBSD: imx31lk_start.S,v 1.4 2011/01/31 06:28:03 matt Exp $ */ +/*- + * Copyright (c) 2011 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Matt Thomas of 3am Software Foundry. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ #include <machine/asm.h> #include <arm/armreg.h> -#include <arm/arm32/pmap.h> -#include <arm/arm32/pte.h> +#include "assym.h" +RCSID("$NetBSD: imx31lk_start.S,v 1.4 2011/01/31 06:28:03 matt Exp $") /* */ @@ -51,9 +79,9 @@ add r0, r0, #(0x800 * 4) /* offset to 0x80000000 */ mov r3, #SDRAM_START /* map to 0x800.. */ - orr r3, r3, #(L1_S_AP(AP_KRW)) /* the usual perms & stuff */ + orr r3, r3, #(L1_S_AP_KRW) /* the usual perms & stuff */ orr r3, r3, #(L1_TYPE_S) - orr r3, r3, #(L1_S_DOM(PMAP_DOMAIN_KERNEL)) + orr r3, r3, #(L1_S_DOM_KERNEL) mov r1, #0x80 /* 128 1MB entries */ 1: @@ -72,9 +100,9 @@ mov r3, #0x43000000 orr r3, r3, #0x00f00000 - orr r3, r3, #(L1_S_AP(AP_KRW)) + orr r3, r3, #(L1_S_AP_KRW) orr r3, r3, #(L1_TYPE_S) - orr r3, r3, #(L1_S_DOM(PMAP_DOMAIN_KERNEL)) + orr r3, r3, #(L1_S_DOM_KERNEL) str r3, [r0], #4 /* note autoinc */ /* etc, TBD... */ Index: src/sys/arch/evbarm/integrator/intmmu.S diff -u src/sys/arch/evbarm/integrator/intmmu.S:1.10 src/sys/arch/evbarm/integrator/intmmu.S:1.11 --- src/sys/arch/evbarm/integrator/intmmu.S:1.10 Sun Dec 11 12:17:09 2005 +++ src/sys/arch/evbarm/integrator/intmmu.S Mon Jan 31 06:28:03 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: intmmu.S,v 1.10 2005/12/11 12:17:09 christos Exp $ */ +/* $NetBSD: intmmu.S,v 1.11 2011/01/31 06:28:03 matt Exp $ */ /* * Copyright (c) 2001 ARM Ltd @@ -29,10 +29,9 @@ * SUCH DAMAGE. */ -#include "assym.h" #include <machine/asm.h> #include <arm/armreg.h> -#include <arm/arm32/pte.h> +#include "assym.h" .section .start,"ax",%progbits @@ -73,7 +72,7 @@ /* * Set Virtual == Physical */ - mov r3, #(L1_S_AP(AP_KRW)) + mov r3, #(L1_S_AP_KRW) add r3, r3, #(L1_TYPE_S) mov r2, #0x100000 /* advance by 1MB */ mov r1, #0x8000 /* page table start */ @@ -88,7 +87,7 @@ /* * Map VA 0xc0000000->0xc03fffff to PA 0x00000000->0x003fffff */ - mov r3, #(L1_S_AP(AP_KRW)) + mov r3, #(L1_S_AP_KRW) add r3, r3, #(L1_TYPE_S) mov r1, #0x8000 /* page table start */ add r1, r1, #(0xc00 * 4) /* offset to 0xc00xxxxx */ @@ -106,7 +105,7 @@ * region VA 0xfd000000->0xfdffffff; this should map enough of the peripheral * space to at least get us up and running. */ - mov r3, #(L1_S_AP(AP_KRW)) + mov r3, #(L1_S_AP_KRW) add r3, r3, #L1_TYPE_S add r3, r3, #0x10000000 /* Peripherals base */ mov r1, #0x8000 /* page table start */ Index: src/sys/arch/evbarm/iq80310/iq80310_start.S diff -u src/sys/arch/evbarm/iq80310/iq80310_start.S:1.4 src/sys/arch/evbarm/iq80310/iq80310_start.S:1.5 --- src/sys/arch/evbarm/iq80310/iq80310_start.S:1.4 Mon Oct 14 22:32:53 2002 +++ src/sys/arch/evbarm/iq80310/iq80310_start.S Mon Jan 31 06:28:03 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: iq80310_start.S,v 1.4 2002/10/14 22:32:53 bjh21 Exp $ */ +/* $NetBSD: iq80310_start.S,v 1.5 2011/01/31 06:28:03 matt Exp $ */ /* * Copyright (c) 2002 Wasabi Systems, Inc. @@ -37,7 +37,9 @@ #include <machine/asm.h> #include <arm/armreg.h> -#include <arm/arm32/pte.h> +#include "assym.h" + +RCSID("$NetBSD: iq80310_start.S,v 1.5 2011/01/31 06:28:03 matt Exp $") .section .start,"ax",%progbits @@ -78,7 +80,7 @@ adr r0, Ltable 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 */ @@ -94,7 +96,7 @@ adr r0, Ltable /* 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, #0xa0000000 add r0, r0, #(0xc00 * 4) /* offset to 0xc00xxxxx */ Index: src/sys/arch/evbarm/iq80321/iq80321_start.S diff -u src/sys/arch/evbarm/iq80321/iq80321_start.S:1.4 src/sys/arch/evbarm/iq80321/iq80321_start.S:1.5 --- src/sys/arch/evbarm/iq80321/iq80321_start.S:1.4 Mon Oct 14 22:32:54 2002 +++ src/sys/arch/evbarm/iq80321/iq80321_start.S Mon Jan 31 06:28:03 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: iq80321_start.S,v 1.4 2002/10/14 22:32:54 bjh21 Exp $ */ +/* $NetBSD: iq80321_start.S,v 1.5 2011/01/31 06:28:03 matt Exp $ */ /* * Copyright (c) 2002 Wasabi Systems, Inc. @@ -37,7 +37,9 @@ #include <machine/asm.h> #include <arm/armreg.h> -#include <arm/arm32/pte.h> +#include "assym.h" + +RCSID("$NetBSD: iq80321_start.S,v 1.5 2011/01/31 06:28:03 matt Exp $") .section .start,"ax",%progbits @@ -87,7 +89,7 @@ adr r0, Ltable 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 */ @@ -103,7 +105,7 @@ adr r0, Ltable /* 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, #0xa0000000 add r0, r0, #(0xc00 * 4) /* offset to 0xc00xxxxx */ Index: src/sys/arch/evbarm/ixdp425/ixdp425_start.S diff -u src/sys/arch/evbarm/ixdp425/ixdp425_start.S:1.6 src/sys/arch/evbarm/ixdp425/ixdp425_start.S:1.7 --- src/sys/arch/evbarm/ixdp425/ixdp425_start.S:1.6 Wed Oct 21 14:15:51 2009 +++ src/sys/arch/evbarm/ixdp425/ixdp425_start.S Mon Jan 31 06:28:04 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ixdp425_start.S,v 1.6 2009/10/21 14:15:51 rmind Exp $ */ +/* $NetBSD: ixdp425_start.S,v 1.7 2011/01/31 06:28:04 matt Exp $ */ /* * Copyright (c) 2003 @@ -28,10 +28,12 @@ */ #include <machine/asm.h> #include <arm/armreg.h> -#include <arm/arm32/pte.h> +#include "assym.h" #include <arm/xscale/ixp425reg.h> +RCSID("$NetBSD: ixdp425_start.S,v 1.7 2011/01/31 06:28:04 matt Exp $") + .section .start,"ax",%progbits .global _C_LABEL(ixdp425_start) @@ -80,7 +82,7 @@ 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 @@ -94,7 +96,7 @@ adr r0, Ltable /* 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, #0x10000000 add r0, r0, #(0xc00 * 4) /* offset to 0xc00xxxxx */ @@ -114,7 +116,7 @@ add r0, r0, #(0xf00 * 4) /* offset to 0xf0000000 */ mov r3, #0xc8000000 add r3, r3, #0x00100000 - orr r3, r3, #(L1_S_AP(AP_KRW)) + orr r3, r3, #(L1_S_AP_KRW) orr r3, r3, #(L1_TYPE_S) str r3, [r0] @@ -128,7 +130,7 @@ add r0, r0, #(0x002 * 4) mov r3, #0xcc000000 add r3, r3, #0x00100000 - orr r3, r3, #(L1_S_AP(AP_KRW)) + orr r3, r3, #(L1_S_AP_KRW) orr r3, r3, #(L1_TYPE_S) str r3, [r0] Index: src/sys/arch/evbarm/ixm1200/ixm1200_start.S diff -u src/sys/arch/evbarm/ixm1200/ixm1200_start.S:1.3 src/sys/arch/evbarm/ixm1200/ixm1200_start.S:1.4 --- src/sys/arch/evbarm/ixm1200/ixm1200_start.S:1.3 Mon Apr 28 20:23:17 2008 +++ src/sys/arch/evbarm/ixm1200/ixm1200_start.S Mon Jan 31 06:28:04 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ixm1200_start.S,v 1.3 2008/04/28 20:23:17 martin Exp $ */ +/* $NetBSD: ixm1200_start.S,v 1.4 2011/01/31 06:28:04 matt Exp $ */ /* * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -32,14 +32,15 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "assym.h" #include <arm/asm.h> #include <arm/armreg.h> -#include <arm/arm32/pte.h> +#include "assym.h" .section .start,"ax",%progbits +RCSID("$NetBSD: ixm1200_start.S,v 1.4 2011/01/31 06:28:04 matt Exp $") + .global _C_LABEL(ixm1200_start) _C_LABEL(ixm1200_start): /* @@ -128,7 +129,7 @@ ldr r0, Ltable 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], #4 @@ -143,7 +144,7 @@ add r0, r0, #(0xf00 * 4) /* offset to 0xf0000000 */ mov r3, #0x90000000 add r3, r3, #0x00100000 /* set 0x90100000 to r3 */ - orr r3, r3, #(L1_S_AP(AP_KRW)) /* kernel read/write */ + orr r3, r3, #(L1_S_AP_KRW) /* kernel read/write */ orr r3, r3, #(L1_TYPE_S) /* L1 entry is section */ str r3, [r0] Index: src/sys/arch/evbarm/lubbock/lubbock_start.S diff -u src/sys/arch/evbarm/lubbock/lubbock_start.S:1.2 src/sys/arch/evbarm/lubbock/lubbock_start.S:1.3 --- src/sys/arch/evbarm/lubbock/lubbock_start.S:1.2 Mon Mar 10 16:48:13 2008 +++ src/sys/arch/evbarm/lubbock/lubbock_start.S Mon Jan 31 06:28:04 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: lubbock_start.S,v 1.2 2008/03/10 16:48:13 rafal Exp $ */ +/* $NetBSD: lubbock_start.S,v 1.3 2011/01/31 06:28:04 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: lubbock_start.S,v 1.3 2011/01/31 06:28:04 matt Exp $") #ifndef SDRAM_START #define SDRAM_START 0xa0000000 @@ -152,12 +153,12 @@ .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 */ Index: src/sys/arch/evbarm/marvell/marvell_start.S diff -u src/sys/arch/evbarm/marvell/marvell_start.S:1.1 src/sys/arch/evbarm/marvell/marvell_start.S:1.2 --- src/sys/arch/evbarm/marvell/marvell_start.S:1.1 Sun Oct 3 06:03:10 2010 +++ src/sys/arch/evbarm/marvell/marvell_start.S Mon Jan 31 06:28:04 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: marvell_start.S,v 1.1 2010/10/03 06:03:10 kiyohara Exp $ */ +/* $NetBSD: marvell_start.S,v 1.2 2011/01/31 06:28:04 matt Exp $ */ /* * Copyright (C) 2005, 2006 WIDE Project and SOUM Corporation. * All rights reserved. @@ -62,8 +62,9 @@ #include "opt_cputypes.h" #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: marvell_start.S,v 1.2 2011/01/31 06:28:04 matt Exp $") #ifndef SDRAM_START #define SDRAM_START 0x00000000 @@ -193,14 +194,14 @@ 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)) + 1 << (32 - L1_S_SHIFT), L1_TYPE_S | L1_S_AP_KRW) /* map SDRAM VA==PA, WT cacheable */ MMU_INIT(SDRAM_START, SDRAM_START, - 128, L1_TYPE_S | L1_S_C | L1_S_AP(AP_KRW)) + 128, L1_TYPE_S | L1_S_C | L1_S_AP_KRW) /* map VA 0xc0000000..0xc7ffffff to PA 0x00000000..0x07ffffff */ MMU_INIT(0xc0000000, SDRAM_START, - 128, L1_TYPE_S | L1_S_C | L1_S_AP(AP_KRW)) + 128, L1_TYPE_S | L1_S_C | L1_S_AP_KRW) .word 0 /* end of table */ Index: src/sys/arch/evbarm/mpcsa/mpcsa_start.S diff -u src/sys/arch/evbarm/mpcsa/mpcsa_start.S:1.2 src/sys/arch/evbarm/mpcsa/mpcsa_start.S:1.3 --- src/sys/arch/evbarm/mpcsa/mpcsa_start.S:1.2 Thu Jul 3 01:15:39 2008 +++ src/sys/arch/evbarm/mpcsa/mpcsa_start.S Mon Jan 31 06:28:04 2011 @@ -37,8 +37,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: mpcsa_start.S,v 1.3 2011/01/31 06:28:04 matt Exp $") #ifndef FLASH_START #define FLASH_START 0x10020000 @@ -157,13 +158,13 @@ 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 in peripheral space */ - MMU_INIT(0xfff00000, 0xfff00000, 1, L1_TYPE_S|L1_S_AP(AP_KRW)) + MMU_INIT(0xfff00000, 0xfff00000, 1, L1_TYPE_S|L1_S_AP_KRW) /* map SDRAM VA==PA, WT cacheable */ - MMU_INIT(0x20100000, 0x20100000, 63, L1_TYPE_S|L1_S_C|L1_S_AP(AP_KRW)) + MMU_INIT(0x20100000, 0x20100000, 63, L1_TYPE_S|L1_S_C|L1_S_AP_KRW) /* map VA 0xc0000000..0xc0efffff to PA 0x20100000..0x23ffffff */ - MMU_INIT(0xc0000000, 0x20000000, 63, L1_TYPE_S|L1_S_C|L1_S_AP(AP_KRW)) + MMU_INIT(0xc0000000, 0x20000000, 63, L1_TYPE_S|L1_S_C|L1_S_AP_KRW) .word 0 /* end of table */ .align 7 Index: src/sys/arch/evbarm/netwalker/netwalker_start.S diff -u src/sys/arch/evbarm/netwalker/netwalker_start.S:1.1 src/sys/arch/evbarm/netwalker/netwalker_start.S:1.2 --- src/sys/arch/evbarm/netwalker/netwalker_start.S:1.1 Sat Nov 13 07:31:32 2010 +++ src/sys/arch/evbarm/netwalker/netwalker_start.S Mon Jan 31 06:28:05 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: netwalker_start.S,v 1.1 2010/11/13 07:31:32 bsh Exp $ */ +/* $NetBSD: netwalker_start.S,v 1.2 2011/01/31 06:28:05 matt Exp $ */ /*- * Copyright (c) 2009 SHIMIZU Ryo <r...@nerv.org> @@ -54,17 +54,16 @@ #include "opt_imx.h" #include "opt_com.h" -#include "assym.h" #include <machine/asm.h> #include <arm/armreg.h> -#include <arm/arm32/pmap.h> -#include <arm/arm32/pte.h> +#include "assym.h" + #include <arm/imx/imx51reg.h> #include <arm/imx/imxuartreg.h> #include <evbarm/netwalker/netwalker_reg.h> -RCSID("$NetBSD: netwalker_start.S,v 1.1 2010/11/13 07:31:32 bsh Exp $") +RCSID("$NetBSD: netwalker_start.S,v 1.2 2011/01/31 06:28:05 matt Exp $") #if 0 #define CPWAIT_BRANCH \ @@ -282,21 +281,21 @@ /* fill all table VA==PA */ MMU_INIT(0x00000000, 0x00000000, 1 << (32 - L1_S_SHIFT), - L1_S_PROTO_armv7 | L1_S_AP(AP7_KRW)) + L1_S_PROTO | L1_S_APv7_KRW) /* Map KERNEL_BASE VA to SDRAM PA, write-back cacheable */ MMU_INIT(SDRAM_START, SDRAM_START, 512, - L1_S_PROTO_armv7 | 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 VA 0xc0000000..0xdfffffff to PA 0x90000000..0xafffffff */ MMU_INIT(0xc0000000, SDRAM_START, - 512, L1_S_PROTO_armv7 | L1_S_AP(AP7_KRW) | L1_S_B | L1_S_C) + 512, L1_S_PROTO | L1_S_APv7_KRW | L1_S_B | L1_S_C) /* Map all 256KB of L4 WAKEUP (so console will work) */ MMU_INIT(NETWALKER_IO_VBASE0, NETWALKER_IO_PBASE0, 4, - L1_S_PROTO_armv7 | L1_S_AP(AP7_KRW)) + L1_S_PROTO | L1_S_APv7_KRW) /* end of table */ MMU_INIT(0, 0, 0, 0) Index: src/sys/arch/evbarm/nslu2/nslu2_start.S diff -u src/sys/arch/evbarm/nslu2/nslu2_start.S:1.2 src/sys/arch/evbarm/nslu2/nslu2_start.S:1.3 --- src/sys/arch/evbarm/nslu2/nslu2_start.S:1.2 Mon Apr 28 20:23:17 2008 +++ src/sys/arch/evbarm/nslu2/nslu2_start.S Mon Jan 31 06:28:05 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: nslu2_start.S,v 1.2 2008/04/28 20:23:17 martin Exp $ */ +/* $NetBSD: nslu2_start.S,v 1.3 2011/01/31 06:28:05 matt Exp $ */ /* * Copyright (c) 2006 The NetBSD Foundation, Inc. @@ -31,10 +31,12 @@ #include <machine/asm.h> #include <arm/armreg.h> -#include <arm/arm32/pte.h> +#include "assym.h" #include <arm/xscale/ixp425reg.h> +RCSID("$NetBSD: nslu2_start.S,v 1.3 2011/01/31 06:28:05 matt Exp $") + .section .start,"ax",%progbits .global _C_LABEL(nslu2_start) @@ -76,7 +78,7 @@ 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 @@ -90,7 +92,7 @@ adr r0, Ltable /* 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, #0x10000000 add r0, r0, #(0xc00 * 4) /* offset to 0xc00xxxxx */ @@ -110,7 +112,7 @@ add r0, r0, #(0xf00 * 4) /* offset to 0xf0000000 */ mov r3, #0xc8000000 add r3, r3, #0x00100000 - orr r3, r3, #(L1_S_AP(AP_KRW)) + orr r3, r3, #(L1_S_AP_KRW) orr r3, r3, #(L1_TYPE_S) str r3, [r0] @@ -124,7 +126,7 @@ add r0, r0, #(0x002 * 4) mov r3, #0xcc000000 add r3, r3, #0x00100000 - orr r3, r3, #(L1_S_AP(AP_KRW)) + orr r3, r3, #(L1_S_AP_KRW) orr r3, r3, #(L1_TYPE_S) str r3, [r0] Index: src/sys/arch/evbarm/smdk2xx0/smdk2410_start.S diff -u src/sys/arch/evbarm/smdk2xx0/smdk2410_start.S:1.5 src/sys/arch/evbarm/smdk2xx0/smdk2410_start.S:1.6 --- src/sys/arch/evbarm/smdk2xx0/smdk2410_start.S:1.5 Sun Dec 11 12:17:09 2005 +++ src/sys/arch/evbarm/smdk2xx0/smdk2410_start.S Mon Jan 31 06:28:05 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: smdk2410_start.S,v 1.5 2005/12/11 12:17:09 christos Exp $ */ +/* $NetBSD: smdk2410_start.S,v 1.6 2011/01/31 06:28:05 matt Exp $ */ /* * Copyright (c) 2002, 2003 Fujitsu Component Limited @@ -32,13 +32,15 @@ * SUCH DAMAGE. */ +#include "opt_smdk2xx0.h" /* SMDK2XX0_CLOCK_CONFIG */ + #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" #include <arm/s3c2xx0/s3c2410reg.h> /* for S3C2410_SDRAM_START */ -#include "opt_smdk2xx0.h" /* SMDK2XX0_CLOCK_CONFIG */ + +RCSID("$NetBSD: smdk2410_start.S,v 1.6 2011/01/31 06:28:05 matt Exp $") /* * Kernel start routine for Samsung SMDK2410. @@ -189,11 +191,11 @@ 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) /* map VA 0xc0000000..0xc3ffffff to PA 0x30000000..0x33ffffff */ - 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 */ Index: src/sys/arch/evbarm/smdk2xx0/smdk2800_start.S diff -u src/sys/arch/evbarm/smdk2xx0/smdk2800_start.S:1.7 src/sys/arch/evbarm/smdk2xx0/smdk2800_start.S:1.8 --- src/sys/arch/evbarm/smdk2xx0/smdk2800_start.S:1.7 Sun Dec 11 12:17:09 2005 +++ src/sys/arch/evbarm/smdk2xx0/smdk2800_start.S Mon Jan 31 06:28:05 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: smdk2800_start.S,v 1.7 2005/12/11 12:17:09 christos Exp $ */ +/* $NetBSD: smdk2800_start.S,v 1.8 2011/01/31 06:28:05 matt Exp $ */ /* * Copyright (c) 2002, 2005 Fujitsu Component Limited @@ -34,13 +34,14 @@ #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" #include <arm/s3c2xx0/s3c2800reg.h> /* for S3C2800_DBANK0_START */ #include <evbarm/smdk2xx0/smdk2800var.h> +RCSID("$NetBSD: smdk2800_start.S,v 1.8 2011/01/31 06:28:05 matt Exp $") + /* * Kernel start routine for Samsung SMDK2800. * This code is excuted at the very first after the kernel is loaded @@ -153,13 +154,13 @@ 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) /* map VA 0xc0000000..0xc3ffffff to PA 0x08000000..0x0bffffff */ - 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) /* Map all built-in peripheral registers at 0xfd000000 */ - MMU_INIT(SMDK2800_IO_AREA_VBASE, S3C2800_PERIPHERALS, 2, L1_TYPE_S|L1_S_AP(AP_KRW)) + MMU_INIT(SMDK2800_IO_AREA_VBASE, S3C2800_PERIPHERALS, 2, L1_TYPE_S|L1_S_AP_KRW) .word 0 /* end of table */ Index: src/sys/arch/evbarm/tisdp24xx/sdp24xx_start.S diff -u src/sys/arch/evbarm/tisdp24xx/sdp24xx_start.S:1.4 src/sys/arch/evbarm/tisdp24xx/sdp24xx_start.S:1.5 --- src/sys/arch/evbarm/tisdp24xx/sdp24xx_start.S:1.4 Wed Oct 21 14:15:51 2009 +++ src/sys/arch/evbarm/tisdp24xx/sdp24xx_start.S Mon Jan 31 06:28:05 2011 @@ -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/tisdp24xx/sdp24xx.h> -RCSID("$NetBSD: sdp24xx_start.S,v 1.4 2009/10/21 14:15:51 rmind Exp $") +RCSID("$NetBSD: sdp24xx_start.S,v 1.5 2011/01/31 06:28:05 matt Exp $") #if 0 #define Invalidate_I_cache(reg) \ @@ -315,17 +314,17 @@ /* 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(AP_KRW) | L1_S_B | L1_S_C) + L1_S_PROTO | L1_S_AP_KRW | L1_S_B | L1_S_C) /* Map first 1MB of L4 CORE (so console will work) */ MMU_INIT(OMAP2430_L4_CORE_VBASE, OMAP2430_L4_CORE_BASE, 1, - L1_S_PROTO | L1_S_AP(AP_KRW)) + L1_S_PROTO | L1_S_AP_KRW) /* Map first 1MB of L4 WAKEUP (so console will work) */ MMU_INIT(OMAP2430_L4_WAKEUP_VBASE, OMAP2430_L4_WAKEUP_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) Index: src/sys/arch/evbarm/tsarm/tsarm_start.S diff -u src/sys/arch/evbarm/tsarm/tsarm_start.S:1.6 src/sys/arch/evbarm/tsarm/tsarm_start.S:1.7 --- src/sys/arch/evbarm/tsarm/tsarm_start.S:1.6 Wed Oct 21 14:15:51 2009 +++ src/sys/arch/evbarm/tsarm/tsarm_start.S Mon Jan 31 06:28:05 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: tsarm_start.S,v 1.6 2009/10/21 14:15:51 rmind Exp $ */ +/* $NetBSD: tsarm_start.S,v 1.7 2011/01/31 06:28:05 matt Exp $ */ /* * Copyright (c) 2003 @@ -26,12 +26,15 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ + #include <machine/asm.h> #include <arm/armreg.h> -#include <arm/arm32/pte.h> +#include "assym.h" #include <arm/ep93xx/ep93xxreg.h> +RCSID("$NetBSD: tsarm_start.S,v 1.7 2011/01/31 06:28:05 matt Exp $") + .section .start,"ax",%progbits .global _C_LABEL(ts7xxx_start) @@ -74,7 +77,7 @@ 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 @@ -90,7 +93,7 @@ add r0, r0, #(0xc00 * 4) /* offset to 0xc00xxxxx */ mov r1, #0x8 /* 8MB */ - mov r3, #(L1_S_AP(AP_KRW)) + mov r3, #(L1_S_AP_KRW) orr r3, r3, #(L1_TYPE_S) 1: str r3, [r0], #0x04 @@ -105,7 +108,7 @@ add r0, r0, #(0xf00 * 4) /* offset to 0xf0000000 */ mov r3, #0x80000000 - orr r3, r3, #(L1_S_AP(AP_KRW)) + orr r3, r3, #(L1_S_AP_KRW) orr r3, r3, #(L1_TYPE_S) str r3, [r0], #4 @@ -114,7 +117,7 @@ */ mov r3, #0x80000000 add r3, r3, #0x00800000 - orr r3, r3, #(L1_S_AP(AP_KRW)) + orr r3, r3, #(L1_S_AP_KRW) orr r3, r3, #(L1_TYPE_S) str r3, [r0], #0x4 add r3, r3, r2 @@ -124,7 +127,7 @@ * Step 5: Map VA 0xf0300000->0xf4300000 to PA 0x10000000->0x14000000. */ mov r1, #0x40 /* 64MB */ - mov r3, #(L1_S_AP(AP_KRW)) + mov r3, #(L1_S_AP_KRW) orr r3, r3, #(L1_TYPE_S) orr r3, r3, #0x10000000 1: @@ -137,7 +140,7 @@ * Step 6: Map VA 0xf4300000->0xf8300000 to PA 0x20000000->0x24000000. */ mov r1, #0x40 /* 64MB */ - mov r3, #(L1_S_AP(AP_KRW)) + mov r3, #(L1_S_AP_KRW) orr r3, r3, #(L1_TYPE_S) orr r3, r3, #0x20000000 1: Index: src/sys/arch/evbarm/viper/viper_start.S diff -u src/sys/arch/evbarm/viper/viper_start.S:1.5 src/sys/arch/evbarm/viper/viper_start.S:1.6 --- src/sys/arch/evbarm/viper/viper_start.S:1.5 Wed Oct 17 19:54:14 2007 +++ src/sys/arch/evbarm/viper/viper_start.S Mon Jan 31 06:28:06 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: viper_start.S,v 1.5 2007/10/17 19:54:14 garbled Exp $ */ +/* $NetBSD: viper_start.S,v 1.6 2011/01/31 06:28:06 matt Exp $ */ /* * Copyright (c) 2005 Antti Kantee. All Rights Reserved. @@ -30,8 +30,9 @@ #include <machine/asm.h> #include <arm/armreg.h> -#include <arm/arm32/pmap.h> -#include <arm/arm32/pte.h> +#include "assym.h" + +RCSID("$NetBSD: viper_start.S,v 1.6 2011/01/31 06:28:06 matt Exp $") /* * We start out with RAM mapped to the bottom 64MB. We are jogging @@ -86,9 +87,9 @@ add r0, r0, #(0xa00 * 4) /* offset to 0xa0.. */ mov r3, #SDRAM_START /* map to 0xa00.. */ - orr r3, r3, #(L1_S_AP(AP_KRW)) /* the usual perms & stuff */ + orr r3, r3, #(L1_S_AP_KRW) /* the usual perms & stuff */ orr r3, r3, #(L1_TYPE_S) - orr r3, r3, #(L1_S_DOM(PMAP_DOMAIN_KERNEL)) + orr r3, r3, #(L1_S_DOM_KERNEL) mov r1, #0x40 /* 64 1MB entries */ 1: @@ -106,9 +107,9 @@ add r0, r0, #(0xc00 * 4) /* start from 0xc00.. */ mov r3, #SDRAM_START /* map to 0xa00.. */ - orr r3, r3, #(L1_S_AP(AP_KRW)) /* the usual perms & stuff */ + orr r3, r3, #(L1_S_AP_KRW) /* the usual perms & stuff */ orr r3, r3, #(L1_TYPE_S) - orr r3, r3, #(L1_S_DOM(PMAP_DOMAIN_KERNEL)) + orr r3, r3, #(L1_S_DOM_KERNEL) mov r1, #0x40 /* 64 1MB entries */ 1: @@ -130,41 +131,41 @@ mov r3, #0x40000000 orr r3, r3, #0x00d00000 - orr r3, r3, #(L1_S_AP(AP_KRW)) + orr r3, r3, #(L1_S_AP_KRW) orr r3, r3, #(L1_TYPE_S) - orr r3, r3, #(L1_S_DOM(PMAP_DOMAIN_KERNEL)) + orr r3, r3, #(L1_S_DOM_KERNEL) str r3, [r0], #4 /* GPIO */ mov r3, #0x40000000 orr r3, r3, #0x00e00000 - orr r3, r3, #(L1_S_AP(AP_KRW)) + orr r3, r3, #(L1_S_AP_KRW) orr r3, r3, #(L1_TYPE_S) - orr r3, r3, #(L1_S_DOM(PMAP_DOMAIN_KERNEL)) + orr r3, r3, #(L1_S_DOM_KERNEL) str r3, [r0], #4 /* CLKMAN */ mov r3, #0x41000000 orr r3, r3, #0x00300000 - orr r3, r3, #(L1_S_AP(AP_KRW)) + orr r3, r3, #(L1_S_AP_KRW) orr r3, r3, #(L1_TYPE_S) - orr r3, r3, #(L1_S_DOM(PMAP_DOMAIN_KERNEL)) + orr r3, r3, #(L1_S_DOM_KERNEL) str r3, [r0], #4 /* FFUART */ mov r3, #0x40000000 orr r3, r3, #0x00100000 - orr r3, r3, #(L1_S_AP(AP_KRW)) + orr r3, r3, #(L1_S_AP_KRW) orr r3, r3, #(L1_TYPE_S) - orr r3, r3, #(L1_S_DOM(PMAP_DOMAIN_KERNEL)) + orr r3, r3, #(L1_S_DOM_KERNEL) str r3, [r0], #4 /* BTUART */ mov r3, #0x40000000 orr r3, r3, #0x00200000 - orr r3, r3, #(L1_S_AP(AP_KRW)) + orr r3, r3, #(L1_S_AP_KRW) orr r3, r3, #(L1_TYPE_S) - orr r3, r3, #(L1_S_DOM(PMAP_DOMAIN_KERNEL)) + orr r3, r3, #(L1_S_DOM_KERNEL) str r3, [r0], #4 #if 0