Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/arm/arm32 #if 0 a KASSERT for now as it doesn't app...



details:   https://anonhg.NetBSD.org/src/rev/2d1151924f43
branches:  trunk
changeset: 343981:2d1151924f43
user:      skrll <skrll%NetBSD.org@localhost>
date:      Tue Mar 08 08:01:23 2016 +0000

description:
#if 0 a KASSERT for now as it doesn't apply to Raspberry Pi 3

diffstat:

 sys/arch/arm/arm32/arm32_boot.c |  12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diffs (57 lines):

diff -r 14af08c0ec17 -r 2d1151924f43 sys/arch/arm/arm32/arm32_boot.c
--- a/sys/arch/arm/arm32/arm32_boot.c   Tue Mar 08 07:49:20 2016 +0000
+++ b/sys/arch/arm/arm32/arm32_boot.c   Tue Mar 08 08:01:23 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: arm32_boot.c,v 1.16 2015/05/17 05:34:53 matt Exp $     */
+/*     $NetBSD: arm32_boot.c,v 1.17 2016/03/08 08:01:23 skrll Exp $    */
 
 /*
  * Copyright (c) 2002, 2003, 2005  Genetec Corporation.  All rights reserved.
@@ -123,7 +123,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: arm32_boot.c,v 1.16 2015/05/17 05:34:53 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: arm32_boot.c,v 1.17 2016/03/08 08:01:23 skrll Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -268,7 +268,7 @@
                                        break;
                                }
                        }
-       
+
                        uvm_page_physload(start, segend, start, segend,
                            vm_freelist);
                        start = segend;
@@ -280,7 +280,7 @@
        printf("pmap ");
 #endif
        pmap_bootstrap(kvm_base, kvm_base + kvm_size);
-   
+
 #ifdef __HAVE_MEMORY_DISK__
        md_root_setconf(memory_disk, sizeof memory_disk);
 #endif
@@ -332,9 +332,11 @@
        splhigh();
 
 #ifdef CPU_CORTEX
+#if 0
        KASSERTMSG(armreg_auxctl_read() & CORTEXA9_AUXCTL_SMP, "auxctl %#x",
            armreg_auxctl_read());
 #endif
+#endif
 
 #ifdef VERBOSE_INIT_ARM
        printf("%s(%s): ", __func__, ci->ci_data.cpu_name);
@@ -390,7 +392,7 @@
        if (CPU_ID_CORTEX_P(ci->ci_arm_cpuid)) {
                /*
                 * Start and reset the PMC Cycle Counter.
-                */   
+                */
                armreg_pmcr_write(ARM11_PMCCTL_E|ARM11_PMCCTL_P|ARM11_PMCCTL_C);
                armreg_pmcntenset_write(CORTEX_CNTENS_C);
        }



Home | Main Index | Thread Index | Old Index