Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/evbarm Retire arch/evbarm/beagle.



details:   https://anonhg.NetBSD.org/src/rev/0bffca931ecd
branches:  trunk
changeset: 372160:0bffca931ecd
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Oct 29 08:33:45 2022 +0000

description:
Retire arch/evbarm/beagle.

A few more kernel configs go away:

- OMAP5EVM and PANDABOARD likely never worked to begin with.
- N900 and VTC100 are TI AM335x based, which is supported by GENERIC.

diffstat:

 sys/arch/evbarm/Makefile                |     4 +-
 sys/arch/evbarm/beagle/beagle.h         |   150 ---
 sys/arch/evbarm/beagle/beagle_machdep.c |  1267 -------------------------------
 sys/arch/evbarm/conf/N900               |   325 -------
 sys/arch/evbarm/conf/OMAP5EVM           |   296 -------
 sys/arch/evbarm/conf/PANDABOARD         |   289 -------
 sys/arch/evbarm/conf/README.evbarm      |     5 +-
 sys/arch/evbarm/conf/VTC100             |   304 -------
 sys/arch/evbarm/conf/files.beagle       |    20 -
 sys/arch/evbarm/conf/files.n900         |    52 -
 sys/arch/evbarm/conf/mk.beagle          |    38 -
 sys/arch/evbarm/conf/std.beagle         |    29 -
 sys/arch/evbarm/conf/std.n900           |    26 -
 sys/arch/evbarm/n900/n900_acad.c        |   191 ----
 sys/arch/evbarm/n900/n900_audjck.c      |   201 ----
 sys/arch/evbarm/n900/n900_cambtn.c      |   238 -----
 sys/arch/evbarm/n900/n900_camcvr.c      |   194 ----
 sys/arch/evbarm/n900/n900_kbdsld.c      |   193 ----
 sys/arch/evbarm/n900/n900_lckbtn.c      |   198 ----
 sys/arch/evbarm/n900/n900_prxmty.c      |   193 ----
 20 files changed, 2 insertions(+), 4211 deletions(-)

diffs (truncated from 4332 to 300 lines):

diff -r 040464722f9e -r 0bffca931ecd sys/arch/evbarm/Makefile
--- a/sys/arch/evbarm/Makefile  Sat Oct 29 08:29:28 2022 +0000
+++ b/sys/arch/evbarm/Makefile  Sat Oct 29 08:33:45 2022 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.11 2022/10/28 20:37:04 jmcneill Exp $
+#      $NetBSD: Makefile,v 1.12 2022/10/29 08:33:45 jmcneill Exp $
 
 # Makefile for evbarm tags file and boot blocks
 
