[incubator-nuttx] branch master updated: arch/risc-v: Move csr.h to common place

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

masayuki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new d42c5a0  arch/risc-v: Move csr.h to common place
d42c5a0 is described below

commit d42c5a0bf6dab825b19b07a66d4f02a29a257032
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Fri Dec 18 02:56:12 2020 +0800

    arch/risc-v: Move csr.h to common place
    
    since CSR definition is same for 32bit and 64bit arch
    
    Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
 arch/risc-v/include/arch.h             | 7 ++++---
 arch/risc-v/include/{rv32im => }/csr.h | 8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/arch/risc-v/include/arch.h b/arch/risc-v/include/arch.h
index 4dfaf02..555d5b9 100644
--- a/arch/risc-v/include/arch.h
+++ b/arch/risc-v/include/arch.h
@@ -47,13 +47,14 @@
 #  include <stdint.h>
 #endif
 
+#include <arch/csr.h>
+
 #ifdef CONFIG_ARCH_RV32IM
-#  include "rv32im/csr.h"
-#  include "rv32im/arch.h"
+#  include <arch/rv32im/arch.h>
 #endif
 
 #ifdef CONFIG_ARCH_RV64GC
-#  include "rv64gc/arch.h"
+#  include <arch/rv64gc/arch.h>
 #endif
 
 /****************************************************************************
diff --git a/arch/risc-v/include/rv32im/csr.h b/arch/risc-v/include/csr.h
similarity index 98%
rename from arch/risc-v/include/rv32im/csr.h
rename to arch/risc-v/include/csr.h
index 49c2464..098e075 100644
--- a/arch/risc-v/include/rv32im/csr.h
+++ b/arch/risc-v/include/csr.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/include/rv32im/csr.h
+ * arch/risc-v/include/csr.h
  *
  *   Copyright (C) 2016 Ken Pettit. All rights reserved.
  *   Author: Ken Pettit <pe...@gmail.com>
@@ -34,8 +34,8 @@
  * through nuttx/irq.h
  */
 
-#ifndef __ARCH_RISCV_INCLUDE_RV32IM_CSR_H
-#define __ARCH_RISCV_INCLUDE_RV32IM_CSR_H
+#ifndef __ARCH_RISCV_INCLUDE_CSR_H
+#define __ARCH_RISCV_INCLUDE_CSR_H
 
 /****************************************************************************
  * Included Files
@@ -345,4 +345,4 @@
  * Public Function Prototypes
  ****************************************************************************/
 
-#endif /* __ARCH_RISCV_INCLUDE_RV32IM_CSR_H */
+#endif /* __ARCH_RISCV_INCLUDE_CSR_H */