Date: Sun, 19 Aug 2012 20:31:33 +0000 (UTC) From: Jakub Wojciech Klama <jceel@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r239406 - in user/jceel/soc2012_armv6/sys/arm: at91 econa s3c2xx0 sa11x0 xscale/i80321 xscale/ixp425 xscale/pxa Message-ID: <201208192031.q7JKVX0H032584@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jceel Date: Sun Aug 19 20:31:33 2012 New Revision: 239406 URL: http://svn.freebsd.org/changeset/base/239406 Log: Unbreak all ARM ports broken by latest arm/machdep.c changes Modified: user/jceel/soc2012_armv6/sys/arm/at91/at91_machdep.c user/jceel/soc2012_armv6/sys/arm/at91/files.at91sam9 user/jceel/soc2012_armv6/sys/arm/econa/econa_machdep.c user/jceel/soc2012_armv6/sys/arm/s3c2xx0/s3c24x0_machdep.c user/jceel/soc2012_armv6/sys/arm/sa11x0/assabet_machdep.c user/jceel/soc2012_armv6/sys/arm/xscale/i80321/ep80219_machdep.c user/jceel/soc2012_armv6/sys/arm/xscale/i80321/iq31244_machdep.c user/jceel/soc2012_armv6/sys/arm/xscale/ixp425/avila_machdep.c user/jceel/soc2012_armv6/sys/arm/xscale/ixp425/files.ixp425 user/jceel/soc2012_armv6/sys/arm/xscale/pxa/pxa_machdep.c Modified: user/jceel/soc2012_armv6/sys/arm/at91/at91_machdep.c ============================================================================== --- user/jceel/soc2012_armv6/sys/arm/at91/at91_machdep.c Sun Aug 19 20:30:37 2012 (r239405) +++ user/jceel/soc2012_armv6/sys/arm/at91/at91_machdep.c Sun Aug 19 20:31:33 2012 (r239406) @@ -117,17 +117,14 @@ extern void *_end; extern int *end; /* Physical and virtual addresses for some global pages */ - -vm_paddr_t phys_avail[10]; -vm_paddr_t dump_avail[4]; vm_offset_t physical_pages; -struct pv_addr systempage; -struct pv_addr msgbufpv; -struct pv_addr irqstack; -struct pv_addr undstack; -struct pv_addr abtstack; -struct pv_addr kernelstack; +extern struct pv_addr systempage; +extern struct pv_addr msgbufpv; +extern struct pv_addr irqstack; +extern struct pv_addr undstack; +extern struct pv_addr abtstack; +extern struct pv_addr kernelstack; static void *boot_arg1; static void *boot_arg2; @@ -144,6 +141,7 @@ const struct pmap_devmap at91_devmap[] = * and the timer. Other devices should use newbus to * map their memory anyway. */ + NULL, 0xdff00000, 0xfff00000, 0x00100000, @@ -166,6 +164,7 @@ const struct pmap_devmap at91_devmap[] = * on this chip select for a VA/PA mapping. */ /* Internal Memory 1MB */ + NULL, AT91RM92_OHCI_BASE, AT91RM92_OHCI_PA_BASE, 0x00100000, @@ -174,6 +173,7 @@ const struct pmap_devmap at91_devmap[] = }, { /* CompactFlash controller. Portion of EBI CS4 1MB */ + NULL, AT91RM92_CF_BASE, AT91RM92_CF_PA_BASE, 0x00100000, @@ -184,6 +184,7 @@ const struct pmap_devmap at91_devmap[] = * addresses mapping is the same. */ { /* Internal Memory 1MB */ + NULL, AT91SAM9G20_OHCI_BASE, AT91SAM9G20_OHCI_PA_BASE, 0x00100000, @@ -192,13 +193,14 @@ const struct pmap_devmap at91_devmap[] = }, { /* EBI CS3 256MB */ + NULL, AT91SAM9G20_NAND_BASE, AT91SAM9G20_NAND_PA_BASE, AT91SAM9G20_NAND_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, - { 0, 0, 0, 0, 0, } + { NULL, 0, 0, 0, 0, 0, } }; long Modified: user/jceel/soc2012_armv6/sys/arm/at91/files.at91sam9 ============================================================================== --- user/jceel/soc2012_armv6/sys/arm/at91/files.at91sam9 Sun Aug 19 20:30:37 2012 (r239405) +++ user/jceel/soc2012_armv6/sys/arm/at91/files.at91sam9 Sun Aug 19 20:31:33 2012 (r239406) @@ -1,6 +1,7 @@ # $FreeBSD$ arm/arm/cpufunc_asm_arm9.S standard arm/arm/irq_dispatch.S standard +arm/arm/intr.c standard arm/at91/at91_machdep.c standard arm/at91/at91.c standard arm/at91/at91_mci.c optional at91_mci Modified: user/jceel/soc2012_armv6/sys/arm/econa/econa_machdep.c ============================================================================== --- user/jceel/soc2012_armv6/sys/arm/econa/econa_machdep.c Sun Aug 19 20:30:37 2012 (r239405) +++ user/jceel/soc2012_armv6/sys/arm/econa/econa_machdep.c Sun Aug 19 20:31:33 2012 (r239406) @@ -108,17 +108,14 @@ extern void *_end; extern int *end; /* Physical and virtual addresses for some global pages */ - -vm_paddr_t phys_avail[10]; -vm_paddr_t dump_avail[4]; vm_offset_t physical_pages; -struct pv_addr systempage; -struct pv_addr msgbufpv; -struct pv_addr irqstack; -struct pv_addr undstack; -struct pv_addr abtstack; -struct pv_addr kernelstack; +extern struct pv_addr systempage; +extern struct pv_addr msgbufpv; +extern struct pv_addr irqstack; +extern struct pv_addr undstack; +extern struct pv_addr abtstack; +extern struct pv_addr kernelstack; static void *boot_arg1; static void *boot_arg2; @@ -129,6 +126,7 @@ static const struct pmap_devmap econa_de /* * This maps DDR SDRAM */ + NULL, ECONA_SDRAM_BASE, /*virtual*/ ECONA_SDRAM_BASE, /*physical*/ ECONA_SDRAM_SIZE, /*size*/ @@ -144,6 +142,7 @@ static const struct pmap_devmap econa_de * This maps the interrupt controller, the UART * and the timer. */ + NULL, ECONA_IO_BASE, /*virtual*/ ECONA_IO_BASE, /*physical*/ ECONA_IO_SIZE, /*size*/ @@ -154,6 +153,7 @@ static const struct pmap_devmap econa_de /* * OHCI + EHCI */ + NULL, ECONA_OHCI_VBASE, /*virtual*/ ECONA_OHCI_PBASE, /*physical*/ ECONA_USB_SIZE, /*size*/ @@ -164,6 +164,7 @@ static const struct pmap_devmap econa_de /* * CFI */ + NULL, ECONA_CFI_VBASE, /*virtual*/ ECONA_CFI_PBASE, /*physical*/ ECONA_CFI_SIZE, @@ -171,6 +172,7 @@ static const struct pmap_devmap econa_de PTE_NOCACHE, }, { + NULL, 0, 0, 0, Modified: user/jceel/soc2012_armv6/sys/arm/s3c2xx0/s3c24x0_machdep.c ============================================================================== --- user/jceel/soc2012_armv6/sys/arm/s3c2xx0/s3c24x0_machdep.c Sun Aug 19 20:30:37 2012 (r239405) +++ user/jceel/soc2012_armv6/sys/arm/s3c2xx0/s3c24x0_machdep.c Sun Aug 19 20:31:33 2012 (r239406) @@ -123,17 +123,14 @@ extern void *_end; extern int *end; /* Physical and virtual addresses for some global pages */ - -vm_paddr_t phys_avail[10]; -vm_paddr_t dump_avail[4]; vm_offset_t physical_pages; -struct pv_addr systempage; -struct pv_addr msgbufpv; -struct pv_addr irqstack; -struct pv_addr undstack; -struct pv_addr abtstack; -struct pv_addr kernelstack; +extern struct pv_addr systempage; +extern struct pv_addr msgbufpv; +extern struct pv_addr irqstack; +extern struct pv_addr undstack; +extern struct pv_addr abtstack; +extern struct pv_addr kernelstack; #define _A(a) ((a) & ~L1_S_OFFSET) #define _S(s) (((s) + L1_S_SIZE - 1) & ~(L1_S_SIZE-1)) @@ -144,6 +141,7 @@ static const struct pmap_devmap s3c24x0_ * Map the devices we need early on. */ { + NULL, _A(S3C24X0_CLKMAN_BASE), _A(S3C24X0_CLKMAN_PA_BASE), _S(S3C24X0_CLKMAN_SIZE), @@ -151,6 +149,7 @@ static const struct pmap_devmap s3c24x0_ PTE_NOCACHE, }, { + NULL, _A(S3C24X0_GPIO_BASE), _A(S3C24X0_GPIO_PA_BASE), _S(S3C2410_GPIO_SIZE), @@ -158,6 +157,7 @@ static const struct pmap_devmap s3c24x0_ PTE_NOCACHE, }, { + NULL, _A(S3C24X0_INTCTL_BASE), _A(S3C24X0_INTCTL_PA_BASE), _S(S3C24X0_INTCTL_SIZE), @@ -165,6 +165,7 @@ static const struct pmap_devmap s3c24x0_ PTE_NOCACHE, }, { + NULL, _A(S3C24X0_TIMER_BASE), _A(S3C24X0_TIMER_PA_BASE), _S(S3C24X0_TIMER_SIZE), @@ -172,6 +173,7 @@ static const struct pmap_devmap s3c24x0_ PTE_NOCACHE, }, { + NULL, _A(S3C24X0_UART0_BASE), _A(S3C24X0_UART0_PA_BASE), _S(S3C24X0_UART_PA_BASE(3) - S3C24X0_UART0_PA_BASE), @@ -179,6 +181,7 @@ static const struct pmap_devmap s3c24x0_ PTE_NOCACHE, }, { + NULL, _A(S3C24X0_WDT_BASE), _A(S3C24X0_WDT_PA_BASE), _S(S3C24X0_WDT_SIZE), @@ -186,6 +189,7 @@ static const struct pmap_devmap s3c24x0_ PTE_NOCACHE, }, { + NULL, 0, 0, 0, Modified: user/jceel/soc2012_armv6/sys/arm/sa11x0/assabet_machdep.c ============================================================================== --- user/jceel/soc2012_armv6/sys/arm/sa11x0/assabet_machdep.c Sun Aug 19 20:30:37 2012 (r239405) +++ user/jceel/soc2012_armv6/sys/arm/sa11x0/assabet_machdep.c Sun Aug 19 20:31:33 2012 (r239406) @@ -132,18 +132,16 @@ extern int *end; #endif /* Physical and virtual addresses for some global pages */ -vm_paddr_t phys_avail[10]; -vm_paddr_t dump_avail[4]; vm_paddr_t physical_start; vm_paddr_t physical_end; vm_paddr_t physical_freestart; vm_offset_t physical_pages; -struct pv_addr systempage; -struct pv_addr irqstack; -struct pv_addr undstack; -struct pv_addr abtstack; -struct pv_addr kernelstack; +extern struct pv_addr systempage; +extern struct pv_addr irqstack; +extern struct pv_addr undstack; +extern struct pv_addr abtstack; +extern struct pv_addr kernelstack; /* Static device mappings. */ static const struct pmap_devmap assabet_devmap[] = { @@ -152,6 +150,7 @@ static const struct pmap_devmap assabet_ * with the MMU on or off. */ { + NULL, SACOM1_VBASE, SACOM1_BASE, SACOM1_SIZE, @@ -159,6 +158,7 @@ static const struct pmap_devmap assabet_ PTE_NOCACHE, }, { + NULL, SAIPIC_BASE, SAIPIC_BASE, SAIPIC_SIZE, @@ -166,6 +166,7 @@ static const struct pmap_devmap assabet_ PTE_NOCACHE, }, { + NULL, 0, 0, 0, Modified: user/jceel/soc2012_armv6/sys/arm/xscale/i80321/ep80219_machdep.c ============================================================================== --- user/jceel/soc2012_armv6/sys/arm/xscale/i80321/ep80219_machdep.c Sun Aug 19 20:30:37 2012 (r239405) +++ user/jceel/soc2012_armv6/sys/arm/xscale/i80321/ep80219_machdep.c Sun Aug 19 20:31:33 2012 (r239406) @@ -120,17 +120,14 @@ extern void *_end; extern int *end; /* Physical and virtual addresses for some global pages */ - -vm_paddr_t phys_avail[10]; -vm_paddr_t dump_avail[4]; vm_offset_t physical_pages; -struct pv_addr systempage; -struct pv_addr msgbufpv; -struct pv_addr irqstack; -struct pv_addr undstack; -struct pv_addr abtstack; -struct pv_addr kernelstack; +extern struct pv_addr systempage; +extern struct pv_addr msgbufpv; +extern struct pv_addr irqstack; +extern struct pv_addr undstack; +extern struct pv_addr abtstack; +extern struct pv_addr kernelstack; struct pv_addr minidataclean; @@ -144,6 +141,7 @@ static const struct pmap_devmap ep80219_ * with the MMU on or off. */ { + NULL, IQ80321_OBIO_BASE, IQ80321_OBIO_BASE, IQ80321_OBIO_SIZE, @@ -151,6 +149,7 @@ static const struct pmap_devmap ep80219_ PTE_NOCACHE, }, { + NULL, IQ80321_IOW_VBASE, VERDE_OUT_XLATE_IO_WIN0_BASE, VERDE_OUT_XLATE_IO_WIN_SIZE, @@ -158,6 +157,7 @@ static const struct pmap_devmap ep80219_ PTE_NOCACHE, }, { + NULL, IQ80321_80321_VBASE, VERDE_PMMR_BASE, VERDE_PMMR_SIZE, @@ -165,6 +165,7 @@ static const struct pmap_devmap ep80219_ PTE_NOCACHE, }, { + NULL, 0, 0, 0, Modified: user/jceel/soc2012_armv6/sys/arm/xscale/i80321/iq31244_machdep.c ============================================================================== --- user/jceel/soc2012_armv6/sys/arm/xscale/i80321/iq31244_machdep.c Sun Aug 19 20:30:37 2012 (r239405) +++ user/jceel/soc2012_armv6/sys/arm/xscale/i80321/iq31244_machdep.c Sun Aug 19 20:31:33 2012 (r239406) @@ -120,17 +120,14 @@ extern void *_end; extern int *end; /* Physical and virtual addresses for some global pages */ - -vm_paddr_t phys_avail[10]; -vm_paddr_t dump_avail[4]; vm_offset_t physical_pages; -struct pv_addr systempage; -struct pv_addr msgbufpv; -struct pv_addr irqstack; -struct pv_addr undstack; -struct pv_addr abtstack; -struct pv_addr kernelstack; +extern struct pv_addr systempage; +extern struct pv_addr msgbufpv; +extern struct pv_addr irqstack; +extern struct pv_addr undstack; +extern struct pv_addr abtstack; +extern struct pv_addr kernelstack; struct pv_addr minidataclean; #define IQ80321_OBIO_BASE 0xfe800000UL @@ -142,6 +139,7 @@ static const struct pmap_devmap iq80321_ * with the MMU on or off. */ { + NULL, IQ80321_OBIO_BASE, IQ80321_OBIO_BASE, IQ80321_OBIO_SIZE, @@ -149,14 +147,15 @@ static const struct pmap_devmap iq80321_ PTE_NOCACHE, }, { + NULL, IQ80321_IOW_VBASE, VERDE_OUT_XLATE_IO_WIN0_BASE, VERDE_OUT_XLATE_IO_WIN_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, - { + NULL, IQ80321_80321_VBASE, VERDE_PMMR_BASE, VERDE_PMMR_SIZE, @@ -164,6 +163,7 @@ static const struct pmap_devmap iq80321_ PTE_NOCACHE, }, { + NULL, 0, 0, 0, Modified: user/jceel/soc2012_armv6/sys/arm/xscale/ixp425/avila_machdep.c ============================================================================== --- user/jceel/soc2012_armv6/sys/arm/xscale/ixp425/avila_machdep.c Sun Aug 19 20:30:37 2012 (r239405) +++ user/jceel/soc2012_armv6/sys/arm/xscale/ixp425/avila_machdep.c Sun Aug 19 20:31:33 2012 (r239406) @@ -125,96 +125,94 @@ extern int *end; /* Physical and virtual addresses for some global pages */ -vm_paddr_t phys_avail[10]; -vm_paddr_t dump_avail[4]; vm_offset_t physical_pages; -struct pv_addr systempage; -struct pv_addr msgbufpv; -struct pv_addr irqstack; -struct pv_addr undstack; -struct pv_addr abtstack; -struct pv_addr kernelstack; +extern struct pv_addr systempage; +extern struct pv_addr msgbufpv; +extern struct pv_addr irqstack; +extern struct pv_addr undstack; +extern struct pv_addr abtstack; +extern struct pv_addr kernelstack; struct pv_addr minidataclean; /* Static device mappings. */ static const struct pmap_devmap ixp425_devmap[] = { /* Physical/Virtual address for I/O space */ - { IXP425_IO_VBASE, IXP425_IO_HWBASE, IXP425_IO_SIZE, + { NULL, IXP425_IO_VBASE, IXP425_IO_HWBASE, IXP425_IO_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, /* Expansion Bus */ - { IXP425_EXP_VBASE, IXP425_EXP_HWBASE, IXP425_EXP_SIZE, + { NULL, IXP425_EXP_VBASE, IXP425_EXP_HWBASE, IXP425_EXP_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, /* CFI Flash on the Expansion Bus */ - { IXP425_EXP_BUS_CS0_VBASE, IXP425_EXP_BUS_CS0_HWBASE, + { NULL, IXP425_EXP_BUS_CS0_VBASE, IXP425_EXP_BUS_CS0_HWBASE, IXP425_EXP_BUS_CS0_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, /* IXP425 PCI Configuration */ - { IXP425_PCI_VBASE, IXP425_PCI_HWBASE, IXP425_PCI_SIZE, + { NULL, IXP425_PCI_VBASE, IXP425_PCI_HWBASE, IXP425_PCI_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, /* SDRAM Controller */ - { IXP425_MCU_VBASE, IXP425_MCU_HWBASE, IXP425_MCU_SIZE, + { NULL, IXP425_MCU_VBASE, IXP425_MCU_HWBASE, IXP425_MCU_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, /* PCI Memory Space */ - { IXP425_PCI_MEM_VBASE, IXP425_PCI_MEM_HWBASE, IXP425_PCI_MEM_SIZE, + { NULL, IXP425_PCI_MEM_VBASE, IXP425_PCI_MEM_HWBASE, IXP425_PCI_MEM_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, /* Q-Mgr Memory Space */ - { IXP425_QMGR_VBASE, IXP425_QMGR_HWBASE, IXP425_QMGR_SIZE, + { NULL, IXP425_QMGR_VBASE, IXP425_QMGR_HWBASE, IXP425_QMGR_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, - { 0 }, + { NULL, 0 }, }; /* Static device mappings. */ static const struct pmap_devmap ixp435_devmap[] = { /* Physical/Virtual address for I/O space */ - { IXP425_IO_VBASE, IXP425_IO_HWBASE, IXP425_IO_SIZE, + { NULL, IXP425_IO_VBASE, IXP425_IO_HWBASE, IXP425_IO_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, - { IXP425_EXP_VBASE, IXP425_EXP_HWBASE, IXP425_EXP_SIZE, + { NULL, IXP425_EXP_VBASE, IXP425_EXP_HWBASE, IXP425_EXP_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, /* IXP425 PCI Configuration */ - { IXP425_PCI_VBASE, IXP425_PCI_HWBASE, IXP425_PCI_SIZE, + { NULL, IXP425_PCI_VBASE, IXP425_PCI_HWBASE, IXP425_PCI_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, /* DDRII Controller NB: mapped same place as IXP425 */ - { IXP425_MCU_VBASE, IXP435_MCU_HWBASE, IXP425_MCU_SIZE, + { NULL, IXP425_MCU_VBASE, IXP435_MCU_HWBASE, IXP425_MCU_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, /* PCI Memory Space */ - { IXP425_PCI_MEM_VBASE, IXP425_PCI_MEM_HWBASE, IXP425_PCI_MEM_SIZE, + { NULL, IXP425_PCI_MEM_VBASE, IXP425_PCI_MEM_HWBASE, IXP425_PCI_MEM_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, /* Q-Mgr Memory Space */ - { IXP425_QMGR_VBASE, IXP425_QMGR_HWBASE, IXP425_QMGR_SIZE, + { NULL, IXP425_QMGR_VBASE, IXP425_QMGR_HWBASE, IXP425_QMGR_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, /* CFI Flash on the Expansion Bus */ - { IXP425_EXP_BUS_CS0_VBASE, IXP425_EXP_BUS_CS0_HWBASE, + { NULL, IXP425_EXP_BUS_CS0_VBASE, IXP425_EXP_BUS_CS0_HWBASE, IXP425_EXP_BUS_CS0_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, /* USB1 Memory Space */ - { IXP435_USB1_VBASE, IXP435_USB1_HWBASE, IXP435_USB1_SIZE, + { NULL, IXP435_USB1_VBASE, IXP435_USB1_HWBASE, IXP435_USB1_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, /* USB2 Memory Space */ - { IXP435_USB2_VBASE, IXP435_USB2_HWBASE, IXP435_USB2_SIZE, + { NULL, IXP435_USB2_VBASE, IXP435_USB2_HWBASE, IXP435_USB2_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, /* GPS Memory Space */ - { CAMBRIA_GPS_VBASE, CAMBRIA_GPS_HWBASE, CAMBRIA_GPS_SIZE, + { NULL, CAMBRIA_GPS_VBASE, CAMBRIA_GPS_HWBASE, CAMBRIA_GPS_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, /* RS485 Memory Space */ - { CAMBRIA_RS485_VBASE, CAMBRIA_RS485_HWBASE, CAMBRIA_RS485_SIZE, + { NULL, CAMBRIA_RS485_VBASE, CAMBRIA_RS485_HWBASE, CAMBRIA_RS485_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, - { 0 } + { NULL, 0 } }; extern vm_offset_t xscale_cache_clean_addr; Modified: user/jceel/soc2012_armv6/sys/arm/xscale/ixp425/files.ixp425 ============================================================================== --- user/jceel/soc2012_armv6/sys/arm/xscale/ixp425/files.ixp425 Sun Aug 19 20:30:37 2012 (r239405) +++ user/jceel/soc2012_armv6/sys/arm/xscale/ixp425/files.ixp425 Sun Aug 19 20:31:33 2012 (r239406) @@ -2,6 +2,7 @@ arm/arm/bus_space_generic.c standard arm/arm/cpufunc_asm_xscale.S standard arm/arm/irq_dispatch.S standard +arm/arm/intr.c standard arm/xscale/ixp425/ixp425.c standard arm/xscale/ixp425/ixp425_mem.c standard arm/xscale/ixp425/ixp425_space.c standard Modified: user/jceel/soc2012_armv6/sys/arm/xscale/pxa/pxa_machdep.c ============================================================================== --- user/jceel/soc2012_armv6/sys/arm/xscale/pxa/pxa_machdep.c Sun Aug 19 20:30:37 2012 (r239405) +++ user/jceel/soc2012_armv6/sys/arm/xscale/pxa/pxa_machdep.c Sun Aug 19 20:31:33 2012 (r239406) @@ -121,16 +121,16 @@ extern int *end; /* Physical and virtual addresses for some global pages */ -vm_paddr_t phys_avail[PXA2X0_SDRAM_BANKS * 2 + 4]; -vm_paddr_t dump_avail[PXA2X0_SDRAM_BANKS * 2 + 4]; +//vm_paddr_t phys_avail[PXA2X0_SDRAM_BANKS * 2 + 4]; +//vm_paddr_t dump_avail[PXA2X0_SDRAM_BANKS * 2 + 4]; vm_offset_t physical_pages; -struct pv_addr systempage; -struct pv_addr msgbufpv; -struct pv_addr irqstack; -struct pv_addr undstack; -struct pv_addr abtstack; -struct pv_addr kernelstack; +extern struct pv_addr systempage; +extern struct pv_addr msgbufpv; +extern struct pv_addr irqstack; +extern struct pv_addr undstack; +extern struct pv_addr abtstack; +extern struct pv_addr kernelstack; struct pv_addr minidataclean; static void pxa_probe_sdram(bus_space_tag_t, bus_space_handle_t, @@ -143,13 +143,14 @@ static const struct pmap_devmap pxa_devm * up user-space. */ { + NULL, PXA2X0_PERIPH_START + PXA2X0_PERIPH_OFFSET, PXA2X0_PERIPH_START, PXA250_PERIPH_END - PXA2X0_PERIPH_START, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, - { 0, 0, 0, 0, 0, } + { NULL, 0, 0, 0, 0, 0, } }; #define SDRAM_START 0xa0000000
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208192031.q7JKVX0H032584>