From a103e9b951f9094792fd0dab0a0dcd1b3408825a Mon Sep 17 00:00:00 2001 From: Paul Cercueil Date: Sun, 6 Sep 2020 21:29:33 +0200 Subject: [PATCH] MIPS: jz4740: Rename jz4740 folders to ingenic Now that all the jz4740 platform code has been removed, and we're left with only a Kconfig and the cpu-feature-overrides.h file, finalize the cleanup process by renaming the jz4740 and include/mach-jz4740 folders to ingenic and include/mach-ingenic. Signed-off-by: Paul Cercueil Signed-off-by: Thomas Bogendoerfer --- arch/mips/Kconfig | 2 +- arch/mips/generic/Platform | 2 +- .../asm/{mach-jz4740 => mach-ingenic}/cpu-feature-overrides.h | 0 arch/mips/{jz4740 => ingenic}/Kconfig | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename arch/mips/include/asm/{mach-jz4740 => mach-ingenic}/cpu-feature-overrides.h (100%) rename arch/mips/{jz4740 => ingenic}/Kconfig (100%) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 74604b867e26..c08c98d654b1 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -1034,8 +1034,8 @@ source "arch/mips/bcm47xx/Kconfig" source "arch/mips/bcm63xx/Kconfig" source "arch/mips/bmips/Kconfig" source "arch/mips/generic/Kconfig" +source "arch/mips/ingenic/Kconfig" source "arch/mips/jazz/Kconfig" -source "arch/mips/jz4740/Kconfig" source "arch/mips/lantiq/Kconfig" source "arch/mips/pic32/Kconfig" source "arch/mips/pistachio/Kconfig" diff --git a/arch/mips/generic/Platform b/arch/mips/generic/Platform index 7d511fc28a01..f8ef2f9d107e 100644 --- a/arch/mips/generic/Platform +++ b/arch/mips/generic/Platform @@ -9,7 +9,7 @@ # # Note: order matters, keep the asm/mach-generic include last. -cflags-$(CONFIG_MACH_INGENIC_SOC) += -I$(srctree)/arch/mips/include/asm/mach-jz4740 +cflags-$(CONFIG_MACH_INGENIC_SOC) += -I$(srctree)/arch/mips/include/asm/mach-ingenic cflags-$(CONFIG_MIPS_GENERIC) += -I$(srctree)/arch/mips/include/asm/mach-generic load-$(CONFIG_MIPS_GENERIC) += 0xffffffff80100000 diff --git a/arch/mips/include/asm/mach-jz4740/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ingenic/cpu-feature-overrides.h similarity index 100% rename from arch/mips/include/asm/mach-jz4740/cpu-feature-overrides.h rename to arch/mips/include/asm/mach-ingenic/cpu-feature-overrides.h diff --git a/arch/mips/jz4740/Kconfig b/arch/mips/ingenic/Kconfig similarity index 100% rename from arch/mips/jz4740/Kconfig rename to arch/mips/ingenic/Kconfig