Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Remove defopt EBSA285.
details: https://anonhg.NetBSD.org/src/rev/46eddc61dbf4
branches: trunk
changeset: 511516:46eddc61dbf4
user: chris <chris%NetBSD.org@localhost>
date: Wed Jun 20 22:14:32 2001 +0000
description:
Remove defopt EBSA285.
Move the files from footbridge that are cats specific.
Remove EBSA285 kernel as people should be able to use the generic cats kernel for EBSA285 systems.
diffstat:
sys/arch/arm/conf/files.footbridge | 6 +-
sys/arch/arm/footbridge/cyclone_boot.h | 66 --
sys/arch/arm/footbridge/ebsa285_machdep.c | 870 -----------------------------
sys/arch/arm/footbridge/footbridge_pci.c | 6 +-
sys/arch/arm32/conf/EBSA285 | 340 -----------
sys/arch/arm32/conf/files.arm32 | 3 +-
sys/arch/cats/cats/cats_machdep.c | 872 ++++++++++++++++++++++++++++++
sys/arch/cats/conf/GENERIC | 3 +-
sys/arch/cats/conf/INSTALL | 3 +-
sys/arch/cats/conf/files.cats | 6 +-
sys/arch/cats/include/cyclone_boot.h | 66 ++
sys/arch/netwinder/conf/files.netwinder | 3 +-
12 files changed, 948 insertions(+), 1296 deletions(-)
diffs (truncated from 2380 to 300 lines):
diff -r 71227f97b094 -r 46eddc61dbf4 sys/arch/arm/conf/files.footbridge
--- a/sys/arch/arm/conf/files.footbridge Wed Jun 20 19:56:35 2001 +0000
+++ b/sys/arch/arm/conf/files.footbridge Wed Jun 20 22:14:32 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.footbridge,v 1.4 2001/06/12 17:10:25 matt Exp $
+# $NetBSD: files.footbridge,v 1.5 2001/06/20 22:14:35 chris Exp $
#
# Shared footbridge files information
@@ -23,7 +23,3 @@
file arch/arm/footbridge/footbridge_com.c fcom needs-flag
file arch/arm/footbridge/footbridge_com_io.c fcom
file arch/arm/footbridge/footbridge_com_io_asm.S fcom
-
-# EBSA285/CATS class board
-# DC21285 based board with cyclone firmware
-file arch/arm/footbridge/ebsa285_machdep.c footbridge & ebsa285
diff -r 71227f97b094 -r 46eddc61dbf4 sys/arch/arm/footbridge/cyclone_boot.h
--- a/sys/arch/arm/footbridge/cyclone_boot.h Wed Jun 20 19:56:35 2001 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-/* $NetBSD: cyclone_boot.h,v 1.1 2001/06/09 10:29:12 chris Exp $ */
-
-/*
- * 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.
- * 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.
- */
-
-/*
- * Define the boot structure that is passed to the kernel
- * from the cyclone firmware.
- *
- * The bootloader reserves a page for boot argument info.
- * This page will contain the ebsaboot structure and the
- * kernel argument string.
- */
-
-struct ebsaboot {
- u_int32_t bt_magic; /* boot info magic number */
- u_int32_t bt_vargp; /* virtual addr of arg page */
- u_int32_t bt_pargp; /* physical addr of arg page */
- const char * bt_args; /* kernel args string pointer */
- pd_entry_t * bt_l1; /* active L1 page table */
- u_int32_t bt_memstart; /* start of physical memory */
- u_int32_t bt_memend; /* end of physical memory */
- u_int32_t bt_memavail; /* start of avail phys memory */
- u_int32_t bt_fclk; /* fclk frequency */
- u_int32_t bt_pciclk; /* PCI bus frequency */
- u_int32_t bt_vers; /* structure version (CATS) */
- u_int32_t bt_features; /* feature mask (CATS) */
-};
-
-#define BT_MAGIC_NUMBER_EBSA 0x45425341
-#define BT_MAGIC_NUMBER_CATS 0x43415453
-
-#define BT_BOOT_VERSION_OLD 0
-#define BT_BOOT_VERSION_NEW 1
-
-/* End of cyclone_boot.h */
diff -r 71227f97b094 -r 46eddc61dbf4 sys/arch/arm/footbridge/ebsa285_machdep.c
--- a/sys/arch/arm/footbridge/ebsa285_machdep.c Wed Jun 20 19:56:35 2001 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,870 +0,0 @@
-/* $NetBSD: ebsa285_machdep.c,v 1.4 2001/06/19 13:45:55 wiz Exp $ */
-
-/*
- * 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.
- *
- * Machine dependant functions for kernel setup for EBSA285 core architecture
- * using cyclone firmware
- *
- * Created : 24/11/97
- */
-
-#include "opt_ddb.h"
-#include "opt_pmap_debug.h"
-
-#include <sys/param.h>
-#include <sys/device.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/exec.h>
-#include <sys/proc.h>
-#include <sys/msgbuf.h>
-#include <sys/reboot.h>
-#include <sys/termios.h>
-
-#include <dev/cons.h>
-
-#include <machine/db_machdep.h>
-#include <ddb/db_sym.h>
-#include <ddb/db_extern.h>
-
-#include <machine/bootconfig.h>
-#include <machine/bus.h>
-#include <machine/cpu.h>
-#include <machine/frame.h>
-#include <machine/irqhandler.h>
-#include <machine/pte.h>
-#include <machine/undefined.h>
-
-#include <arm/footbridge/cyclone_boot.h>
-#include <arm/footbridge/dc21285mem.h>
-#include <arm/footbridge/dc21285reg.h>
-
-#include "opt_ipkdb.h"
-
-#include "isa.h"
-#if NISA > 0
-#include <dev/isa/isareg.h>
-#include <dev/isa/isavar.h>
-#endif
-
-#define VERBOSE_INIT_ARM
-
-/*
- * Address to call from cpu_reset() to reset the machine.
- * This is machine architecture dependant as it varies depending
- * on where the ROM appears when you turn the MMU off.
- */
-
-u_int cpu_reset_address = DC21285_ROM_BASE;
-
-u_int dc21285_fclk = FCLK;
-
-/* Define various stack sizes in pages */
-#define IRQ_STACK_SIZE 1
-#define ABT_STACK_SIZE 1
-#ifdef IPKDB
-#define UND_STACK_SIZE 2
-#else
-#define UND_STACK_SIZE 1
-#endif
-
-struct ebsaboot ebsabootinfo;
-BootConfig bootconfig; /* Boot config storage */
-static char bootargs[MAX_BOOT_STRING + 1];
-char *boot_args = NULL;
-char *boot_file = NULL;
-
-vm_offset_t physical_start;
-vm_offset_t physical_freestart;
-vm_offset_t physical_freeend;
-vm_offset_t physical_end;
-u_int free_pages;
-vm_offset_t pagetables_start;
-int physmem = 0;
-
-/*int debug_flags;*/
-#ifndef PMAP_STATIC_L1S
-int max_processes = 64; /* Default number */
-#endif /* !PMAP_STATIC_L1S */
-
-/* Physical and virtual addresses for some global pages */
-pv_addr_t systempage;
-pv_addr_t irqstack;
-pv_addr_t undstack;
-pv_addr_t abtstack;
-pv_addr_t kernelstack;
-
-vm_offset_t msgbufphys;
-
-extern u_int data_abort_handler_address;
-extern u_int prefetch_abort_handler_address;
-extern u_int undefined_handler_address;
-
-#ifdef PMAP_DEBUG
-extern int pmap_debug_level;
-#endif
-
-#define KERNEL_PT_SYS 0 /* Page table for mapping proc0 zero page */
-#define KERNEL_PT_KERNEL 1 /* Page table for mapping kernel */
-#define KERNEL_PT_VMDATA 2 /* Page tables for mapping kernel VM */
-#define KERNEL_PT_VMDATA_NUM (KERNEL_VM_SIZE >> (PDSHIFT + 2))
-#define NUM_KERNEL_PTS (KERNEL_PT_VMDATA + KERNEL_PT_VMDATA_NUM)
-
-pt_entry_t kernel_pt_table[NUM_KERNEL_PTS];
-
-struct user *proc0paddr;
-
-/* Prototypes */
-
-void consinit __P((void));
-
-int fcomcnattach __P((u_int iobase, int rate,tcflag_t cflag));
-int fcomcndetach __P((void));
-
-void isa_cats_init __P((u_int iobase, u_int membase));
-
-void map_section __P((vm_offset_t pt, vm_offset_t va, vm_offset_t pa,
- int cacheable));
-void map_pagetable __P((vm_offset_t pt, vm_offset_t va, vm_offset_t pa));
-void map_entry __P((vm_offset_t pt, vm_offset_t va, vm_offset_t pa));
-void map_entry_nc __P((vm_offset_t pt, vm_offset_t va, vm_offset_t pa));
-void map_entry_ro __P((vm_offset_t pt, vm_offset_t va, vm_offset_t pa));
-vm_size_t map_chunk __P((vm_offset_t pd, vm_offset_t pt, vm_offset_t va,
- vm_offset_t pa, vm_size_t size, u_int acc,
- u_int flg));
-
-void process_kernel_args __P((char *));
-void data_abort_handler __P((trapframe_t *frame));
-void prefetch_abort_handler __P((trapframe_t *frame));
-void undefinedinstruction_bounce __P((trapframe_t *frame));
-void zero_page_readonly __P((void));
-void zero_page_readwrite __P((void));
-extern void configure __P((void));
-extern void db_machine_init __P((void));
-extern void parse_mi_bootargs __P((char *args));
-extern void dumpsys __P((void));
-
-/* A load of console goo. */
-#include "vga.h"
-#if (NVGA > 0)
-#include <dev/ic/mc6845reg.h>
-#include <dev/ic/pcdisplayvar.h>
-#include <dev/ic/vgareg.h>
-#include <dev/ic/vgavar.h>
-#endif
-
-#include "pckbc.h"
-#if (NPCKBC > 0)
-#include <dev/ic/i8042reg.h>
-#include <dev/ic/pckbcvar.h>
-#endif
-
-#include "com.h"
-#if (NCOM > 0)
-#include <dev/ic/comreg.h>
-#include <dev/ic/comvar.h>
-#ifndef CONCOMADDR
-#define CONCOMADDR 0x3f8
-#endif
-#endif
-
-#ifndef CONSDEVNAME
-#define CONSDEVNAME "vga"
-#endif
-
-#define CONSPEED B38400
-#ifndef CONSPEED
-#define CONSPEED B9600 /* TTYDEF_SPEED */
-#endif
Home |
Main Index |
Thread Index |
Old Index