Commit 5a21e0ba authored by Huacai Chen's avatar Huacai Chen Committed by Ralf Baechle

MIPS: Loongson: Rename CONFIG_LEMOTE_MACH3A to CONFIG_LOONGSON_MACH3X

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: default avatarHuacai 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: default avatarRalf Baechle <ralf@linux-mips.org>
parent ef2f826c
CONFIG_MACH_LOONGSON=y CONFIG_MACH_LOONGSON=y
CONFIG_SWIOTLB=y CONFIG_SWIOTLB=y
CONFIG_LEMOTE_MACH3A=y CONFIG_LOONGSON_MACH3X=y
CONFIG_CPU_LOONGSON3=y CONFIG_CPU_LOONGSON3=y
CONFIG_64BIT=y CONFIG_64BIT=y
CONFIG_PAGE_SIZE_16KB=y CONFIG_PAGE_SIZE_16KB=y
......
...@@ -24,10 +24,10 @@ ...@@ -24,10 +24,10 @@
#endif #endif
#ifdef CONFIG_LEMOTE_MACH3A #ifdef CONFIG_LOONGSON_MACH3X
#define LOONGSON_MACHTYPE MACH_LEMOTE_A1101 #define LOONGSON_MACHTYPE MACH_LEMOTE_A1101
#endif /* CONFIG_LEMOTE_MACH3A */ #endif /* CONFIG_LOONGSON_MACH3X */
#endif /* __ASM_MACH_LOONGSON_MACHINE_H */ #endif /* __ASM_MACH_LOONGSON_MACHINE_H */
...@@ -60,8 +60,8 @@ config LEMOTE_MACH2F ...@@ -60,8 +60,8 @@ config LEMOTE_MACH2F
These family machines include fuloong2f mini PC, yeeloong2f notebook, These family machines include fuloong2f mini PC, yeeloong2f notebook,
LingLoong allinone PC and so forth. LingLoong allinone PC and so forth.
config LEMOTE_MACH3A config LOONGSON_MACH3X
bool "Lemote Loongson 3A family machines" bool "Generic Loongson 3 family machines"
select ARCH_SPARSEMEM_ENABLE select ARCH_SPARSEMEM_ENABLE
select GENERIC_ISA_DMA_SUPPORT_BROKEN select GENERIC_ISA_DMA_SUPPORT_BROKEN
select BOOT_ELF32 select BOOT_ELF32
...@@ -87,8 +87,8 @@ config LEMOTE_MACH3A ...@@ -87,8 +87,8 @@ config LEMOTE_MACH3A
select ZONE_DMA32 select ZONE_DMA32
select LEFI_FIRMWARE_INTERFACE select LEFI_FIRMWARE_INTERFACE
help help
Lemote Loongson 3A family machines utilize the 3A revision of Generic Loongson 3 family machines utilize the 3A/3B revision
Loongson processor and RS780/SBX00 chipset. of Loongson processor and RS780/SBX00 chipset.
endchoice endchoice
config CS5536 config CS5536
......
...@@ -30,4 +30,4 @@ platform-$(CONFIG_MACH_LOONGSON) += loongson/ ...@@ -30,4 +30,4 @@ platform-$(CONFIG_MACH_LOONGSON) += loongson/
cflags-$(CONFIG_MACH_LOONGSON) += -I$(srctree)/arch/mips/include/asm/mach-loongson -mno-branch-likely cflags-$(CONFIG_MACH_LOONGSON) += -I$(srctree)/arch/mips/include/asm/mach-loongson -mno-branch-likely
load-$(CONFIG_LEMOTE_FULOONG2E) += 0xffffffff80100000 load-$(CONFIG_LEMOTE_FULOONG2E) += 0xffffffff80100000
load-$(CONFIG_LEMOTE_MACH2F) += 0xffffffff80200000 load-$(CONFIG_LEMOTE_MACH2F) += 0xffffffff80200000
load-$(CONFIG_CPU_LOONGSON3) += 0xffffffff80200000 load-$(CONFIG_LOONGSON_MACH3X) += 0xffffffff80200000
...@@ -29,7 +29,7 @@ obj-$(CONFIG_LASAT) += pci-lasat.o ...@@ -29,7 +29,7 @@ obj-$(CONFIG_LASAT) += pci-lasat.o
obj-$(CONFIG_MIPS_COBALT) += fixup-cobalt.o obj-$(CONFIG_MIPS_COBALT) += fixup-cobalt.o
obj-$(CONFIG_LEMOTE_FULOONG2E) += fixup-fuloong2e.o ops-loongson2.o obj-$(CONFIG_LEMOTE_FULOONG2E) += fixup-fuloong2e.o ops-loongson2.o
obj-$(CONFIG_LEMOTE_MACH2F) += fixup-lemote2f.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_MIPS_MALTA) += fixup-malta.o pci-malta.o
obj-$(CONFIG_PMC_MSP7120_GW) += fixup-pmcmsp.o ops-pmcmsp.o obj-$(CONFIG_PMC_MSP7120_GW) += fixup-pmcmsp.o ops-pmcmsp.o
obj-$(CONFIG_PMC_MSP7120_EVAL) += fixup-pmcmsp.o ops-pmcmsp.o obj-$(CONFIG_PMC_MSP7120_EVAL) += fixup-pmcmsp.o ops-pmcmsp.o
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment