From patchwork Mon Mar 30 08:58:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: maobibo X-Patchwork-Id: 11464965 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 453B092C for ; Mon, 30 Mar 2020 08:59:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 240D720733 for ; Mon, 30 Mar 2020 08:59:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729736AbgC3I7B (ORCPT ); Mon, 30 Mar 2020 04:59:01 -0400 Received: from mail.loongson.cn ([114.242.206.163]:33206 "EHLO loongson.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729735AbgC3I7B (ORCPT ); Mon, 30 Mar 2020 04:59:01 -0400 Received: from kvm-dev1.localdomain (unknown [10.2.5.134]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9Dxv9vPtIFeGpkhAA--.23S2; Mon, 30 Mar 2020 16:58:55 +0800 (CST) From: bibo mao To: Thomas Bogendoerfer , Jiaxun Yang , Huacai Chen Cc: linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 15/39] MIPS: emma: Add header file path prefix Date: Mon, 30 Mar 2020 04:58:55 -0400 Message-Id: <1585558735-31535-1-git-send-email-maobibo@loongson.cn> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: AQAAf9Dxv9vPtIFeGpkhAA--.23S2 X-Coremail-Antispam: 1UD129KBjvJXoW3Xr15Gw13tF43Ww4fKrW7Jwb_yoW7KF4rpa 1DA3Z5GF4UuryUAayruFy7ZF43Jan5KrW0kryUW34UZ3WaqF1UJrs3Wr98CFyxAFWDt3WF grZxXrW5tw4vvaUanT9S1TB71UUUUUDqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkSb7Iv0xC_KF4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Cr0_Gr1UM28EF7xvwVC2z280aVAFwI0_Gr1j6F4UJwA2z4x0Y4 vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xv F2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_JF0_Jw1lYx0Ex4A2jsIE14v26F4j6r 4UJwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lc2xSY4AK6svPMxAIw28I cxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2 IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc40Y0x0EwIxGrwCI 42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42 IY6xAIw20EY4v20xvaj40_Wr1j6rW3Jr1lIxAIcVC2z280aVAFwI0_Cr0_Gr1UMIIF0xvE x4A2jsIEc7CjxVAFwI0_Gr1j6F4UJbIYCTnIWIevJa73UjIFyTuYvjxU7R6zUUUUU X-CM-SenderInfo: xpdruxter6z05rqj20fqof0/ Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org Remove header files from arch/mips/include/asm/mach-emma2rh to arch/mips/emma/include/mach Signed-off-by: bibo mao --- arch/mips/Kconfig | 1 + arch/mips/emma/Platform | 2 +- arch/mips/emma/include/mach/cpu-feature-overrides.h | 2 ++ arch/mips/emma/include/mach/ioremap.h | 2 ++ arch/mips/{include/asm/mach-emma2rh => emma/include/mach}/irq.h | 0 arch/mips/emma/include/mach/kernel-entry-init.h | 2 ++ arch/mips/emma/include/mach/kmalloc.h | 2 ++ arch/mips/emma/include/mach/mangle-port.h | 2 ++ arch/mips/emma/include/mach/mc146818rtc.h | 2 ++ arch/mips/emma/include/mach/spaces.h | 2 ++ arch/mips/emma/include/mach/topology.h | 2 ++ arch/mips/emma/include/mach/war.h | 2 ++ arch/mips/include/asm/emma/emma2rh.h | 2 +- 13 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 arch/mips/emma/include/mach/cpu-feature-overrides.h create mode 100644 arch/mips/emma/include/mach/ioremap.h rename arch/mips/{include/asm/mach-emma2rh => emma/include/mach}/irq.h (100%) create mode 100644 arch/mips/emma/include/mach/kernel-entry-init.h create mode 100644 arch/mips/emma/include/mach/kmalloc.h create mode 100644 arch/mips/emma/include/mach/mangle-port.h create mode 100644 arch/mips/emma/include/mach/mc146818rtc.h create mode 100644 arch/mips/emma/include/mach/spaces.h create mode 100644 arch/mips/emma/include/mach/topology.h create mode 100644 arch/mips/emma/include/mach/war.h diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 17e1131..cef1723 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -1360,6 +1360,7 @@ config SOC_EMMA2RH select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_64BIT_KERNEL select SYS_SUPPORTS_BIG_ENDIAN + select HAVE_MACH_HEAD_FILES config SOC_PNX833X bool diff --git a/arch/mips/emma/Platform b/arch/mips/emma/Platform index 0282f7f..f97aecf 100644 --- a/arch/mips/emma/Platform +++ b/arch/mips/emma/Platform @@ -1,4 +1,4 @@ platform-$(CONFIG_SOC_EMMA2RH) += emma/ cflags-$(CONFIG_SOC_EMMA2RH) += \ - -I$(srctree)/arch/mips/include/asm/mach-emma2rh + -I$(srctree)/arch/mips/emma/include load-$(CONFIG_NEC_MARKEINS) += 0xffffffff88100000 diff --git a/arch/mips/emma/include/mach/cpu-feature-overrides.h b/arch/mips/emma/include/mach/cpu-feature-overrides.h new file mode 100644 index 0000000..f3e0e12 --- /dev/null +++ b/arch/mips/emma/include/mach/cpu-feature-overrides.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/emma/include/mach/ioremap.h b/arch/mips/emma/include/mach/ioremap.h new file mode 100644 index 0000000..2369393 --- /dev/null +++ b/arch/mips/emma/include/mach/ioremap.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-emma2rh/irq.h b/arch/mips/emma/include/mach/irq.h similarity index 100% rename from arch/mips/include/asm/mach-emma2rh/irq.h rename to arch/mips/emma/include/mach/irq.h diff --git a/arch/mips/emma/include/mach/kernel-entry-init.h b/arch/mips/emma/include/mach/kernel-entry-init.h new file mode 100644 index 0000000..19b872be --- /dev/null +++ b/arch/mips/emma/include/mach/kernel-entry-init.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/emma/include/mach/kmalloc.h b/arch/mips/emma/include/mach/kmalloc.h new file mode 100644 index 0000000..4f056db --- /dev/null +++ b/arch/mips/emma/include/mach/kmalloc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/emma/include/mach/mangle-port.h b/arch/mips/emma/include/mach/mangle-port.h new file mode 100644 index 0000000..b9736e3 --- /dev/null +++ b/arch/mips/emma/include/mach/mangle-port.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/emma/include/mach/mc146818rtc.h b/arch/mips/emma/include/mach/mc146818rtc.h new file mode 100644 index 0000000..7284af8 --- /dev/null +++ b/arch/mips/emma/include/mach/mc146818rtc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/emma/include/mach/spaces.h b/arch/mips/emma/include/mach/spaces.h new file mode 100644 index 0000000..39a4d72 --- /dev/null +++ b/arch/mips/emma/include/mach/spaces.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/emma/include/mach/topology.h b/arch/mips/emma/include/mach/topology.h new file mode 100644 index 0000000..86e585b --- /dev/null +++ b/arch/mips/emma/include/mach/topology.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/emma/include/mach/war.h b/arch/mips/emma/include/mach/war.h new file mode 100644 index 0000000..5b0422a --- /dev/null +++ b/arch/mips/emma/include/mach/war.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/emma/emma2rh.h b/arch/mips/include/asm/emma/emma2rh.h index a25cdb3..2797f34 100644 --- a/arch/mips/include/asm/emma/emma2rh.h +++ b/arch/mips/include/asm/emma/emma2rh.h @@ -8,7 +8,7 @@ #ifndef __ASM_EMMA_EMMA2RH_H #define __ASM_EMMA_EMMA2RH_H -#include +#include /* * EMMA2RH registers