Skip to contentSkip to conversation

nios2: move nios2.h to arch asm directory

PATCH New Thomas Chou 1 participant 2 messages Aug 25, 2014 – Aug 30, 2014 NIOS2 architecture

lore
Share & tools
lore

Thomas Chou

author
#0 lore raw

PATCH 1/1 nios2: move nios2.h to arch asm directory

The nios2.h is nios2 cpu specific, and should go arch asm directory.

Signed-off-by Thomas Chou <[email protected]>
---
 arch/nios2/cpu/cpu.c           |    2 +-
 arch/nios2/cpu/interrupts.c    |    2 +-
 arch/nios2/include/asm/nios2.h |   40 ++++++++++++++++++++++++++++++++++++++++
 include/nios2.h                |   40 ----------------------------------------
 4 files changed, 42 insertions(+), 42 deletions(-)
 create mode 100644 arch/nios2/include/asm/nios2.h
 delete mode 100644 include/nios2.h
arch/nios2/cpu/cpu.c +1 -1
index 36ea90b..39ae972 100644
@@ -6,7 +6,7 @@
  */
 
 #include <common.h>
-#include <nios2.h>
+#include <asm/nios2.h>
 #include <asm/cache.h>
 
 DECLARE_GLOBAL_DATA_PTR;
arch/nios2/cpu/interrupts.c +1 -1
index b363a1f..9d7e193 100644
@@ -9,7 +9,7 @@
  */
 
 
-#include <nios2.h>
+#include <asm/nios2.h>
 #include <asm/types.h>
 #include <asm/io.h>
 #include <asm/ptrace.h>
arch/nios2/include/asm/nios2.h new file +40 -0
new file mode 100644
index 0000000..abe4df3
@@ -0,0 +1,40 @@
+/*
+ * (C) Copyright 2004, Psyent Corporation <www.psyent.com>
+ * Scott McNutt <[email protected]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef __ASM_NIOS2_H__
+#define __ASM_NIOS2_H__
+
+/*------------------------------------------------------------------------
+ * Control registers -- use with wrctl() & rdctl()
+ *----------------------------------------------------------------------*/
+#define CTL_STATUS	0		/* Processor status reg		*/
+#define CTL_ESTATUS	1		/* Exception status reg		*/
+#define CTL_BSTATUS	2		/* Break status reg		*/
+#define CTL_IENABLE	3		/* Interrut enable reg		*/
+#define CTL_IPENDING	4		/* Interrut pending reg		*/
+
+/*------------------------------------------------------------------------
+ * Access to control regs
+ *----------------------------------------------------------------------*/
+
+#define rdctl(reg) __builtin_rdctl(reg)
+#define wrctl(reg, val) __builtin_wrctl(reg, val)
+
+/*------------------------------------------------------------------------
+ * Control reg bit masks
+ *----------------------------------------------------------------------*/
+#define STATUS_IE	(1<<0)		/* Interrupt enable		*/
+#define STATUS_U	(1<<1)		/* User-mode			*/
+
+/*------------------------------------------------------------------------
+ * Bit-31 Cache bypass -- only valid for data access. When data cache
+ * is not implemented, bit 31 is ignored for compatibility.
+ *----------------------------------------------------------------------*/
+#define CACHE_BYPASS(a) ((a) | 0x80000000)
+#define CACHE_NO_BYPASS(a) ((a) & ~0x80000000)
+
+#endif /* __ASM_NIOS2_H__ */
include/nios2.h deleted +0 -40
deleted file mode 100644
index 0539ec3..0000000
@@ -1,40 +0,0 @@
-/*
- * (C) Copyright 2004, Psyent Corporation <www.psyent.com>
- * Scott McNutt <[email protected]>
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-#ifndef __NIOS2_H__
-#define __NIOS2_H__
-
-/*------------------------------------------------------------------------
- * Control registers -- use with wrctl() & rdctl()
- *----------------------------------------------------------------------*/
-#define CTL_STATUS	0		/* Processor status reg		*/
-#define CTL_ESTATUS	1		/* Exception status reg		*/
-#define CTL_BSTATUS	2		/* Break status reg		*/
-#define CTL_IENABLE	3		/* Interrut enable reg		*/
-#define CTL_IPENDING	4		/* Interrut pending reg		*/
-
-/*------------------------------------------------------------------------
- * Access to control regs
- *----------------------------------------------------------------------*/
-
-#define rdctl(reg) __builtin_rdctl(reg)
-#define wrctl(reg, val) __builtin_wrctl(reg, val)
-
-/*------------------------------------------------------------------------
- * Control reg bit masks
- *----------------------------------------------------------------------*/
-#define STATUS_IE	(1<<0)		/* Interrupt enable		*/
-#define STATUS_U	(1<<1)		/* User-mode			*/
-
-/*------------------------------------------------------------------------
- * Bit-31 Cache bypass -- only valid for data access. When data cache
- * is not implemented, bit 31 is ignored for compatibility.
- *----------------------------------------------------------------------*/
-#define CACHE_BYPASS(a) ((a) | 0x80000000)
-#define CACHE_NO_BYPASS(a) ((a) & ~0x80000000)
-
-#endif /* __NIOS2_H__ */
Signature · 1 line
1.7.1
author Applied
#1 lore raw

PATCH 1/1 nios2: move nios2.h to arch asm directory

Quoted 4 lines · Thomas Chou

The nios2.h is nios2 cpu specific, and should go arch asm directory.

Signed-off-by Thomas Chou <[email protected]>

Applied.