| Message ID | 1585558741-7924-1-git-send-email-maobibo@loongson.cn (mailing list archive) |
|---|---|
| State | Rejected |
| Headers | show |
| Series | None | expand |
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index cef1723..d394542 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -707,6 +707,7 @@ config SGI_IP22 select SYS_SUPPORTS_64BIT_KERNEL select SYS_SUPPORTS_BIG_ENDIAN select MIPS_L1_CACHE_SHIFT_7 + select HAVE_MACH_HEAD_FILES help This are the SGI Indy, Challenge S and Indigo2, as well as certain OEM variants like the Tandem CMN B006S. To compile a Linux kernel diff --git a/arch/mips/include/asm/sgi/ip22.h b/arch/mips/include/asm/sgi/ip22.h index 87ec9ea..6011ef6 100644 --- a/arch/mips/include/asm/sgi/ip22.h +++ b/arch/mips/include/asm/sgi/ip22.h @@ -21,7 +21,7 @@ * HAL2 driver). This will prevent many complications, trust me ;-) */ -#include <irq.h> +#include <mach/irq.h> #include <asm/sgi/ioc.h> #define SGINT_EISA 0 /* 16 EISA irq levels (Indigo2) */ diff --git a/arch/mips/sgi-ip22/Platform b/arch/mips/sgi-ip22/Platform index e8f6b3a..539b305 100644 --- a/arch/mips/sgi-ip22/Platform +++ b/arch/mips/sgi-ip22/Platform @@ -8,7 +8,7 @@ # address by 8kb. # platform-$(CONFIG_SGI_IP22) += sgi-ip22/ -cflags-$(CONFIG_SGI_IP22) += -I$(srctree)/arch/mips/include/asm/mach-ip22 +cflags-$(CONFIG_SGI_IP22) += -I$(srctree)/arch/mips/sgi-ip22/ip22/include ifdef CONFIG_32BIT load-$(CONFIG_SGI_IP22) += 0xffffffff88002000 endif diff --git a/arch/mips/include/asm/mach-ip22/cpu-feature-overrides.h b/arch/mips/sgi-ip22/ip22/include/mach/cpu-feature-overrides.h similarity index 100% rename from arch/mips/include/asm/mach-ip22/cpu-feature-overrides.h rename to arch/mips/sgi-ip22/ip22/include/mach/cpu-feature-overrides.h diff --git a/arch/mips/sgi-ip22/ip22/include/mach/ioremap.h b/arch/mips/sgi-ip22/ip22/include/mach/ioremap.h new file mode 100644 index 0000000..2369393 --- /dev/null +++ b/arch/mips/sgi-ip22/ip22/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-ip22/ip22/include/mach/irq.h b/arch/mips/sgi-ip22/ip22/include/mach/irq.h new file mode 100644 index 0000000..bb5ccce --- /dev/null +++ b/arch/mips/sgi-ip22/ip22/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-ip22/ip22/include/mach/kernel-entry-init.h b/arch/mips/sgi-ip22/ip22/include/mach/kernel-entry-init.h new file mode 100644 index 0000000..19b872be --- /dev/null +++ b/arch/mips/sgi-ip22/ip22/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/sgi-ip22/ip22/include/mach/kmalloc.h b/arch/mips/sgi-ip22/ip22/include/mach/kmalloc.h new file mode 100644 index 0000000..4f056db --- /dev/null +++ b/arch/mips/sgi-ip22/ip22/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/sgi-ip22/ip22/include/mach/mangle-port.h b/arch/mips/sgi-ip22/ip22/include/mach/mangle-port.h new file mode 100644 index 0000000..b9736e3 --- /dev/null +++ b/arch/mips/sgi-ip22/ip22/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/sgi-ip22/ip22/include/mach/mc146818rtc.h b/arch/mips/sgi-ip22/ip22/include/mach/mc146818rtc.h new file mode 100644 index 0000000..7284af8 --- /dev/null +++ b/arch/mips/sgi-ip22/ip22/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-ip22/spaces.h b/arch/mips/sgi-ip22/ip22/include/mach/spaces.h similarity index 100% rename from arch/mips/include/asm/mach-ip22/spaces.h rename to arch/mips/sgi-ip22/ip22/include/mach/spaces.h diff --git a/arch/mips/sgi-ip22/ip22/include/mach/topology.h b/arch/mips/sgi-ip22/ip22/include/mach/topology.h new file mode 100644 index 0000000..86e585b --- /dev/null +++ b/arch/mips/sgi-ip22/ip22/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-ip22/war.h b/arch/mips/sgi-ip22/ip22/include/mach/war.h similarity index 100% rename from arch/mips/include/asm/mach-ip22/war.h rename to arch/mips/sgi-ip22/ip22/include/mach/war.h
Remove header files from arch/mips/include/asm/mach-ip22 to arch/mips/sgi-ip22/ip22/include/mach Signed-off-by: bibo mao <maobibo@loongson.cn> --- arch/mips/Kconfig | 1 + arch/mips/include/asm/sgi/ip22.h | 2 +- arch/mips/sgi-ip22/Platform | 2 +- .../mach-ip22 => sgi-ip22/ip22/include/mach}/cpu-feature-overrides.h | 0 arch/mips/sgi-ip22/ip22/include/mach/ioremap.h | 2 ++ arch/mips/sgi-ip22/ip22/include/mach/irq.h | 2 ++ arch/mips/sgi-ip22/ip22/include/mach/kernel-entry-init.h | 2 ++ arch/mips/sgi-ip22/ip22/include/mach/kmalloc.h | 2 ++ arch/mips/sgi-ip22/ip22/include/mach/mangle-port.h | 2 ++ arch/mips/sgi-ip22/ip22/include/mach/mc146818rtc.h | 2 ++ .../mips/{include/asm/mach-ip22 => sgi-ip22/ip22/include/mach}/spaces.h | 0 arch/mips/sgi-ip22/ip22/include/mach/topology.h | 2 ++ arch/mips/{include/asm/mach-ip22 => sgi-ip22/ip22/include/mach}/war.h | 0 13 files changed, 17 insertions(+), 2 deletions(-) rename arch/mips/{include/asm/mach-ip22 => sgi-ip22/ip22/include/mach}/cpu-feature-overrides.h (100%) create mode 100644 arch/mips/sgi-ip22/ip22/include/mach/ioremap.h create mode 100644 arch/mips/sgi-ip22/ip22/include/mach/irq.h create mode 100644 arch/mips/sgi-ip22/ip22/include/mach/kernel-entry-init.h create mode 100644 arch/mips/sgi-ip22/ip22/include/mach/kmalloc.h create mode 100644 arch/mips/sgi-ip22/ip22/include/mach/mangle-port.h create mode 100644 arch/mips/sgi-ip22/ip22/include/mach/mc146818rtc.h rename arch/mips/{include/asm/mach-ip22 => sgi-ip22/ip22/include/mach}/spaces.h (100%) create mode 100644 arch/mips/sgi-ip22/ip22/include/mach/topology.h rename arch/mips/{include/asm/mach-ip22 => sgi-ip22/ip22/include/mach}/war.h (100%)