Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30ad29bb authored by Huacai Chen's avatar Huacai Chen Committed by Ralf Baechle
Browse files

MIPS: Loongson: Naming style cleanup and rework 



Currently, code of Loongson-2/3 is under loongson directory and code of
Loongson-1 is under loongson1 directory. Besides, there are Kconfig
options such as MACH_LOONGSON and MACH_LOONGSON1. This naming style is
very ugly and confusing. Since Loongson-2/3 are both 64-bit general-
purpose CPU while Loongson-1 is 32-bit SoC, we rename both file names
and Kconfig symbols from loongson/loongson1 to loongson64/loongson32.

[ralf@linux-mips.org: Resolve a number of simple conflicts.]

Signed-off-by: default avatarHuacai Chen <chenhc@lemote.com>
Cc: Steven J. Hill <Steven.Hill@imgtec.com>
Cc: linux-mips@linux-mips.org
Cc: Fuxin Zhang <zhangfx@lemote.com>
Cc: Zhangjin Wu <wuzhangjin@gmail.com>
Cc: Kelvin Cheung <keguang.zhang@gmail.com>
Patchwork: https://patchwork.linux-mips.org/patch/9790/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent abcc82b1

arch/mips/Kbuild.platforms

+2 −2
Original line number Original line Diff line number Diff line
@@ -15,8 +15,8 @@ platforms += jazz 
platforms += jz4740

platforms += jz4740

platforms += lantiq

platforms += lantiq

platforms += lasat

platforms += lasat

platforms += loongson

platforms += loongson32

platforms += loongson1

platforms += loongson64

platforms += mti-malta

platforms += mti-malta

platforms += mti-sead3

platforms += mti-sead3

platforms += netlogic

platforms += netlogic

arch/mips/Kconfig

+18 −16
Original line number Original line Diff line number Diff line
@@ -26,7 +26,7 @@ config MIPS 
	select HAVE_SYSCALL_TRACEPOINTS

	select HAVE_SYSCALL_TRACEPOINTS

	select ARCH_HAS_ELF_RANDOMIZE

	select ARCH_HAS_ELF_RANDOMIZE

	select HAVE_ARCH_TRANSPARENT_HUGEPAGE if CPU_SUPPORTS_HUGEPAGES && 64BIT

	select HAVE_ARCH_TRANSPARENT_HUGEPAGE if CPU_SUPPORTS_HUGEPAGES && 64BIT

	select RTC_LIB if !MACH_LOONGSON

	select RTC_LIB if !MACH_LOONGSON64

	select GENERIC_ATOMIC64 if !64BIT

	select GENERIC_ATOMIC64 if !64BIT

	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE

	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE

	select HAVE_DMA_ATTRS

	select HAVE_DMA_ATTRS
@@ -346,26 +346,28 @@ config LASAT 
	select SYS_SUPPORTS_64BIT_KERNEL if BROKEN

	select SYS_SUPPORTS_64BIT_KERNEL if BROKEN

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_SUPPORTS_LITTLE_ENDIAN





config MACH_LOONGSON

config MACH_LOONGSON32

	bool "Loongson family of machines"

	bool "Loongson-1 family of machines"

	select SYS_SUPPORTS_ZBOOT

	select SYS_SUPPORTS_ZBOOT

	help

	help

	  This enables the support of Loongson family of machines.

	  This enables support for the Loongson-1 family of machines.





	  Loongson is a family of general-purpose MIPS-compatible CPUs.

	  Loongson-1 is a family of 32-bit MIPS-compatible SoCs developed by

	  developed at Institute of Computing Technology (ICT),

	  the Institute of Computing Technology (ICT), Chinese Academy of

	  Chinese Academy of Sciences (CAS) in the People's Republic

	  Sciences (CAS).

	  of China. The chief architect is Professor Weiwu Hu.





config MACH_LOONGSON1

config MACH_LOONGSON64

	bool "Loongson 1 family of machines"

	bool "Loongson-2/3 family of machines"

	select SYS_SUPPORTS_ZBOOT

	select SYS_SUPPORTS_ZBOOT

	help

	help

	  This enables support for the Loongson 1 based machines.

	  This enables the support of Loongson-2/3 family of machines.





	  Loongson 1 is a family of 32-bit MIPS-compatible SoCs developed by

	  Loongson-2 is a family of single-core CPUs and Loongson-3 is a

	  the ICT (Institute of Computing Technology) and the Chinese Academy

	  family of multi-core CPUs. They are both 64-bit general-purpose

	  of Sciences.

	  MIPS-compatible CPUs. Loongson-2/3 are developed by the Institute

	  of Computing Technology (ICT), Chinese Academy of Sciences (CAS)

	  in the People's Republic of China. The chief architect is Professor

	  Weiwu Hu.





config MACH_PISTACHIO

config MACH_PISTACHIO

	bool "IMG Pistachio SoC based boards"

	bool "IMG Pistachio SoC based boards"
@@ -948,8 +950,8 @@ source "arch/mips/sibyte/Kconfig" 
source "arch/mips/txx9/Kconfig"

source "arch/mips/txx9/Kconfig"

source "arch/mips/vr41xx/Kconfig"

source "arch/mips/vr41xx/Kconfig"

source "arch/mips/cavium-octeon/Kconfig"

source "arch/mips/cavium-octeon/Kconfig"

source "arch/mips/loongson/Kconfig"

source "arch/mips/loongson32/Kconfig"

source "arch/mips/loongson1/Kconfig"

source "arch/mips/loongson64/Kconfig"

source "arch/mips/netlogic/Kconfig"

source "arch/mips/netlogic/Kconfig"

source "arch/mips/paravirt/Kconfig"

source "arch/mips/paravirt/Kconfig"

arch/mips/boot/compressed/uart-16550.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -7,7 +7,7 @@ 




#include <asm/addrspace.h>

#include <asm/addrspace.h>





#if defined(CONFIG_MACH_LOONGSON) || defined(CONFIG_MIPS_MALTA)

#if defined(CONFIG_MACH_LOONGSON64) || defined(CONFIG_MIPS_MALTA)

#define UART_BASE 0x1fd003f8

#define UART_BASE 0x1fd003f8

#define PORT(offset) (CKSEG1ADDR(UART_BASE) + (offset))

#define PORT(offset) (CKSEG1ADDR(UART_BASE) + (offset))

#endif

#endif

arch/mips/configs/fuloong2e_defconfig

+1 −1
Original line number Original line Diff line number Diff line 
CONFIG_MACH_LOONGSON=y

CONFIG_MACH_LOONGSON64=y

CONFIG_64BIT=y

CONFIG_64BIT=y

CONFIG_NO_HZ=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_HIGH_RES_TIMERS=y

arch/mips/configs/lemote2f_defconfig

+1 −1
Original line number Original line Diff line number Diff line 
CONFIG_MACH_LOONGSON=y

CONFIG_MACH_LOONGSON64=y

CONFIG_LEMOTE_MACH2F=y

CONFIG_LEMOTE_MACH2F=y

CONFIG_CS5536_MFGPT=y

CONFIG_CS5536_MFGPT=y

CONFIG_64BIT=y

CONFIG_64BIT=y