[src/trunk]: src/sys/arch Move register definiton to header

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

details:   https://anonhg.NetBSD.org/src/rev/d9b61c69fd7c
branches:  trunk
changeset: 995341:d9b61c69fd7c
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sun Dec 16 16:46:12 2018 +0000

description:
Move register definiton to header

diffstat:

 sys/arch/arm/cortex/scu_reg.h                 |  7 ++++++-
 sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c |  9 ++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs (61 lines):

diff -r b712b40873c8 -r d9b61c69fd7c sys/arch/arm/cortex/scu_reg.h
--- a/sys/arch/arm/cortex/scu_reg.h     Sun Dec 16 16:45:11 2018 +0000
+++ b/sys/arch/arm/cortex/scu_reg.h     Sun Dec 16 16:46:12 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: scu_reg.h,v 1.2 2016/10/04 15:15:27 kiyohara Exp $ */
+/* $NetBSD: scu_reg.h,v 1.3 2018/12/16 16:46:12 skrll Exp $ */
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -42,11 +42,14 @@
 #define        SCU_CFG                 0x04    // SCU Configuration Register
 #define        SCU_CPU_PWR_STS         0x08    // SCU CPU Power Status
 #define        SCU_INV_ALL_REG         0x0c    // SCU Invalidate All Registers in Secure State
+#define        SCU_DIAG_CONTROL        0x30    // SCU Diag Control - undocumented
 #define        SCU_FILTER_START        0x40    // Filtering Start Address
 #define        SCU_FILTER_END          0x44    // Filtering End Address
 #define        SCU_ACCESS_CONTROL      0x50    // SCU Access Control
 #define        SCU_NS_ACCESS_CONTROL   0x54    // SCU Non-Secure Access Control
 
+
+
 #define        SCU_CTL_IC_STANDBY_ENA                  __BIT(6)
 #define        SCU_CTL_SCU_STANDBY_ENA                 __BIT(5)
 #define        SCU_CTL_FORCE_PORT0_ENA                 __BIT(4)
@@ -70,4 +73,6 @@
 #define        SCU_CFG_CPU0_SMP                __BIT(4)
 #define        SCU_CFG_CPUMAX                  __BITS(0,1)     // # of CPU - 1
 
+#define SCU_DIAG_DISABLE_MIGBIT                __BIT(0)
+
 #endif /* _ARM_CORTEX_SCUREG_H_ */
diff -r b712b40873c8 -r d9b61c69fd7c sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c
--- a/sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c     Sun Dec 16 16:45:11 2018 +0000
+++ b/sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c     Sun Dec 16 16:46:12 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nitrogen6_machdep.c,v 1.13 2018/11/03 15:02:32 skrll Exp $     */
+/*     $NetBSD: nitrogen6_machdep.c,v 1.14 2018/12/16 16:46:12 skrll Exp $     */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nitrogen6_machdep.c,v 1.13 2018/11/03 15:02:32 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nitrogen6_machdep.c,v 1.14 2018/12/16 16:46:12 skrll Exp $");
 
 #include "opt_evbarm_boardtype.h"
 #include "opt_arm_debug.h"
@@ -191,11 +191,6 @@
        }
 }
 
-
-#define        SCU_DIAG_CONTROL                0x30
-#define          SCU_DIAG_DISABLE_MIGBIT         __BIT(0)
-
-
 void
 nitrogen6_mpstart(void)
 {