[PATCH 21/39] MIPS: jazz: Add header file path prefix
From: bibo mao
Date: Mon Mar 30 2020 - 04:59:37 EST
Remove header files from arch/mips/include/asm/mach-jazz
to arch/mips/jazz/include/mach
Signed-off-by: bibo mao <maobibo@xxxxxxxxxxx>
---
arch/mips/Kconfig | 1 +
arch/mips/jazz/Platform | 2 +-
arch/mips/jazz/include/mach/cpu-feature-overrides.h | 2 ++
arch/mips/{include/asm/mach-jazz => jazz/include/mach}/floppy.h | 0
arch/mips/jazz/include/mach/ioremap.h | 2 ++
arch/mips/jazz/include/mach/irq.h | 2 ++
arch/mips/jazz/include/mach/kernel-entry-init.h | 2 ++
arch/mips/jazz/include/mach/kmalloc.h | 2 ++
arch/mips/jazz/include/mach/mangle-port.h | 2 ++
arch/mips/{include/asm/mach-jazz => jazz/include/mach}/mc146818rtc.h | 0
arch/mips/jazz/include/mach/spaces.h | 2 ++
arch/mips/jazz/include/mach/topology.h | 2 ++
arch/mips/jazz/include/mach/war.h | 2 ++
13 files changed, 20 insertions(+), 1 deletion(-)
create mode 100644 arch/mips/jazz/include/mach/cpu-feature-overrides.h
rename arch/mips/{include/asm/mach-jazz => jazz/include/mach}/floppy.h (100%)
create mode 100644 arch/mips/jazz/include/mach/ioremap.h
create mode 100644 arch/mips/jazz/include/mach/irq.h
create mode 100644 arch/mips/jazz/include/mach/kernel-entry-init.h
create mode 100644 arch/mips/jazz/include/mach/kmalloc.h
create mode 100644 arch/mips/jazz/include/mach/mangle-port.h
rename arch/mips/{include/asm/mach-jazz => jazz/include/mach}/mc146818rtc.h (100%)
create mode 100644 arch/mips/jazz/include/mach/spaces.h
create mode 100644 arch/mips/jazz/include/mach/topology.h
create mode 100644 arch/mips/jazz/include/mach/war.h
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index af3dddf..9a8ff2d 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -391,6 +391,7 @@ config MACH_JAZZ
select SYS_SUPPORTS_32BIT_KERNEL
select SYS_SUPPORTS_64BIT_KERNEL
select SYS_SUPPORTS_100HZ
+ select HAVE_MACH_HEAD_FILES
help
This a family of machines based on the MIPS R4030 chipset which was
used by several vendors to build RISC/os and Windows NT workstations.
diff --git a/arch/mips/jazz/Platform b/arch/mips/jazz/Platform
index 3373788..7c35bac 100644
--- a/arch/mips/jazz/Platform
+++ b/arch/mips/jazz/Platform
@@ -2,5 +2,5 @@
# Acer PICA 61, Mips Magnum 4000 and Olivetti M700.
#
platform-$(CONFIG_MACH_JAZZ) += jazz/
-cflags-$(CONFIG_MACH_JAZZ) += -I$(srctree)/arch/mips/include/asm/mach-jazz
+cflags-$(CONFIG_MACH_JAZZ) += -I$(srctree)/arch/mips/jazz/include
load-$(CONFIG_MACH_JAZZ) += 0xffffffff80080000
diff --git a/arch/mips/jazz/include/mach/cpu-feature-overrides.h b/arch/mips/jazz/include/mach/cpu-feature-overrides.h
new file mode 100644
index 0000000..f3e0e12
--- /dev/null
+++ b/arch/mips/jazz/include/mach/cpu-feature-overrides.h
@@ -0,0 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#include <asm/mach-generic/cpu-feature-overrides.h>
diff --git a/arch/mips/include/asm/mach-jazz/floppy.h b/arch/mips/jazz/include/mach/floppy.h
similarity index 100%
rename from arch/mips/include/asm/mach-jazz/floppy.h
rename to arch/mips/jazz/include/mach/floppy.h
diff --git a/arch/mips/jazz/include/mach/ioremap.h b/arch/mips/jazz/include/mach/ioremap.h
new file mode 100644
index 0000000..2369393
--- /dev/null
+++ b/arch/mips/jazz/include/mach/ioremap.h
@@ -0,0 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#include <asm/mach-generic/ioremap.h>
diff --git a/arch/mips/jazz/include/mach/irq.h b/arch/mips/jazz/include/mach/irq.h
new file mode 100644
index 0000000..bb5ccce
--- /dev/null
+++ b/arch/mips/jazz/include/mach/irq.h
@@ -0,0 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#include <asm/mach-generic/irq.h>
diff --git a/arch/mips/jazz/include/mach/kernel-entry-init.h b/arch/mips/jazz/include/mach/kernel-entry-init.h
new file mode 100644
index 0000000..19b872be
--- /dev/null
+++ b/arch/mips/jazz/include/mach/kernel-entry-init.h
@@ -0,0 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#include <asm/mach-generic/kernel-entry-init.h>
diff --git a/arch/mips/jazz/include/mach/kmalloc.h b/arch/mips/jazz/include/mach/kmalloc.h
new file mode 100644
index 0000000..4f056db
--- /dev/null
+++ b/arch/mips/jazz/include/mach/kmalloc.h
@@ -0,0 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#include <asm/mach-generic/kmalloc.h>
diff --git a/arch/mips/jazz/include/mach/mangle-port.h b/arch/mips/jazz/include/mach/mangle-port.h
new file mode 100644
index 0000000..b9736e3
--- /dev/null
+++ b/arch/mips/jazz/include/mach/mangle-port.h
@@ -0,0 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#include <asm/mach-generic/mangle-port.h>
diff --git a/arch/mips/include/asm/mach-jazz/mc146818rtc.h b/arch/mips/jazz/include/mach/mc146818rtc.h
similarity index 100%
rename from arch/mips/include/asm/mach-jazz/mc146818rtc.h
rename to arch/mips/jazz/include/mach/mc146818rtc.h
diff --git a/arch/mips/jazz/include/mach/spaces.h b/arch/mips/jazz/include/mach/spaces.h
new file mode 100644
index 0000000..39a4d72
--- /dev/null
+++ b/arch/mips/jazz/include/mach/spaces.h
@@ -0,0 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#include <asm/mach-generic/spaces.h>
diff --git a/arch/mips/jazz/include/mach/topology.h b/arch/mips/jazz/include/mach/topology.h
new file mode 100644
index 0000000..86e585b
--- /dev/null
+++ b/arch/mips/jazz/include/mach/topology.h
@@ -0,0 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#include <asm/mach-generic/topology.h>
diff --git a/arch/mips/jazz/include/mach/war.h b/arch/mips/jazz/include/mach/war.h
new file mode 100644
index 0000000..5b0422a
--- /dev/null
+++ b/arch/mips/jazz/include/mach/war.h
@@ -0,0 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#include <asm/mach-generic/war.h>
--
1.8.3.1