Author: loos
Date: Wed May 17 15:13:01 2017
New Revision: 318404
URL: https://svnweb.freebsd.org/changeset/base/318404
Log:
Move the IO Window Control Register defines out of the ARMADA38X ifdef.
Fixes the build of Marvell kernels (other than ARMADA38X) after r318336.
Reported by: mmel
Modified:
head/sys/arm/mv/mvwin.h
Modified: head/sys/arm/mv/mvwin.h
==============================================================================
--- head/sys/arm/mv/mvwin.h Wed May 17 14:35:21 2017 (r318403)
+++ head/sys/arm/mv/mvwin.h Wed May 17 15:13:01 2017 (r318404)
@@ -305,18 +305,6 @@
#define MV_BOOTROM_WIN_SIZE 0xF
#define MV_CPU_SUBSYS_REGS_LEN 0x100
-/* IO Window Control Register fields */
-#define IO_WIN_SIZE_SHIFT 16
-#define IO_WIN_SIZE_MASK 0xFFFF
-#define IO_WIN_ATTR_SHIFT 8
-#define IO_WIN_ATTR_MASK 0xFF
-#define IO_WIN_TGT_SHIFT 4
-#define IO_WIN_TGT_MASK 0xF
-#define IO_WIN_SYNC_SHIFT 1
-#define IO_WIN_SYNC_MASK 0x1
-#define IO_WIN_ENA_SHIFT 0
-#define IO_WIN_ENA_MASK 0x1
-
#define IO_WIN_9_CTRL_OFFSET 0x98
#define IO_WIN_9_BASE_OFFSET 0x9C
@@ -329,6 +317,18 @@
#define MV_SYNC_BARRIER_CTRL_ALL 0xFFFF
#endif
+/* IO Window Control Register fields */
+#define IO_WIN_SIZE_SHIFT 16
+#define IO_WIN_SIZE_MASK 0xFFFF
+#define IO_WIN_ATTR_SHIFT 8
+#define IO_WIN_ATTR_MASK 0xFF
+#define IO_WIN_TGT_SHIFT 4
+#define IO_WIN_TGT_MASK 0xF
+#define IO_WIN_SYNC_SHIFT 1
+#define IO_WIN_SYNC_MASK 0x1
+#define IO_WIN_ENA_SHIFT 0
+#define IO_WIN_ENA_MASK 0x1
+
#define WIN_REG_IDX_RD(pre,reg,off,base)
\
static __inline uint32_t
\
pre ## _ ## reg ## _read(int i)
\
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
