[src/trunk]: src/sys/arch Get rid of board-specific options.

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/567cc868176d
branches:  trunk
changeset: 812409:567cc868176d
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Dec 13 22:55:05 2015 +0000

description:
Get rid of board-specific options.

diffstat:

 sys/arch/arm/nvidia/files.tegra       |  7 +------
 sys/arch/evbarm/tegra/tegra_machdep.c |  8 ++------
 sys/arch/evbarm/tegra/tegra_start.S   |  6 ++----
 3 files changed, 5 insertions(+), 16 deletions(-)

diffs (91 lines):

diff -r d06d4b656b34 -r 567cc868176d sys/arch/arm/nvidia/files.tegra
--- a/sys/arch/arm/nvidia/files.tegra   Sun Dec 13 22:28:09 2015 +0000
+++ b/sys/arch/arm/nvidia/files.tegra   Sun Dec 13 22:55:05 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.tegra,v 1.26 2015/12/13 21:24:06 jmcneill Exp $
+#      $NetBSD: files.tegra,v 1.27 2015/12/13 22:55:05 jmcneill Exp $
 #
 # Configuration info for NVIDIA Tegra ARM Peripherals
 #
@@ -146,8 +146,3 @@
 # SOC parameters
 defflag        opt_tegra.h                     SOC_TEGRAK1
 defflag        opt_tegra.h                     SOC_TEGRA124: SOC_TEGRAK1
-
-# Board parameters
-defflag opt_tegra.h                    TEGRA_UBOOT
-defflag        opt_tegra.h                     BOARD_JETSONTK1: TEGRA_UBOOT
-defflag opt_tegra.h                    BOARD_NYAN_BIG
diff -r d06d4b656b34 -r 567cc868176d sys/arch/evbarm/tegra/tegra_machdep.c
--- a/sys/arch/evbarm/tegra/tegra_machdep.c     Sun Dec 13 22:28:09 2015 +0000
+++ b/sys/arch/evbarm/tegra/tegra_machdep.c     Sun Dec 13 22:55:05 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_machdep.c,v 1.34 2015/12/13 17:39:19 jmcneill Exp $ */
+/* $NetBSD: tegra_machdep.c,v 1.35 2015/12/13 22:55:05 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_machdep.c,v 1.34 2015/12/13 17:39:19 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_machdep.c,v 1.35 2015/12/13 22:55:05 jmcneill Exp $");
 
 #include "opt_tegra.h"
 #include "opt_machdep.h"
@@ -101,9 +101,7 @@
 BootConfig bootconfig;
 char bootargs[TEGRA_MAX_BOOT_STRING] = "";
 char *boot_args = NULL;
-#ifdef TEGRA_UBOOT
 u_int uboot_args[4] = { 0 };   /* filled in by tegra_start.S (not in bss) */
-#endif
 
 #include <libfdt.h>
 #include <dev/fdt/fdt_openfirm.h>
@@ -247,10 +245,8 @@
 
        DPRINTF(" ok\n");
 
-#ifdef TEGRA_UBOOT
        DPRINTF("uboot: args %#x, %#x, %#x, %#x\n",
            uboot_args[0], uboot_args[1], uboot_args[2], uboot_args[3]);
-#endif
 
        cpu_reset_address = tegra_reset;
        cpu_powerdown_address = tegra_powerdown;
diff -r d06d4b656b34 -r 567cc868176d sys/arch/evbarm/tegra/tegra_start.S
--- a/sys/arch/evbarm/tegra/tegra_start.S       Sun Dec 13 22:28:09 2015 +0000
+++ b/sys/arch/evbarm/tegra/tegra_start.S       Sun Dec 13 22:55:05 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_start.S,v 1.8 2015/12/13 17:39:19 jmcneill Exp $ */
+/* $NetBSD: tegra_start.S,v 1.9 2015/12/13 22:55:05 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2014, 2015 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
 #include <arm/nvidia/tegra_reg.h>
 #include <evbarm/tegra/platform.h>
 
-RCSID("$NetBSD: tegra_start.S,v 1.8 2015/12/13 17:39:19 jmcneill Exp $")
+RCSID("$NetBSD: tegra_start.S,v 1.9 2015/12/13 22:55:05 jmcneill Exp $")
 
 #if defined(VERBOSE_INIT_ARM)
 #define        XPUTC(n)        mov r0, n; bl xputc
@@ -92,7 +92,6 @@
        /* Move into supervisor mode and disable IRQs/FIQs. */
        cpsid   if, #PSR_SVC32_MODE
 
-#ifdef TEGRA_UBOOT
        /*
         * Save any arguments passed to us.
         */
@@ -101,7 +100,6 @@
        sub     r4, r4, #KERNEL_BASE_VOFFSET
 
        stmia   r4, {r0-r3}             // Save the arguments
-#endif
 
        /*
         * Turn on the SMP bit