Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/evbarm Remove old and never used evbarm/initarm_com...
details: https://anonhg.NetBSD.org/src/rev/dd26cd748e7c
branches: trunk
changeset: 784262:dd26cd748e7c
user: skrll <skrll%NetBSD.org@localhost>
date: Wed Jan 23 14:24:14 2013 +0000
description:
Remove old and never used evbarm/initarm_common. Please use
arm32/arm32_boot.c:initarm_common
diffstat:
sys/arch/evbarm/conf/files.iq31244 | 6 +-
sys/arch/evbarm/conf/files.iq80321 | 6 +-
sys/arch/evbarm/conf/files.ixdp425 | 5 +-
sys/arch/evbarm/conf/files.npwr_fc | 6 +-
sys/arch/evbarm/evbarm/initarm_common.c | 501 --------------------------------
sys/arch/evbarm/evbarm/initarmvar.h | 61 ---
6 files changed, 4 insertions(+), 581 deletions(-)
diffs (truncated from 640 to 300 lines):
diff -r 45decd46345f -r dd26cd748e7c sys/arch/evbarm/conf/files.iq31244
--- a/sys/arch/evbarm/conf/files.iq31244 Wed Jan 23 13:06:18 2013 +0000
+++ b/sys/arch/evbarm/conf/files.iq31244 Wed Jan 23 14:24:14 2013 +0000
@@ -1,12 +1,8 @@
-# $NetBSD: files.iq31244,v 1.7 2009/01/09 16:23:59 briggs Exp $
+# $NetBSD: files.iq31244,v 1.8 2013/01/23 14:24:14 skrll Exp $
#
# Intel IQ31244 reference board configuration info
#
-# Use the shared initarm_common() code.
-# XXX: Not yet ready for prime-time
-#file arch/evbarm/evbarm/initarm_common.c
-
file arch/evbarm/iq31244/iq31244_7seg.c
file arch/evbarm/iq80321/iq80321_machdep.c
file arch/evbarm/iq31244/iq31244_machdep.c
diff -r 45decd46345f -r dd26cd748e7c sys/arch/evbarm/conf/files.iq80321
--- a/sys/arch/evbarm/conf/files.iq80321 Wed Jan 23 13:06:18 2013 +0000
+++ b/sys/arch/evbarm/conf/files.iq80321 Wed Jan 23 14:24:14 2013 +0000
@@ -1,12 +1,8 @@
-# $NetBSD: files.iq80321,v 1.8 2007/12/03 15:33:31 ad Exp $
+# $NetBSD: files.iq80321,v 1.9 2013/01/23 14:24:14 skrll Exp $
#
# Intel IQ80321 evaluation board configuration info
#
-# Use the shared initarm_common() code.
-# XXX: Not yet ready for prime-time
-#file arch/evbarm/evbarm/initarm_common.c
-
file arch/evbarm/iq80321/iq80321_7seg.c
file arch/evbarm/iq80321/iq80321_machdep.c
file arch/evbarm/iq80321/iq80321_pci.c
diff -r 45decd46345f -r dd26cd748e7c sys/arch/evbarm/conf/files.ixdp425
--- a/sys/arch/evbarm/conf/files.ixdp425 Wed Jan 23 13:06:18 2013 +0000
+++ b/sys/arch/evbarm/conf/files.ixdp425 Wed Jan 23 14:24:14 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.ixdp425,v 1.8 2008/03/17 09:30:02 kiyohara Exp $
+# $NetBSD: files.ixdp425,v 1.9 2013/01/23 14:24:14 skrll Exp $
#
# Intel IXP425 networkproccesor board configuration info
#
@@ -6,9 +6,6 @@
# IXP425 Network Processor CPU support
include "arch/arm/xscale/files.ixp425"
-# Use the shared initarm_common() code.
-# XXX: Not yet ready for prime-time
-#file arch/evbarm/evbarm/initarm_common.c
file arch/evbarm/ixdp425/ixdp425_machdep.c
file arch/evbarm/ixdp425/ixdp425_pci.c
diff -r 45decd46345f -r dd26cd748e7c sys/arch/evbarm/conf/files.npwr_fc
--- a/sys/arch/evbarm/conf/files.npwr_fc Wed Jan 23 13:06:18 2013 +0000
+++ b/sys/arch/evbarm/conf/files.npwr_fc Wed Jan 23 14:24:14 2013 +0000
@@ -1,12 +1,8 @@
-# $NetBSD: files.npwr_fc,v 1.2 2007/12/03 15:33:31 ad Exp $
+# $NetBSD: files.npwr_fc,v 1.3 2013/01/23 14:24:14 skrll Exp $
#
# Intel IQ80321 evaluation board configuration info
#
-# Use the shared initarm_common() code.
-# XXX: Not yet ready for prime-time
-#file arch/evbarm/evbarm/initarm_common.c
-
file arch/evbarm/npwr_fc/npwr_fc_machdep.c
file arch/evbarm/npwr_fc/npwr_fc_pci.c
diff -r 45decd46345f -r dd26cd748e7c sys/arch/evbarm/evbarm/initarm_common.c
--- a/sys/arch/evbarm/evbarm/initarm_common.c Wed Jan 23 13:06:18 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,501 +0,0 @@
-/* $NetBSD: initarm_common.c,v 1.12 2012/10/29 14:01:33 chs Exp $ */
-
-/*
- * Copyright 2003 Wasabi Systems, Inc.
- * All rights reserved.
- *
- * Written by Jason R. Thorpe and Steve C. Woodford for Wasabi Systems, Inc.
- *
- * 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.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed for the NetBSD Project by
- * Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- * or promote products derived from this software without specific prior
- * written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``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 WASABI SYSTEMS, INC
- * 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.
- */
-/*
- * Copyright (c) 1997,1998 Mark Brinicombe.
- * Copyright (c) 1997,1998 Causality Limited.
- * All rights reserved.
- *
- * 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.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Mark Brinicombe
- * for the NetBSD Project.
- * 4. The name of the company nor the name of the author may be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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 <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: initarm_common.c,v 1.12 2012/10/29 14:01:33 chs Exp $");
-
-#include <sys/systm.h>
-#include <sys/param.h>
-#include <sys/kernel.h>
-
-#include <uvm/uvm_extern.h>
-
-#include <machine/bootconfig.h>
-#include <machine/cpu.h>
-#include <machine/pmap.h>
-#include <arm/undefined.h>
-
-#include <arm/arm32/machdep.h>
-
-#include <evbarm/evbarm/initarmvar.h>
-
-
-/* Define various stack sizes in pages */
-#define IRQ_STACK_SIZE 1
-#define ABT_STACK_SIZE 1
-#define UND_STACK_SIZE 1
-
-vm_offset_t msgbufphys;
-vm_offset_t physical_start;
-vm_offset_t physical_end;
-
-vaddr_t
-initarm_common(const struct initarm_config *ic)
-{
-#ifdef DIAGNOSTIC
- extern vsize_t xscale_minidata_clean_size;
-#endif
- extern char etext[], _end[];
- const BootConfig *bc;
- int loop;
- vaddr_t l1pagetable;
- pv_addr_t kernel_l1pt;
- pv_addr_t *kernel_pt_table;
- pv_addr_t irqstack;
- pv_addr_t undstack;
- pv_addr_t abtstack;
- pv_addr_t kernelstack;
- pv_addr_t minidataclean;
- vm_offset_t physical_freestart;
- vm_offset_t physical_freeend;
- vaddr_t avail;
- vaddr_t pt_vstart;
- paddr_t pt_pstart;
- vsize_t pt_size;
- u_int ptcount_total;
- u_int ptcount_kernel;
- u_int ptcount_fixed_io;
- u_int ptcount_vmdata;
-
- /*
- * Set up the variables that define the availablilty of
- * physical memory.
- */
- bc = ic->ic_bootconf;
- avail = round_page((vaddr_t)(uintptr_t)&_end[0]);
- physical_start = bc->dram[0].address;
- physical_freestart = (avail - KERNEL_BASE) + ic->ic_kernel_base_pa;
-
- for (loop = 0; loop < bc->dramblocks; loop++) {
- paddr_t blk_end;
-
- blk_end = bc->dram[loop].address +
- (bc->dram[loop].pages * PAGE_SIZE);
-
- if (ic->ic_kernel_base_pa >= bc->dram[loop].address &&
- ic->ic_kernel_base_pa < blk_end)
- physical_freeend = blk_end;
-
- physmem += bc->dram[loop].pages;
- }
-
- loop--;
- physical_end = bc->dram[loop].address +
- (bc->dram[loop].pages * PAGE_SIZE);
-
- /* Tell the user about the memory */
- printf("physmemory: %d pages at 0x%08lx -> 0x%08lx\n", physmem,
- physical_start, physical_end - 1);
-
- /*
- * Okay, the kernel starts near the bottom of physical memory
- * and extends to (avail - KERNEL_BASE) + ic->ic_kernel_base_pa.
- * We are going to allocate our bootstrap pages upwards
- * from there.
- *
- * We need to allocate some fixed page tables to get the kernel
- * going. We allocate one page directory and a number of page
- * tables and store the physical addresses in the kernel_pt_table
- * array.
- *
- * The kernel page directory must be on a 16K boundary. The page
- * tables must be on 1K boundaries. What we do is allocate the
- * page directory on the first 16K boundary that we encounter, and
- * the page tables on 1K boundaries otherwise. Since we allocate
- * at least 12 L2 page tables, we are guaranteed to encounter at
- * least one 16K aligned region.
- */
-
-#ifdef VERBOSE_INIT_ARM
- printf("Allocating page tables\n");
-#endif
-
-#ifdef VERBOSE_INIT_ARM
- printf("freestart = 0x%08lx, avail = 0x%08lx\n",
- physical_freestart, avail);
-#endif
-
- /* Define a macro to simplify memory allocation */
-#define valloc_l2(var, nl2) \
- alloc_l2((var).pv_pa, (nl2)); \
- (var).pv_va = avail; \
- avail += ((nl2) * L2_TABLE_SIZE_REAL);
-#define alloc_l2(var, nl2) \
- if (physical_freestart >= physical_freeend) \
- panic("initarm: out of memory"); \
- (var) = physical_freestart; \
- physical_freestart += ((nl2) * L2_TABLE_SIZE_REAL); \
- memset((char *)(var), 0, ((nl2) * L2_TABLE_SIZE_REAL));
-
-#define valloc_pages(var, np) \
- valloc_l2(var, (np) * (PAGE_SIZE / L2_TABLE_SIZE_REAL))
-#define alloc_pages(var, np) \
- alloc_l2(var, (np) * (PAGE_SIZE / L2_TABLE_SIZE_REAL))
-
- /*
- * Burn some memory at the end of the kernel to hold ~85
- * pv_addr_t structures. This is more than sufficient to
- * track the page tables we'll be allocating here.
- */
- kernel_pt_table = (pv_addr_t *)avail;
- avail += L2_TABLE_SIZE_REAL;
- physical_freestart += L2_TABLE_SIZE_REAL;
-
- /*
- * Figure out how much space to allocate for page tables
- */
-#define round_sec(x) (((x) + L1_S_OFFSET) & L1_S_FRAME)
-
- ptcount_kernel = round_sec(avail - KERNEL_BASE) / L1_S_SIZE;
- ptcount_vmdata = 16; /* 16MB of KVM, initially */
- ptcount_fixed_io = round_sec(ic->ic_iosize) / L1_S_SIZE;
-
- ptcount_total =
- 1 + /* The System Page */
- ptcount_kernel + /* text/data */
- ptcount_vmdata + /* Initial kernel VM size */
- ptcount_fixed_io; /* Fixed I/O mappings */
-
- kernel_l1pt.pv_pa = 0;
Home |
Main Index |
Thread Index |
Old Index