[PATCH 34/39] MIPS: sni: Add header file path prefix
From: bibo mao
Date: Mon Mar 30 2020 - 05:00:58 EST
Remove header files from arch/mips/include/asm/mach-rm
to arch/mips/sni/include/mach
Signed-off-by: bibo mao <maobibo@xxxxxxxxxxx>
---
arch/mips/Kconfig | 1 +
arch/mips/pci/fixup-sni.c | 2 +-
arch/mips/sni/Platform | 2 +-
.../{include/asm/mach-rm => sni/include/mach}/cpu-feature-overrides.h | 0
arch/mips/sni/include/mach/floppy.h | 2 ++
arch/mips/sni/include/mach/ide.h | 2 ++
arch/mips/sni/include/mach/ioremap.h | 2 ++
arch/mips/sni/include/mach/irq.h | 2 ++
arch/mips/sni/include/mach/kernel-entry-init.h | 2 ++
arch/mips/sni/include/mach/kmalloc.h | 2 ++
arch/mips/sni/include/mach/mangle-port.h | 2 ++
arch/mips/{include/asm/mach-rm => sni/include/mach}/mc146818rtc.h | 0
arch/mips/sni/include/mach/spaces.h | 2 ++
arch/mips/sni/include/mach/topology.h | 2 ++
arch/mips/{include/asm/mach-rm => sni/include/mach}/war.h | 0
15 files changed, 21 insertions(+), 2 deletions(-)
rename arch/mips/{include/asm/mach-rm => sni/include/mach}/cpu-feature-overrides.h (100%)
create mode 100644 arch/mips/sni/include/mach/floppy.h
create mode 100644 arch/mips/sni/include/mach/ide.h
create mode 100644 arch/mips/sni/include/mach/ioremap.h
create mode 100644 arch/mips/sni/include/mach/irq.h
create mode 100644 arch/mips/sni/include/mach/kernel-entry-init.h
create mode 100644 arch/mips/sni/include/mach/kmalloc.h
create mode 100644 arch/mips/sni/include/mach/mangle-port.h
rename arch/mips/{include/asm/mach-rm => sni/include/mach}/mc146818rtc.h (100%)
create mode 100644 arch/mips/sni/include/mach/spaces.h
create mode 100644 arch/mips/sni/include/mach/topology.h
rename arch/mips/{include/asm/mach-rm => sni/include/mach}/war.h (100%)
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 0687b94..19fbcfa 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -956,6 +956,7 @@ config SNI_RM
select SYS_SUPPORTS_BIG_ENDIAN
select SYS_SUPPORTS_HIGHMEM
select SYS_SUPPORTS_LITTLE_ENDIAN
+ select HAVE_MACH_HEAD_FILES
help
The SNI RM200/300/400 are MIPS-based machines manufactured by
Siemens Nixdorf Informationssysteme (SNI), parent company of Pyramid
diff --git a/arch/mips/pci/fixup-sni.c b/arch/mips/pci/fixup-sni.c
index adb9a58..3ccbd46 100644
--- a/arch/mips/pci/fixup-sni.c
+++ b/arch/mips/pci/fixup-sni.c
@@ -14,7 +14,7 @@
#include <asm/mipsregs.h>
#include <asm/sni.h>
-#include <irq.h>
+#include <mach/irq.h>
/*
* PCIMT Shortcuts ...
diff --git a/arch/mips/sni/Platform b/arch/mips/sni/Platform
index 2644a9d..925ed55 100644
--- a/arch/mips/sni/Platform
+++ b/arch/mips/sni/Platform
@@ -2,7 +2,7 @@
# SNI RM
#
platform-$(CONFIG_SNI_RM) += sni/
-cflags-$(CONFIG_SNI_RM) += -I$(srctree)/arch/mips/include/asm/mach-rm
+cflags-$(CONFIG_SNI_RM) += -I$(srctree)/arch/mips/sni/include
ifdef CONFIG_CPU_LITTLE_ENDIAN
load-$(CONFIG_SNI_RM) += 0xffffffff80600000
else
diff --git a/arch/mips/include/asm/mach-rm/cpu-feature-overrides.h b/arch/mips/sni/include/mach/cpu-feature-overrides.h
similarity index 100%
rename from arch/mips/include/asm/mach-rm/cpu-feature-overrides.h
rename to arch/mips/sni/include/mach/cpu-feature-overrides.h
diff --git a/arch/mips/sni/include/mach/floppy.h b/arch/mips/sni/include/mach/floppy.h
new file mode 100644
index 0000000..8e17183
--- /dev/null
+++ b/arch/mips/sni/include/mach/floppy.h
@@ -0,0 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#include <asm/mach-generic/floppy.h>
diff --git a/arch/mips/sni/include/mach/ide.h b/arch/mips/sni/include/mach/ide.h
new file mode 100644
index 0000000..1251c0c
--- /dev/null
+++ b/arch/mips/sni/include/mach/ide.h
@@ -0,0 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#include <asm/mach-generic/ide.h>
diff --git a/arch/mips/sni/include/mach/ioremap.h b/arch/mips/sni/include/mach/ioremap.h
new file mode 100644
index 0000000..2369393
--- /dev/null
+++ b/arch/mips/sni/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/sni/include/mach/irq.h b/arch/mips/sni/include/mach/irq.h
new file mode 100644
index 0000000..bb5ccce
--- /dev/null
+++ b/arch/mips/sni/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/sni/include/mach/kernel-entry-init.h b/arch/mips/sni/include/mach/kernel-entry-init.h
new file mode 100644
index 0000000..19b872be
--- /dev/null
+++ b/arch/mips/sni/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/sni/include/mach/kmalloc.h b/arch/mips/sni/include/mach/kmalloc.h
new file mode 100644
index 0000000..4f056db
--- /dev/null
+++ b/arch/mips/sni/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/sni/include/mach/mangle-port.h b/arch/mips/sni/include/mach/mangle-port.h
new file mode 100644
index 0000000..b9736e3
--- /dev/null
+++ b/arch/mips/sni/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-rm/mc146818rtc.h b/arch/mips/sni/include/mach/mc146818rtc.h
similarity index 100%
rename from arch/mips/include/asm/mach-rm/mc146818rtc.h
rename to arch/mips/sni/include/mach/mc146818rtc.h
diff --git a/arch/mips/sni/include/mach/spaces.h b/arch/mips/sni/include/mach/spaces.h
new file mode 100644
index 0000000..39a4d72
--- /dev/null
+++ b/arch/mips/sni/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/sni/include/mach/topology.h b/arch/mips/sni/include/mach/topology.h
new file mode 100644
index 0000000..86e585b
--- /dev/null
+++ b/arch/mips/sni/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/include/asm/mach-rm/war.h b/arch/mips/sni/include/mach/war.h
similarity index 100%
rename from arch/mips/include/asm/mach-rm/war.h
rename to arch/mips/sni/include/mach/war.h
--
1.8.3.1