[PATCH 20/39] MIPS: ip32: Add header file path prefix
From: bibo mao
Date: Mon Mar 30 2020 - 04:59:30 EST
Remove header files from arch/mips/include/asm/mach-ip32
to arch/mips/sgi-ip32/include/mach
Signed-off-by: bibo mao <maobibo@xxxxxxxxxxx>
---
arch/mips/Kconfig | 1 +
arch/mips/sgi-ip32/Platform | 2 +-
.../asm/mach-ip32 => sgi-ip32/include/mach}/cpu-feature-overrides.h | 0
arch/mips/sgi-ip32/include/mach/ioremap.h | 2 ++
arch/mips/sgi-ip32/include/mach/irq.h | 2 ++
arch/mips/sgi-ip32/include/mach/kernel-entry-init.h | 2 ++
arch/mips/{include/asm/mach-ip32 => sgi-ip32/include/mach}/kmalloc.h | 0
.../mips/{include/asm/mach-ip32 => sgi-ip32/include/mach}/mangle-port.h | 0
arch/mips/sgi-ip32/include/mach/mc146818rtc.h | 2 ++
arch/mips/sgi-ip32/include/mach/spaces.h | 2 ++
arch/mips/sgi-ip32/include/mach/topology.h | 2 ++
arch/mips/{include/asm/mach-ip32 => sgi-ip32/include/mach}/war.h | 0
12 files changed, 14 insertions(+), 1 deletion(-)
rename arch/mips/{include/asm/mach-ip32 => sgi-ip32/include/mach}/cpu-feature-overrides.h (100%)
create mode 100644 arch/mips/sgi-ip32/include/mach/ioremap.h
create mode 100644 arch/mips/sgi-ip32/include/mach/irq.h
create mode 100644 arch/mips/sgi-ip32/include/mach/kernel-entry-init.h
rename arch/mips/{include/asm/mach-ip32 => sgi-ip32/include/mach}/kmalloc.h (100%)
rename arch/mips/{include/asm/mach-ip32 => sgi-ip32/include/mach}/mangle-port.h (100%)
create mode 100644 arch/mips/sgi-ip32/include/mach/mc146818rtc.h
create mode 100644 arch/mips/sgi-ip32/include/mach/spaces.h
create mode 100644 arch/mips/sgi-ip32/include/mach/topology.h
rename arch/mips/{include/asm/mach-ip32 => sgi-ip32/include/mach}/war.h (100%)
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 6a6cf8c..af3dddf 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -824,6 +824,7 @@ config SGI_IP32
select SYS_HAS_CPU_NEVADA
select SYS_SUPPORTS_64BIT_KERNEL
select SYS_SUPPORTS_BIG_ENDIAN
+ select HAVE_MACH_HEAD_FILES
help
If you want this kernel to run on SGI O2 workstation, say Y here.
diff --git a/arch/mips/sgi-ip32/Platform b/arch/mips/sgi-ip32/Platform
index 0fea556..e377e75 100644
--- a/arch/mips/sgi-ip32/Platform
+++ b/arch/mips/sgi-ip32/Platform
@@ -7,5 +7,5 @@
# will break.
#
platform-$(CONFIG_SGI_IP32) += sgi-ip32/
-cflags-$(CONFIG_SGI_IP32) += -I$(srctree)/arch/mips/include/asm/mach-ip32
+cflags-$(CONFIG_SGI_IP32) += -I$(srctree)/arch/mips/sgi-ip32/include
load-$(CONFIG_SGI_IP32) += 0xffffffff80004000
diff --git a/arch/mips/include/asm/mach-ip32/cpu-feature-overrides.h b/arch/mips/sgi-ip32/include/mach/cpu-feature-overrides.h
similarity index 100%
rename from arch/mips/include/asm/mach-ip32/cpu-feature-overrides.h
rename to arch/mips/sgi-ip32/include/mach/cpu-feature-overrides.h
diff --git a/arch/mips/sgi-ip32/include/mach/ioremap.h b/arch/mips/sgi-ip32/include/mach/ioremap.h
new file mode 100644
index 0000000..2369393
--- /dev/null
+++ b/arch/mips/sgi-ip32/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/sgi-ip32/include/mach/irq.h b/arch/mips/sgi-ip32/include/mach/irq.h
new file mode 100644
index 0000000..bb5ccce
--- /dev/null
+++ b/arch/mips/sgi-ip32/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/sgi-ip32/include/mach/kernel-entry-init.h b/arch/mips/sgi-ip32/include/mach/kernel-entry-init.h
new file mode 100644
index 0000000..19b872be
--- /dev/null
+++ b/arch/mips/sgi-ip32/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/include/asm/mach-ip32/kmalloc.h b/arch/mips/sgi-ip32/include/mach/kmalloc.h
similarity index 100%
rename from arch/mips/include/asm/mach-ip32/kmalloc.h
rename to arch/mips/sgi-ip32/include/mach/kmalloc.h
diff --git a/arch/mips/include/asm/mach-ip32/mangle-port.h b/arch/mips/sgi-ip32/include/mach/mangle-port.h
similarity index 100%
rename from arch/mips/include/asm/mach-ip32/mangle-port.h
rename to arch/mips/sgi-ip32/include/mach/mangle-port.h
diff --git a/arch/mips/sgi-ip32/include/mach/mc146818rtc.h b/arch/mips/sgi-ip32/include/mach/mc146818rtc.h
new file mode 100644
index 0000000..7284af8
--- /dev/null
+++ b/arch/mips/sgi-ip32/include/mach/mc146818rtc.h
@@ -0,0 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#include <asm/mach-generic/mc146818rtc.h>
diff --git a/arch/mips/sgi-ip32/include/mach/spaces.h b/arch/mips/sgi-ip32/include/mach/spaces.h
new file mode 100644
index 0000000..39a4d72
--- /dev/null
+++ b/arch/mips/sgi-ip32/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/sgi-ip32/include/mach/topology.h b/arch/mips/sgi-ip32/include/mach/topology.h
new file mode 100644
index 0000000..86e585b
--- /dev/null
+++ b/arch/mips/sgi-ip32/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-ip32/war.h b/arch/mips/sgi-ip32/include/mach/war.h
similarity index 100%
rename from arch/mips/include/asm/mach-ip32/war.h
rename to arch/mips/sgi-ip32/include/mach/war.h
--
1.8.3.1