[src/trunk]: src/sys/arch/evbarm These have been moved to evbarm/awin or conf...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/arch/evbarm These have been moved to evbarm/awin or conf...
From: matt <matt%NetBSD.org@localhost>
Date: Tue, 31 Jul 2018 18:46:04 +0000
details:   https://anonhg.NetBSD.org/src/rev/8a708a3a159e
branches:  trunk
changeset: 331927:8a708a3a159e
user:      matt <matt%NetBSD.org@localhost>
date:      Sun Aug 31 19:14:33 2014 +0000

description:
These have been moved to evbarm/awin or conf/*.awin

diffstat:

 sys/arch/evbarm/conf/files.cubie      |   12 -
 sys/arch/evbarm/conf/mk.cubie         |   40 --
 sys/arch/evbarm/conf/std.cubie        |   29 -
 sys/arch/evbarm/cubie/cubie_machdep.c |  655 ----------------------------------
 sys/arch/evbarm/cubie/cubie_start.S   |  280 --------------
 sys/arch/evbarm/cubie/genassym.cf     |   38 -
 sys/arch/evbarm/cubie/platform.h      |   54 --
 7 files changed, 0 insertions(+), 1108 deletions(-)

diffs (truncated from 1136 to 300 lines):

diff -r c8fa69992106 -r 8a708a3a159e sys/arch/evbarm/conf/files.cubie
--- a/sys/arch/evbarm/conf/files.cubie  Sun Aug 31 19:13:01 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-#      $NetBSD: files.cubie,v 1.1 2013/09/03 06:12:00 matt Exp $
-#
-# CUBIEBOARD evaluation board configuration info
-#
-
-file   arch/evbarm/cubie/cubie_machdep.c
-
-# Kernel boot arguments
-defparam opt_machdep.h                         BOOT_ARGS
-
-# CPU support and integrated peripherals
-include "arch/arm/allwinner/files.awin"
diff -r c8fa69992106 -r 8a708a3a159e sys/arch/evbarm/conf/mk.cubie
--- a/sys/arch/evbarm/conf/mk.cubie     Sun Aug 31 19:13:01 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-#      $NetBSD: mk.cubie,v 1.4 2014/08/29 07:29:07 matt Exp $
-CPPFLAGS+= -mcpu=cortex-a8 -mfpu=neon
-
-.if !empty(MACHINE_ARCH:M*eb)
-EXTRA_LINKFLAGS+=      --be8
-.endif
-
-SYSTEM_FIRST_OBJ=      cubie_start.o
-SYSTEM_FIRST_SFILE=    ${THISARM}/cubie/cubie_start.S
-
-COPTS.cubie_machdep.c+=        -DBOARDTYPE=${BOARDTYPE}
-
-GENASSYM_EXTRAS+=      ${THISARM}/cubie/genassym.cf
-
-_OSRELEASE!=           ${HOST_SH} $S/conf/osrelease.sh
-
-KERNEL_BASE_PHYS?=$(LOADADDRESS)
-KERNEL_BASE_VIRT?=$(LOADADDRESS)
-
-MKUBOOTIMAGEARGS=      -A arm -T kernel
-MKUBOOTIMAGEARGS+=     -a $(KERNEL_BASE_PHYS) -e $(KERNEL_BASE_PHYS)
-MKUBOOTIMAGEARGS+=     -n "NetBSD/$(BOARDTYPE) ${_OSRELEASE}"
-MKUBOOTIMAGEARGS_NONE= ${MKUBOOTIMAGEARGS} -C none
-MKUBOOTIMAGEARGS_GZ=   ${MKUBOOTIMAGEARGS} -C gz
-
-SYSTEM_LD_TAIL_EXTRA+=; \
-       echo ${OBJCOPY} -S -O binary $@ $@.bin; \
-       ${OBJCOPY} -S -O binary $@ $@.bin; \
-       echo ${TOOL_GZIP} -9c $@.bin > $@.bin.gz; \
-       ${TOOL_GZIP} -9c $@.bin > $@.bin.gz; \
-       echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.gz.ub; \
-       ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.gz.ub; \
-       echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_NONE} $@.bin $@.ub; \
-       ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_NONE} $@.bin $@.ub; \
-       echo
-
-EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin@}
-EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.ub@}
-EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin.gz@}
-EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.gz.ub@}
diff -r c8fa69992106 -r 8a708a3a159e sys/arch/evbarm/conf/std.cubie
--- a/sys/arch/evbarm/conf/std.cubie    Sun Aug 31 19:13:01 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-#      $NetBSD: std.cubie,v 1.4 2014/08/24 07:59:22 jnemeth Exp $
-#
-# standard NetBSD/evbarm for CUBIEBOARD options
-
-machine        evbarm arm
-include        "arch/evbarm/conf/std.evbarm"
-
-# Pull in CUBIEBOARD config definitions.
-include                "arch/evbarm/conf/files.cubie"
-
-# To support easy transit to ../arch/arm/arm32
-options        MODULAR
-options        MODULAR_DEFAULT_AUTOLOAD
-options        __HAVE_CPU_COUNTER
-options        CORTEX_PMC
-options        __HAVE_FAST_SOFTINTS            # should be in types.h
-options        ARM_HAS_VBAR
-options        __HAVE_MM_MD_DIRECT_MAPPED_PHYS
-options        TPIDRPRW_IS_CURCPU
-options        KERNEL_BASE_EXT=0x80000000
-options        FPU_VFP
-
-makeoptions    KERNEL_BASE_PHYS="0x40007800"
-makeoptions    KERNEL_BASE_VIRT="0x80007800"
-makeoptions    BOARDTYPE="cubie"
-makeoptions    BOARDMKFRAG="${THISARM}/conf/mk.cubie"
-
-options        ARM_INTR_IMPL="<arch/arm/allwinner/awin_intr.h>"
-options                ARM_GENERIC_TODR
diff -r c8fa69992106 -r 8a708a3a159e sys/arch/evbarm/cubie/cubie_machdep.c
--- a/sys/arch/evbarm/cubie/cubie_machdep.c     Sun Aug 31 19:13:01 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,655 +0,0 @@
-/*     $NetBSD: cubie_machdep.c,v 1.21 2014/08/29 07:29:07 matt 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,
- * 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: cubie_machdep.c,v 1.21 2014/08/29 07:29:07 matt Exp $");
-
-#include "opt_machdep.h"
-#include "opt_ddb.h"
-#include "opt_kgdb.h"
-#include "opt_ipkdb.h"
-#include "opt_md.h"
-#include "opt_com.h"
-#include "opt_allwinner.h"
-#include "opt_arm_debug.h"
-
-#include "com.h"
-#include "ukbd.h"
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/bus.h>
-#include <sys/cpu.h>
-#include <sys/device.h>
-#include <sys/exec.h>
-#include <sys/kernel.h>
-#include <sys/ksyms.h>
-#include <sys/msgbuf.h>
-#include <sys/proc.h>
-#include <sys/reboot.h>
-#include <sys/termios.h>
-#include <sys/gpio.h>
-
-#include <uvm/uvm_extern.h>
-
-#include <sys/conf.h>
-#include <dev/cons.h>
-#include <dev/md.h>
-
-#include <machine/db_machdep.h>
-#include <ddb/db_sym.h>
-#include <ddb/db_extern.h>
-#ifdef KGDB
-#include <sys/kgdb.h>
-#endif
-
-#include <machine/bootconfig.h>
-#include <arm/armreg.h>
-#include <arm/undefined.h>
-
-#include <arm/arm32/machdep.h>
-#include <arm/mainbus/mainbus.h>
-
-#include <dev/ic/ns16550reg.h>
-#include <dev/ic/comreg.h>
-
-#include <arm/allwinner/awin_reg.h>
-#include <arm/allwinner/awin_var.h>
-
-#include <evbarm/include/autoconf.h>
-#include <evbarm/cubie/platform.h>
-
-#include <dev/i2c/i2cvar.h>
-#include <dev/i2c/ddcreg.h>
-
-#include <dev/usb/ukbdvar.h>
-#include <net/if_ether.h>
-
-BootConfig bootconfig;         /* Boot config storage */
-static char bootargs[MAX_BOOT_STRING];
-char *boot_args = NULL;
-char *boot_file = NULL;
-static uint8_t uboot_enaddr[ETHER_ADDR_LEN];
-
-bool cubietruck_p;
-/*
- * uboot_args are filled in by cubie_start.S and must be in .data
- * and not .bss since .bss is cleared after uboot_args are filled in.
- */
-uintptr_t uboot_args[4] = { 0 };
-
Prev by Date: [src/trunk]: src/sys/dev/pci Add Samsung Electronics XP941 M.2 SSD
Next by Date: [src/trunk]: src/tests/net/mpls The t_ldp_regen test frequently fails under q...
Previous by Thread: [src/trunk]: src/sys/dev/pci Add Samsung Electronics XP941 M.2 SSD
Next by Thread: [src/trunk]: src/tests/net/mpls The t_ldp_regen test frequently fails under q...
Indexes:
Home | Main Index | Thread Index | Old Index