109 lines
4.1 KiB
Diff
109 lines
4.1 KiB
Diff
From: Huacai Chen <chenhc@lemote.com>
|
|
Date: Thu, 26 Jun 2014 11:41:32 +0800
|
|
Subject: [8/8] MIPS: Loongson: Rename CONFIG_LEMOTE_MACH3A to
|
|
CONFIG_LOONGSON_MACH3X
|
|
Origin: https://git.kernel.org/linus/5a21e0ba3e8996353e6892ccc54b0aab541d9722
|
|
|
|
Since this CONFIG option will be used for both Loongson-3A/3B machines,
|
|
and not all Loongson-3 machines are produced by Lemote, we rename
|
|
CONFIG_LEMOTE_MACH3A to CONFIG_LOONGSON_MACH3X.
|
|
|
|
Signed-off-by: Huacai Chen <chenhc@lemote.com>
|
|
Cc: John Crispin <john@phrozen.org>
|
|
Cc: Steven J. Hill <Steven.Hill@imgtec.com>
|
|
Cc: Aurelien Jarno <aurelien@aurel32.net>
|
|
Cc: linux-mips@linux-mips.org
|
|
Cc: Fuxin Zhang <zhangfx@lemote.com>
|
|
Cc: Zhangjin Wu <wuzhangjin@gmail.com>
|
|
Patchwork: https://patchwork.linux-mips.org/patch/7190/
|
|
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
|
|
---
|
|
arch/mips/configs/loongson3_defconfig | 2 +-
|
|
arch/mips/include/asm/mach-loongson/machine.h | 4 ++--
|
|
arch/mips/loongson/Kconfig | 8 ++++----
|
|
arch/mips/loongson/Platform | 2 +-
|
|
arch/mips/pci/Makefile | 2 +-
|
|
5 files changed, 9 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/arch/mips/configs/loongson3_defconfig b/arch/mips/configs/loongson3_defconfig
|
|
index ea1761f..130e31b 100644
|
|
--- a/arch/mips/configs/loongson3_defconfig
|
|
+++ b/arch/mips/configs/loongson3_defconfig
|
|
@@ -1,6 +1,6 @@
|
|
CONFIG_MACH_LOONGSON=y
|
|
CONFIG_SWIOTLB=y
|
|
-CONFIG_LEMOTE_MACH3A=y
|
|
+CONFIG_LOONGSON_MACH3X=y
|
|
CONFIG_CPU_LOONGSON3=y
|
|
CONFIG_64BIT=y
|
|
CONFIG_PAGE_SIZE_16KB=y
|
|
diff --git a/arch/mips/include/asm/mach-loongson/machine.h b/arch/mips/include/asm/mach-loongson/machine.h
|
|
index 1b1f592..228e3784 100644
|
|
--- a/arch/mips/include/asm/mach-loongson/machine.h
|
|
+++ b/arch/mips/include/asm/mach-loongson/machine.h
|
|
@@ -24,10 +24,10 @@
|
|
|
|
#endif
|
|
|
|
-#ifdef CONFIG_LEMOTE_MACH3A
|
|
+#ifdef CONFIG_LOONGSON_MACH3X
|
|
|
|
#define LOONGSON_MACHTYPE MACH_LEMOTE_A1101
|
|
|
|
-#endif /* CONFIG_LEMOTE_MACH3A */
|
|
+#endif /* CONFIG_LOONGSON_MACH3X */
|
|
|
|
#endif /* __ASM_MACH_LOONGSON_MACHINE_H */
|
|
diff --git a/arch/mips/loongson/Kconfig b/arch/mips/loongson/Kconfig
|
|
index a14a50d..1b91fc6 100644
|
|
--- a/arch/mips/loongson/Kconfig
|
|
+++ b/arch/mips/loongson/Kconfig
|
|
@@ -60,8 +60,8 @@ config LEMOTE_MACH2F
|
|
These family machines include fuloong2f mini PC, yeeloong2f notebook,
|
|
LingLoong allinone PC and so forth.
|
|
|
|
-config LEMOTE_MACH3A
|
|
- bool "Lemote Loongson 3A family machines"
|
|
+config LOONGSON_MACH3X
|
|
+ bool "Generic Loongson 3 family machines"
|
|
select ARCH_SPARSEMEM_ENABLE
|
|
select GENERIC_ISA_DMA_SUPPORT_BROKEN
|
|
select BOOT_ELF32
|
|
@@ -87,8 +87,8 @@ config LEMOTE_MACH3A
|
|
select ZONE_DMA32
|
|
select LEFI_FIRMWARE_INTERFACE
|
|
help
|
|
- Lemote Loongson 3A family machines utilize the 3A revision of
|
|
- Loongson processor and RS780/SBX00 chipset.
|
|
+ Generic Loongson 3 family machines utilize the 3A/3B revision
|
|
+ of Loongson processor and RS780/SBX00 chipset.
|
|
endchoice
|
|
|
|
config CS5536
|
|
diff --git a/arch/mips/loongson/Platform b/arch/mips/loongson/Platform
|
|
index 6205372..0ac20eb 100644
|
|
--- a/arch/mips/loongson/Platform
|
|
+++ b/arch/mips/loongson/Platform
|
|
@@ -30,4 +30,4 @@ platform-$(CONFIG_MACH_LOONGSON) += loongson/
|
|
cflags-$(CONFIG_MACH_LOONGSON) += -I$(srctree)/arch/mips/include/asm/mach-loongson -mno-branch-likely
|
|
load-$(CONFIG_LEMOTE_FULOONG2E) += 0xffffffff80100000
|
|
load-$(CONFIG_LEMOTE_MACH2F) += 0xffffffff80200000
|
|
-load-$(CONFIG_CPU_LOONGSON3) += 0xffffffff80200000
|
|
+load-$(CONFIG_LOONGSON_MACH3X) += 0xffffffff80200000
|
|
diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile
|
|
index ff8a553..6523d55 100644
|
|
--- a/arch/mips/pci/Makefile
|
|
+++ b/arch/mips/pci/Makefile
|
|
@@ -29,7 +29,7 @@ obj-$(CONFIG_LASAT) += pci-lasat.o
|
|
obj-$(CONFIG_MIPS_COBALT) += fixup-cobalt.o
|
|
obj-$(CONFIG_LEMOTE_FULOONG2E) += fixup-fuloong2e.o ops-loongson2.o
|
|
obj-$(CONFIG_LEMOTE_MACH2F) += fixup-lemote2f.o ops-loongson2.o
|
|
-obj-$(CONFIG_LEMOTE_MACH3A) += fixup-loongson3.o ops-loongson3.o
|
|
+obj-$(CONFIG_LOONGSON_MACH3X) += fixup-loongson3.o ops-loongson3.o
|
|
obj-$(CONFIG_MIPS_MALTA) += fixup-malta.o pci-malta.o
|
|
obj-$(CONFIG_PMC_MSP7120_GW) += fixup-pmcmsp.o ops-pmcmsp.o
|
|
obj-$(CONFIG_PMC_MSP7120_EVAL) += fixup-pmcmsp.o ops-pmcmsp.o
|
|
--
|
|
1.7.10.4
|
|
|