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

Commit 8e497117 authored by Wu Zhangjin's avatar Wu Zhangjin Committed by Ralf Baechle
Browse files

MIPS: Loongson: Change naming methods 



To make source code of loongson sharable to the machines(such as gdium)
made by the other companies, we rename arch/mips/lemote to
arch/mips/loongson, asm/mach-lemote to asm/mach-loongson, and rename lm2e
to the name of the machine: fuloong-2e. accordingly, FULONG are renamed to
FULOONG2E to make it distinguishable to the future FULOONG2F.  and also,
some other relative tuning is needed.

Signed-off-by: default avatarWu Zhangjin <wuzhangjin@gmail.com>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 67b35e5d

arch/mips/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ config MIPS 
	select HAVE_ARCH_KGDB

	# Horrible source of confusion.  Die, die, die ...

	select EMBEDDED

	select RTC_LIB if !LEMOTE_FULONG

	select RTC_LIB if !LEMOTE_FULOONG2E



mainmenu "Linux/MIPS Kernel Configuration"
@@ -174,8 +174,8 @@ config LASAT 
	select SYS_SUPPORTS_64BIT_KERNEL if BROKEN

	select SYS_SUPPORTS_LITTLE_ENDIAN



config LEMOTE_FULONG

	bool "Lemote Fulong mini-PC"

config LEMOTE_FULOONG2E

	bool "Lemote Fuloong2e mini-PC"

	select ARCH_SPARSEMEM_ENABLE

	select CEVT_R4K

	select CSRC_R4K
@@ -196,7 +196,7 @@ config LEMOTE_FULONG 
	select GENERIC_ISA_DMA_SUPPORT_BROKEN

	select CPU_HAS_WB

	help

	  Lemote Fulong mini-PC board based on the Chinese Loongson-2E CPU and

	  Lemote Fuloong2e mini-PC board based on the Chinese Loongson-2E CPU and

	  an FPGA northbridge



config MIPS_MALTA

arch/mips/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -314,11 +314,11 @@ cflags-$(CONFIG_WR_PPMC) += -I$(srctree)/arch/mips/include/asm/mach-wrppmc 
load-$(CONFIG_WR_PPMC)		+= 0xffffffff80100000



#

# lemote fulong mini-PC board

# lemote fuloong2e mini-PC board

#

core-$(CONFIG_LEMOTE_FULONG) +=arch/mips/lemote/lm2e/

load-$(CONFIG_LEMOTE_FULONG) +=0xffffffff80100000

cflags-$(CONFIG_LEMOTE_FULONG) += -I$(srctree)/arch/mips/include/asm/mach-lemote

core-$(CONFIG_LEMOTE_FULOONG2E) +=arch/mips/loongson/fuloong-2e/

load-$(CONFIG_LEMOTE_FULOONG2E) +=0xffffffff80100000

cflags-$(CONFIG_LEMOTE_FULOONG2E) += -I$(srctree)/arch/mips/include/asm/mach-loongson/



#

# MIPS Malta board

arch/mips/include/asm/mach-lemote/cpu-feature-overrides.h→arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h

+3 −3
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ 
 *      loongson2f user manual.

 */



#ifndef __ASM_MACH_LEMOTE_CPU_FEATURE_OVERRIDES_H

#define __ASM_MACH_LEMOTE_CPU_FEATURE_OVERRIDES_H

#ifndef __ASM_MACH_LOONGSON_CPU_FEATURE_OVERRIDES_H

#define __ASM_MACH_LOONGSON_CPU_FEATURE_OVERRIDES_H



#define cpu_dcache_line_size()	32

#define cpu_icache_line_size()	32
@@ -56,4 +56,4 @@ 
#define cpu_has_watch		1

#define cpu_icache_snoops_remote_store	1



#endif /* __ASM_MACH_LEMOTE_CPU_FEATURE_OVERRIDES_H */
 
#endif /* __ASM_MACH_LOONGSON_CPU_FEATURE_OVERRIDES_H */

arch/mips/include/asm/mach-lemote/dma-coherence.h→arch/mips/include/asm/mach-loongson/dma-coherence.h

+3 −3
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ 
 * Author: Fuxin Zhang, zhangfx@lemote.com

 *

 */

#ifndef __ASM_MACH_LEMOTE_DMA_COHERENCE_H

#define __ASM_MACH_LEMOTE_DMA_COHERENCE_H

#ifndef __ASM_MACH_LOONGSON_DMA_COHERENCE_H

#define __ASM_MACH_LOONGSON_DMA_COHERENCE_H



struct device;
@@ -65,4 +65,4 @@ static inline int plat_device_is_coherent(struct device *dev) 
	return 0;

}



#endif /* __ASM_MACH_LEMOTE_DMA_COHERENCE_H */
 
#endif /* __ASM_MACH_LOONGSON_DMA_COHERENCE_H */

arch/mips/include/asm/mach-lemote/loongson.h→arch/mips/include/asm/mach-loongson/loongson.h

+0 −3
Original line number Diff line number Diff line
@@ -21,9 +21,6 @@ 
/* loongson internal northbridge initialization */

extern void bonito_irq_init(void);



/* loongson-based machines specific reboot setup */

extern void mips_reboot_setup(void);



/* environment arguments from bootloader */

extern unsigned long bus_clock, cpu_clock_freq;

extern unsigned long memsize, highmemsize;