From: bibo mao <maobibo@loongson.cn>
To: Thomas Bogendoerfer <tsbogend@alpha.franken.de>,
Jiaxun Yang <jiaxun.yang@flygoat.com>,
Huacai Chen <chenhc@lemote.com>
Cc: linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 19/39] MIPS: ip30: Add header file path prefix
Date: Mon, 30 Mar 2020 04:59:19 -0400 [thread overview]
Message-ID: <1585558759-18419-1-git-send-email-maobibo@loongson.cn> (raw)
Remove header files from arch/mips/include/asm/mach-ip30
to arch/mips/sgi-ip30/include/mach
Signed-off-by: bibo mao <maobibo@loongson.cn>
---
arch/mips/Kconfig | 1 +
arch/mips/sgi-ip30/Platform | 2 +-
.../asm/mach-ip30 => sgi-ip30/include/mach}/cpu-feature-overrides.h | 0
arch/mips/sgi-ip30/include/mach/ioremap.h | 2 ++
arch/mips/{include/asm/mach-ip30 => sgi-ip30/include/mach}/irq.h | 0
.../asm/mach-ip30 => sgi-ip30/include/mach}/kernel-entry-init.h | 0
arch/mips/sgi-ip30/include/mach/kmalloc.h | 2 ++
.../mips/{include/asm/mach-ip30 => sgi-ip30/include/mach}/mangle-port.h | 0
arch/mips/sgi-ip30/include/mach/mc146818rtc.h | 2 ++
arch/mips/{include/asm/mach-ip30 => sgi-ip30/include/mach}/spaces.h | 0
arch/mips/sgi-ip30/include/mach/topology.h | 2 ++
arch/mips/{include/asm/mach-ip30 => sgi-ip30/include/mach}/war.h | 0
12 files changed, 10 insertions(+), 1 deletion(-)
rename arch/mips/{include/asm/mach-ip30 => sgi-ip30/include/mach}/cpu-feature-overrides.h (100%)
create mode 100644 arch/mips/sgi-ip30/include/mach/ioremap.h
rename arch/mips/{include/asm/mach-ip30 => sgi-ip30/include/mach}/irq.h (100%)
rename arch/mips/{include/asm/mach-ip30 => sgi-ip30/include/mach}/kernel-entry-init.h (100%)
create mode 100644 arch/mips/sgi-ip30/include/mach/kmalloc.h
rename arch/mips/{include/asm/mach-ip30 => sgi-ip30/include/mach}/mangle-port.h (100%)
create mode 100644 arch/mips/sgi-ip30/include/mach/mc146818rtc.h
rename arch/mips/{include/asm/mach-ip30 => sgi-ip30/include/mach}/spaces.h (100%)
create mode 100644 arch/mips/sgi-ip30/include/mach/topology.h
rename arch/mips/{include/asm/mach-ip30 => sgi-ip30/include/mach}/war.h (100%)
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 48fd625..6a6cf8c 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -798,6 +798,7 @@ config SGI_IP30
select SYS_SUPPORTS_SMP
select MIPS_L1_CACHE_SHIFT_7
select ARC_MEMORY
+ select HAVE_MACH_HEAD_FILES
help
These are the SGI Octane and Octane2 graphics workstations. To
compile a Linux kernel that runs on these, say Y here.
diff --git a/arch/mips/sgi-ip30/Platform b/arch/mips/sgi-ip30/Platform
index 2b5695c..38433a5 100644
--- a/arch/mips/sgi-ip30/Platform
+++ b/arch/mips/sgi-ip30/Platform
@@ -3,6 +3,6 @@
#
ifdef CONFIG_SGI_IP30
platform-$(CONFIG_SGI_IP30) += sgi-ip30/
-cflags-$(CONFIG_SGI_IP30) += -I$(srctree)/arch/mips/include/asm/mach-ip30
+cflags-$(CONFIG_SGI_IP30) += -I$(srctree)/arch/mips/sgi-ip30/include
load-$(CONFIG_SGI_IP30) += 0xa800000020004000
endif
diff --git a/arch/mips/include/asm/mach-ip30/cpu-feature-overrides.h b/arch/mips/sgi-ip30/include/mach/cpu-feature-overrides.h
similarity index 100%
rename from arch/mips/include/asm/mach-ip30/cpu-feature-overrides.h
rename to arch/mips/sgi-ip30/include/mach/cpu-feature-overrides.h
diff --git a/arch/mips/sgi-ip30/include/mach/ioremap.h b/arch/mips/sgi-ip30/include/mach/ioremap.h
new file mode 100644
index 0000000..2369393
--- /dev/null
+++ b/arch/mips/sgi-ip30/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/include/asm/mach-ip30/irq.h b/arch/mips/sgi-ip30/include/mach/irq.h
similarity index 100%
rename from arch/mips/include/asm/mach-ip30/irq.h
rename to arch/mips/sgi-ip30/include/mach/irq.h
diff --git a/arch/mips/include/asm/mach-ip30/kernel-entry-init.h b/arch/mips/sgi-ip30/include/mach/kernel-entry-init.h
similarity index 100%
rename from arch/mips/include/asm/mach-ip30/kernel-entry-init.h
rename to arch/mips/sgi-ip30/include/mach/kernel-entry-init.h
diff --git a/arch/mips/sgi-ip30/include/mach/kmalloc.h b/arch/mips/sgi-ip30/include/mach/kmalloc.h
new file mode 100644
index 0000000..4f056db
--- /dev/null
+++ b/arch/mips/sgi-ip30/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/include/asm/mach-ip30/mangle-port.h b/arch/mips/sgi-ip30/include/mach/mangle-port.h
similarity index 100%
rename from arch/mips/include/asm/mach-ip30/mangle-port.h
rename to arch/mips/sgi-ip30/include/mach/mangle-port.h
diff --git a/arch/mips/sgi-ip30/include/mach/mc146818rtc.h b/arch/mips/sgi-ip30/include/mach/mc146818rtc.h
new file mode 100644
index 0000000..7284af8
--- /dev/null
+++ b/arch/mips/sgi-ip30/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/include/asm/mach-ip30/spaces.h b/arch/mips/sgi-ip30/include/mach/spaces.h
similarity index 100%
rename from arch/mips/include/asm/mach-ip30/spaces.h
rename to arch/mips/sgi-ip30/include/mach/spaces.h
diff --git a/arch/mips/sgi-ip30/include/mach/topology.h b/arch/mips/sgi-ip30/include/mach/topology.h
new file mode 100644
index 0000000..86e585b
--- /dev/null
+++ b/arch/mips/sgi-ip30/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-ip30/war.h b/arch/mips/sgi-ip30/include/mach/war.h
similarity index 100%
rename from arch/mips/include/asm/mach-ip30/war.h
rename to arch/mips/sgi-ip30/include/mach/war.h
--
1.8.3.1
reply other threads:[~2020-03-30 8:59 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1585558759-18419-1-git-send-email-maobibo@loongson.cn \
--to=maobibo@loongson.cn \
--cc=chenhc@lemote.com \
--cc=jiaxun.yang@flygoat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=tsbogend@alpha.franken.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).