Sat Apr 11 13:37:59 2015 UTC ()
Handle boot option -x (alias 'debug') and set AB_DEBUG in boothowto.


(bouyer)
diff -r1.108 -r1.109 src/sys/arch/arm/arm32/arm32_machdep.c
cvs diff -r1.108 -r1.109 src/sys/arch/arm/arm32/arm32_machdep.c (expand / switch to unified diff)

--- src/sys/arch/arm/arm32/arm32_machdep.c 2014/11/19 10:01:50 1.108
+++ src/sys/arch/arm/arm32/arm32_machdep.c 2015/04/11 13:37:59 1.109
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: arm32_machdep.c,v 1.108 2014/11/19 10:01:50 martin Exp $ */ 1/* $NetBSD: arm32_machdep.c,v 1.109 2015/04/11 13:37:59 bouyer Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1994-1998 Mark Brinicombe. 4 * Copyright (c) 1994-1998 Mark Brinicombe.
5 * Copyright (c) 1994 Brini. 5 * Copyright (c) 1994 Brini.
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * This code is derived from software written for Brini by Mark Brinicombe 8 * This code is derived from software written for Brini by Mark Brinicombe
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -32,27 +32,27 @@ @@ -32,27 +32,27 @@
32 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 32 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
33 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 33 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
34 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 34 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
35 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 35 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
36 * SUCH DAMAGE. 36 * SUCH DAMAGE.
37 * 37 *
38 * Machine dependent functions for kernel setup 38 * Machine dependent functions for kernel setup
39 * 39 *
40 * Created : 17/09/94 40 * Created : 17/09/94
41 * Updated : 18/04/01 updated for new wscons 41 * Updated : 18/04/01 updated for new wscons
42 */ 42 */
43 43
44#include <sys/cdefs.h> 44#include <sys/cdefs.h>
45__KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.108 2014/11/19 10:01:50 martin Exp $"); 45__KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.109 2015/04/11 13:37:59 bouyer Exp $");
46 46
47#include "opt_modular.h" 47#include "opt_modular.h"
48#include "opt_md.h" 48#include "opt_md.h"
49#include "opt_pmap_debug.h" 49#include "opt_pmap_debug.h"
50#include "opt_multiprocessor.h" 50#include "opt_multiprocessor.h"
51 51
52#include <sys/param.h> 52#include <sys/param.h>
53#include <sys/systm.h> 53#include <sys/systm.h>
54#include <sys/reboot.h> 54#include <sys/reboot.h>
55#include <sys/proc.h> 55#include <sys/proc.h>
56#include <sys/kauth.h> 56#include <sys/kauth.h>
57#include <sys/kernel.h> 57#include <sys/kernel.h>
58#include <sys/mbuf.h> 58#include <sys/mbuf.h>
@@ -565,26 +565,30 @@ parse_mi_bootargs(char *args) @@ -565,26 +565,30 @@ parse_mi_bootargs(char *args)
565 if (md_root_size > 2048*1024) 565 if (md_root_size > 2048*1024)
566 md_root_size = 2048*1024; 566 md_root_size = 2048*1024;
567 } 567 }
568#endif /* MEMORY_DISK_HOOKS && !MEMORY_DISK_ROOT_SIZE */ 568#endif /* MEMORY_DISK_HOOKS && !MEMORY_DISK_ROOT_SIZE */
569 569
570 if (get_bootconf_option(args, "quiet", BOOTOPT_TYPE_BOOLEAN, &integer) 570 if (get_bootconf_option(args, "quiet", BOOTOPT_TYPE_BOOLEAN, &integer)
571 || get_bootconf_option(args, "-q", BOOTOPT_TYPE_BOOLEAN, &integer)) 571 || get_bootconf_option(args, "-q", BOOTOPT_TYPE_BOOLEAN, &integer))
572 if (integer) 572 if (integer)
573 boothowto |= AB_QUIET; 573 boothowto |= AB_QUIET;
574 if (get_bootconf_option(args, "verbose", BOOTOPT_TYPE_BOOLEAN, &integer) 574 if (get_bootconf_option(args, "verbose", BOOTOPT_TYPE_BOOLEAN, &integer)
575 || get_bootconf_option(args, "-v", BOOTOPT_TYPE_BOOLEAN, &integer)) 575 || get_bootconf_option(args, "-v", BOOTOPT_TYPE_BOOLEAN, &integer))
576 if (integer) 576 if (integer)
577 boothowto |= AB_VERBOSE; 577 boothowto |= AB_VERBOSE;
 578 if (get_bootconf_option(args, "debug", BOOTOPT_TYPE_BOOLEAN, &integer)
 579 || get_bootconf_option(args, "-x", BOOTOPT_TYPE_BOOLEAN, &integer))
 580 if (integer)
 581 boothowto |= AB_DEBUG;
578} 582}
579 583
580#ifdef __HAVE_FAST_SOFTINTS 584#ifdef __HAVE_FAST_SOFTINTS
581#if IPL_SOFTSERIAL != IPL_SOFTNET + 1 585#if IPL_SOFTSERIAL != IPL_SOFTNET + 1
582#error IPLs are screwed up 586#error IPLs are screwed up
583#elif IPL_SOFTNET != IPL_SOFTBIO + 1 587#elif IPL_SOFTNET != IPL_SOFTBIO + 1
584#error IPLs are screwed up 588#error IPLs are screwed up
585#elif IPL_SOFTBIO != IPL_SOFTCLOCK + 1 589#elif IPL_SOFTBIO != IPL_SOFTCLOCK + 1
586#error IPLs are screwed up 590#error IPLs are screwed up
587#elif !(IPL_SOFTCLOCK > IPL_NONE) 591#elif !(IPL_SOFTCLOCK > IPL_NONE)
588#error IPLs are screwed up 592#error IPLs are screwed up
589#elif (IPL_NONE != 0) 593#elif (IPL_NONE != 0)
590#error IPLs are screwed up 594#error IPLs are screwed up