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

Commit d936cfc7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

parents 4f47707b adfc7641

arch/mips/Kconfig

+1 −9
Original line number Diff line number Diff line
@@ -1471,7 +1471,7 @@ config SB1_PASS_2_1_WORKAROUNDS 


config 64BIT_PHYS_ADDR

	bool "Support for 64-bit physical address space"

	depends on (CPU_R4X00 || CPU_R5000 || CPU_RM7000 || CPU_RM9000 || CPU_R10000 || CPU_SB1 || CPU_MIPS32_R1 || CPU_MIPS64_R1) && 32BIT

	depends on (CPU_R4X00 || CPU_R5000 || CPU_RM7000 || CPU_RM9000 || CPU_R10000 || CPU_SB1 || CPU_MIPS32 || CPU_MIPS64) && 32BIT



config CPU_ADVANCED

	bool "Override CPU Options"
@@ -1492,14 +1492,6 @@ config CPU_HAS_LLSC 
	  for better performance, N if you don't know.  You must say Y here

	  for multiprocessor machines.



config CPU_HAS_LLDSCD

	bool "lld/scd Instructions available" if CPU_ADVANCED

	default y if !CPU_ADVANCED && !CPU_R3000 && !CPU_VR41XX && !CPU_TX39XX && !CPU_MIPS32_R1

	help

	  Say Y here if your CPU has the lld and scd instructions, the 64-bit

	  equivalents of ll and sc.  Say Y here for better performance, N if

	  you don't know.  You must say Y here for multiprocessor machines.



config CPU_HAS_WB

	bool "Writeback Buffer available" if CPU_ADVANCED

	default y if !CPU_ADVANCED && CPU_R3000 && MACH_DECSTATION

arch/mips/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ endif 
#

cflags-y			+= -I $(TOPDIR)/include/asm/gcc

cflags-y			+= -G 0 -mno-abicalls -fno-pic -pipe

cflags-y			+= $(call cc-option, -finline-limit=100000)

LDFLAGS_vmlinux			+= -G 0 -static -n -nostdlib

MODFLAGS			+= -mlong-calls

arch/mips/configs/bigsur_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -130,7 +130,6 @@ CONFIG_PAGE_SIZE_4KB=y 
# CONFIG_SIBYTE_DMA_PAGEOPS is not set

# CONFIG_MIPS_MT is not set

CONFIG_CPU_HAS_LLSC=y

CONFIG_CPU_HAS_LLDSCD=y

CONFIG_CPU_HAS_SYNC=y

CONFIG_GENERIC_HARDIRQS=y

CONFIG_GENERIC_IRQ_PROBE=y

arch/mips/configs/cobalt_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -115,7 +115,6 @@ CONFIG_PAGE_SIZE_4KB=y 
# CONFIG_MIPS_MT is not set

# CONFIG_CPU_ADVANCED is not set

CONFIG_CPU_HAS_LLSC=y

CONFIG_CPU_HAS_LLDSCD=y

CONFIG_CPU_HAS_SYNC=y

CONFIG_GENERIC_HARDIRQS=y

CONFIG_GENERIC_IRQ_PROBE=y

arch/mips/configs/ddb5476_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ CONFIG_PAGE_SIZE_4KB=y 
# CONFIG_MIPS_MT is not set

# CONFIG_CPU_ADVANCED is not set

CONFIG_CPU_HAS_LLSC=y

CONFIG_CPU_HAS_LLDSCD=y

CONFIG_CPU_HAS_SYNC=y

CONFIG_GENERIC_HARDIRQS=y

CONFIG_GENERIC_IRQ_PROBE=y