[PATCH 11/39] MIPS: bmips: Add header file path prefix
From: bibo mao
Date: Mon Mar 30 2020 - 04:52:42 EST
Remove header files from arch/mips/include/asm/mach-bmips
to arch/mips/bmips/include/mach
Signed-off-by: bibo mao <maobibo@xxxxxxxxxxx>
---
arch/mips/Kconfig | 1 +
arch/mips/bmips/Platform | 2 +-
.../asm/mach-bmips => bmips/include/mach}/cpu-feature-overrides.h | 0
arch/mips/{include/asm/mach-bmips => bmips/include/mach}/ioremap.h | 0
arch/mips/bmips/include/mach/irq.h | 2 ++
arch/mips/bmips/include/mach/kernel-entry-init.h | 2 ++
arch/mips/bmips/include/mach/kmalloc.h | 2 ++
arch/mips/bmips/include/mach/mangle-port.h | 2 ++
arch/mips/{include/asm/mach-bmips => bmips/include/mach}/spaces.h | 0
arch/mips/bmips/include/mach/topology.h | 2 ++
arch/mips/bmips/include/mach/war.h | 2 ++
11 files changed, 14 insertions(+), 1 deletion(-)
rename arch/mips/{include/asm/mach-bmips => bmips/include/mach}/cpu-feature-overrides.h (100%)
rename arch/mips/{include/asm/mach-bmips => bmips/include/mach}/ioremap.h (100%)
create mode 100644 arch/mips/bmips/include/mach/irq.h
create mode 100644 arch/mips/bmips/include/mach/kernel-entry-init.h
create mode 100644 arch/mips/bmips/include/mach/kmalloc.h
create mode 100644 arch/mips/bmips/include/mach/mangle-port.h
rename arch/mips/{include/asm/mach-bmips => bmips/include/mach}/spaces.h (100%)
create mode 100644 arch/mips/bmips/include/mach/topology.h
create mode 100644 arch/mips/bmips/include/mach/war.h
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index e8e6f2b..1ee88a2 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -259,6 +259,7 @@ config BMIPS_GENERIC
select USB_OHCI_BIG_ENDIAN_DESC if CPU_BIG_ENDIAN
select USB_OHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN
select HARDIRQS_SW_RESEND
+ select HAVE_MACH_HEAD_FILES
help
Build a generic DT-based kernel image that boots on select
BCM33xx cable modem chips, BCM63xx DSL chips, and BCM7xxx set-top
diff --git a/arch/mips/bmips/Platform b/arch/mips/bmips/Platform
index 5f127fd..8b9574f 100644
--- a/arch/mips/bmips/Platform
+++ b/arch/mips/bmips/Platform
@@ -3,5 +3,5 @@
#
platform-$(CONFIG_BMIPS_GENERIC) += bmips/
cflags-$(CONFIG_BMIPS_GENERIC) += \
- -I$(srctree)/arch/mips/include/asm/mach-bmips/
+ -I$(srctree)/arch/mips/bmips/include
load-$(CONFIG_BMIPS_GENERIC) := 0xffffffff80010000
diff --git a/arch/mips/include/asm/mach-bmips/cpu-feature-overrides.h b/arch/mips/bmips/include/mach/cpu-feature-overrides.h
similarity index 100%
rename from arch/mips/include/asm/mach-bmips/cpu-feature-overrides.h
rename to arch/mips/bmips/include/mach/cpu-feature-overrides.h
diff --git a/arch/mips/include/asm/mach-bmips/ioremap.h b/arch/mips/bmips/include/mach/ioremap.h
similarity index 100%
rename from arch/mips/include/asm/mach-bmips/ioremap.h
rename to arch/mips/bmips/include/mach/ioremap.h
diff --git a/arch/mips/bmips/include/mach/irq.h b/arch/mips/bmips/include/mach/irq.h
new file mode 100644
index 0000000..bb5ccce
--- /dev/null
+++ b/arch/mips/bmips/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/bmips/include/mach/kernel-entry-init.h b/arch/mips/bmips/include/mach/kernel-entry-init.h
new file mode 100644
index 0000000..19b872be
--- /dev/null
+++ b/arch/mips/bmips/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/bmips/include/mach/kmalloc.h b/arch/mips/bmips/include/mach/kmalloc.h
new file mode 100644
index 0000000..4f056db
--- /dev/null
+++ b/arch/mips/bmips/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/bmips/include/mach/mangle-port.h b/arch/mips/bmips/include/mach/mangle-port.h
new file mode 100644
index 0000000..b9736e3
--- /dev/null
+++ b/arch/mips/bmips/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-bmips/spaces.h b/arch/mips/bmips/include/mach/spaces.h
similarity index 100%
rename from arch/mips/include/asm/mach-bmips/spaces.h
rename to arch/mips/bmips/include/mach/spaces.h
diff --git a/arch/mips/bmips/include/mach/topology.h b/arch/mips/bmips/include/mach/topology.h
new file mode 100644
index 0000000..86e585b
--- /dev/null
+++ b/arch/mips/bmips/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/bmips/include/mach/war.h b/arch/mips/bmips/include/mach/war.h
new file mode 100644
index 0000000..5b0422a
--- /dev/null
+++ b/arch/mips/bmips/include/mach/war.h
@@ -0,0 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#include <asm/mach-generic/war.h>
--
1.8.3.1