@@ -8,7 +8,6 @@
 TEVBARM=       ${SYSDIR}/arch/evbarm/tags
 SEVBARM=       ${SYSDIR}/arch/evbarm/adi_brh/*.[ch]
 SEVBARM+=      ${SYSDIR}/arch/evbarm/armadillo/*.[ch]
-SEVBARM+=      ${SYSDIR}/arch/evbarm/beagle/*.[ch]
 SEVBARM+=      ${SYSDIR}/arch/evbarm/cp3100/*.[ch]
 SEVBARM+=      ${SYSDIR}/arch/evbarm/dev/*.[ch]
 SEVBARM+=      ${SYSDIR}/arch/evbarm/devkit8000/*.[ch]
@@ -43,7 +42,6 @@
 
 AEVBARM=       ${SYSDIR}/arch/evbarm/adi_brh/*.S
 AEVBARM+=      ${SYSDIR}/arch/evbarm/armadillo/*.S
-AEVBARM+=      ${SYSDIR}/arch/evbarm/beagle/*.S
 AEVBARM+=      ${SYSDIR}/arch/evbarm/g42xxeb/*.S
 AEVBARM+=      ${SYSDIR}/arch/evbarm/gemini/*.S
 AEVBARM+=      ${SYSDIR}/arch/evbarm/gumstix/*.S
diff -r 040464722f9e -r 0bffca931ecd sys/arch/evbarm/beagle/beagle.h
--- a/sys/arch/evbarm/beagle/beagle.h   Sat Oct 29 08:29:28 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,150 +0,0 @@
-/*     $NetBSD: beagle.h,v 1.13 2013/06/18 15:39:19 matt Exp $ */
-/*
- * Copyright (c) 2007 Microsoft
- * 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 Microsoft
- *
- * 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 CONTRIBUTERS 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.
- */
-
-#ifndef _EVBARM_BEAGLE_BEAGLE_H
-#define _EVBARM_BEAGLE_BEAGLE_H
-
-#include <arm/omap/omap2_reg.h>
-
-/*
- * Memory will mapped 1:1 VA:PA starting at 0x80000000
- * Kernel VM space: 512MB at KERNEL_VM_BASE
- */
-#define KERNEL_VM_BASE         0xc0000000
-#define KERNEL_VM_SIZE         0x20000000
-
-#ifdef OMAP_3430
-#define OMAP_L4_CORE_BASE              OMAP3430_L4_CORE_BASE
-#define OMAP_L4_CORE_SIZE              OMAP3430_L4_CORE_SIZE
-#define OMAP_L4_PERIPHERAL_BASE                OMAP3430_L4_PERIPHERAL_BASE
-#define OMAP_L4_PERIPHERAL_SIZE                OMAP3430_L4_PERIPHERAL_SIZE
-#define OMAP_L4_WAKEUP_BASE            OMAP3430_L4_WAKEUP_BASE
-#define OMAP_L4_WAKEUP_SIZE            OMAP3430_L4_WAKEUP_SIZE
-#define OMAP_SDRC_BASE                 OMAP3530_SDRC_BASE
-#define OMAP_SDRC_SIZE                 OMAP3530_SDRC_SIZE
-#endif
-
-#ifdef OMAP_3530
-#define OMAP_L4_CORE_BASE              OMAP3530_L4_CORE_BASE
-#define OMAP_L4_CORE_SIZE              OMAP3530_L4_CORE_SIZE
-#define OMAP_L4_PERIPHERAL_BASE                OMAP3530_L4_PERIPHERAL_BASE
-#define OMAP_L4_PERIPHERAL_SIZE                OMAP3530_L4_PERIPHERAL_SIZE
-#define OMAP_L4_WAKEUP_BASE            OMAP3530_L4_WAKEUP_BASE
-#define OMAP_L4_WAKEUP_SIZE            OMAP3530_L4_WAKEUP_SIZE
-#define OMAP_SDRC_BASE                 OMAP3530_SDRC_BASE
-#define OMAP_SDRC_SIZE                 OMAP3530_SDRC_SIZE
-#endif
-
-#ifdef OMAP_4XXX
-#define OMAP_L4_CORE_BASE              OMAP4430_L4_CORE_BASE
-#define OMAP_L4_CORE_SIZE              OMAP4430_L4_CORE_SIZE
-#define OMAP_L4_PERIPHERAL_BASE                OMAP4430_L4_PERIPHERAL_BASE
-#define OMAP_L4_PERIPHERAL_SIZE                OMAP4430_L4_PERIPHERAL_SIZE
-#define OMAP_L4_WAKEUP_BASE            OMAP4430_L4_WAKEUP_BASE
-#define OMAP_L4_WAKEUP_SIZE            OMAP4430_L4_WAKEUP_SIZE
-#define OMAP_L4_ABE_BASE               OMAP4430_L4_ABE_BASE
-#define OMAP_L4_ABE_SIZE               OMAP4430_L4_ABE_SIZE
-#define OMAP_EMIF1_BASE                        OMAP4430_EMIF1_BASE
-#define OMAP_EMIF1_SIZE                        OMAP4430_EMIF1_SIZE
-#define OMAP_EMIF2_BASE                        OMAP4430_EMIF2_BASE
-#define OMAP_EMIF2_SIZE                        OMAP4430_EMIF2_SIZE
-#endif
-
-#ifdef OMAP_5XXX
-#define OMAP_L4_CORE_BASE              OMAP5430_L4_CORE_BASE
-#define OMAP_L4_CORE_SIZE              OMAP5430_L4_CORE_SIZE
-#define OMAP_L4_PERIPHERAL_BASE                OMAP5430_L4_PERIPHERAL_BASE
-#define OMAP_L4_PERIPHERAL_SIZE                OMAP5430_L4_PERIPHERAL_SIZE
-#define OMAP_L4_WAKEUP_BASE            OMAP5430_L4_WAKEUP_BASE
-#define OMAP_L4_WAKEUP_SIZE            OMAP5430_L4_WAKEUP_SIZE
-#define OMAP_L4_ABE_BASE               OMAP5430_L4_ABE_BASE
-#define OMAP_L4_ABE_SIZE               OMAP5430_L4_ABE_SIZE
-#define OMAP_EMIF1_BASE                        OMAP5430_EMIF1_BASE
-#define OMAP_EMIF1_SIZE                        OMAP5430_EMIF1_SIZE
-#define OMAP_EMIF2_BASE                        OMAP5430_EMIF2_BASE
-#define OMAP_EMIF2_SIZE                        OMAP5430_EMIF2_SIZE
-#endif
-
-#ifdef TI_AM335X
-#define OMAP_L4_CORE_BASE              TI_AM335X_L4_WAKEUP_BASE
-#define OMAP_L4_CORE_SIZE              TI_AM335X_L4_WAKEUP_SIZE
-#define OMAP_L4_PERIPHERAL_BASE                TI_AM335X_L4_PERIPHERAL_BASE
-#define OMAP_L4_PERIPHERAL_SIZE                TI_AM335X_L4_PERIPHERAL_SIZE
-#define OMAP_L4_FAST_BASE              TI_AM335X_L4_FAST_BASE
-#define OMAP_L4_FAST_SIZE              TI_AM335X_L4_FAST_SIZE
-#define OMAP_EMIF1_BASE                        TI_AM335X_EMIF1_BASE
-#define OMAP_EMIF1_SIZE                        TI_AM335X_EMIF1_SIZE
-#endif
-
-#ifdef TI_DM37XX
-#define OMAP_L4_CORE_BASE              TI_DM37XX_L4_CORE_BASE
-#define OMAP_L4_CORE_SIZE              TI_DM37XX_L4_CORE_SIZE
-#define OMAP_L4_PERIPHERAL_BASE                TI_DM37XX_L4_PERIPHERAL_BASE
-#define OMAP_L4_PERIPHERAL_SIZE                TI_DM37XX_L4_PERIPHERAL_SIZE
-#define OMAP_L4_WAKEUP_BASE            TI_DM37XX_L4_WAKEUP_BASE
-#define OMAP_L4_WAKEUP_SIZE            TI_DM37XX_L4_WAKEUP_SIZE
-#endif
-
-/*
- * We devmap IO starting at KERNEL_VM_BASE + KERNEL_VM_SIZE
- */
-#define OMAP_KERNEL_IO_VBASE   (KERNEL_VM_BASE + KERNEL_VM_SIZE)
-#if defined(OMAP_3XXX)
-#define OMAP_L4_CORE_VBASE     OMAP_KERNEL_IO_VBASE
-#define OMAP_L4_PERIPHERAL_VBASE       (OMAP_L4_CORE_VBASE + OMAP_L4_CORE_SIZE)
-#define OMAP_L4_WAKEUP_VBASE   (OMAP_L4_PERIPHERAL_VBASE + OMAP_L4_PERIPHERAL_SIZE)
-#define OMAP_SDRC_VBASE                (OMAP_L4_WAKEUP_VBASE + OMAP_L4_WAKEUP_SIZE)
-#define OMAP_KERNEL_IO_VEND    (OMAP_SDRC_VBASE + OMAP_SDRC_SIZE)
-#define CONSADDR_VA    ((CONSADDR - OMAP_L4_PERIPHERAL_BASE) + OMAP_L4_PERIPHERAL_VBASE)
-#elif defined(OMAP_4XXX) || defined(OMAP_5XXX)
-#define OMAP_L4_CORE_VBASE     OMAP_KERNEL_IO_VBASE
-#define OMAP_L4_PERIPHERAL_VBASE (OMAP_L4_CORE_VBASE + OMAP_L4_CORE_SIZE)
-#define OMAP_L4_ABE_VBASE      (OMAP_L4_PERIPHERAL_VBASE + OMAP_L4_PERIPHERAL_SIZE)
-#define OMAP_EMIF1_VBASE       (OMAP_L4_ABE_VBASE + OMAP_L4_ABE_SIZE)
-#define OMAP_EMIF2_VBASE       (OMAP_EMIF1_VBASE + OMAP_EMIF1_SIZE)
-#define OMAP_KERNEL_IO_VEND    (OMAP_EMIF2_VBASE + OMAP_EMIF2_SIZE)
-#define CONSADDR_VA    ((CONSADDR - OMAP_L4_PERIPHERAL_BASE) + OMAP_L4_PERIPHERAL_VBASE)
-#elif defined(TI_AM335X)
-#define OMAP_L4_PERIPHERAL_VBASE       OMAP_KERNEL_IO_VBASE
-#define OMAP_L4_FAST_VBASE     (OMAP_L4_PERIPHERAL_VBASE + OMAP_L4_PERIPHERAL_SIZE)
-#define OMAP_EMIF1_VBASE       (OMAP_L4_FAST_VBASE + OMAP_L4_FAST_SIZE)
-#define OMAP_L4_CORE_VBASE     (OMAP_EMIF1_VBASE + OMAP_EMIF1_SIZE)
-#define OMAP_KERNEL_IO_VEND    (OMAP_L4_CORE_VBASE + OMAP_L4_CORE_SIZE)
-#define CONSADDR_VA    ((CONSADDR - OMAP_L4_CORE_BASE) + OMAP_L4_CORE_VBASE)
-#elif defined(TI_DM37XX)
-#define OMAP_L4_CORE_VBASE     OMAP_KERNEL_IO_VBASE
-#define OMAP_L4_PERIPHERAL_VBASE       (OMAP_L4_CORE_VBASE + OMAP_L4_CORE_SIZE)
-#define OMAP_KERNEL_IO_VEND    (OMAP_L4_PERIPHERAL_VBASE + OMAP_L4_PERIPHERAL_SIZE)
-#define CONSADDR_VA    ((CONSADDR - OMAP_L4_PERIPHERAL_BASE) + OMAP_L4_PERIPHERAL_VBASE)
-#else
-#error unknown OMAP variant
-#endif
-
-#endif /* _EVBARM_BEAGLE_BEAGLE_H */
diff -r 040464722f9e -r 0bffca931ecd sys/arch/evbarm/beagle/beagle_machdep.c
--- a/sys/arch/evbarm/beagle/beagle_machdep.c   Sat Oct 29 08:29:28 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1267 +0,0 @@
-/*     $NetBSD: beagle_machdep.c,v 1.87 2021/03/20 05:58:22 skrll Exp $ */
-
-/*
- * Machine dependent functions for kernel setup for TI OSK5912 board.
- * Based on lubbock_machdep.c which in turn was based on iq80310_machhdep.c
- *
- * Copyright (c) 2002, 2003, 2005  Genetec Corporation.  All rights reserved.
- * Written by Hiroyuki Bessho for Genetec Corporation.
- *
- * 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. The name of Genetec Corporation may not be used to endorse or
- *    promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY GENETEC CORPORATION ``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 GENETEC CORPORATION
- * 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) 2001 Wasabi Systems, Inc.
- * All rights reserved.
- *
- * Written by Jason R. Thorpe 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.
- *
- * Copyright (c) 2007 Microsoft
- * 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 Microsoft
- *
- * 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 CONTRIBUTERS BE LIABLE FOR ANY DIRECT,



Home | Main Index | Thread Index | Old Index