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

Commit 3d430bdb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arc-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc 

Pull ARC updates from Vineet Gupta:
 "Sorry for the late pull request.  Current stuff was ready for a while
  but I was hoping to squeeze in support for almost ready ARC SDP
  platform (and avoid a 2nd pull request), however it seems there are
  still some loose ends which warrant more time.

   - Platform code reduction/moving-up (TB10X no longer needs any
     callbacks)
   - updated boot printing
   - kgdb update for arc gdb 7.5
   - bug fixes (some marked for stable)
   - more code refactoring/consolidation"

* tag 'arc-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
  ARC: boot: cpu feature print enhancements
  ARC: boot: consolidate cross-checking of h/w and s/w
  ARC: unbork FPU save/restore
  ARC: remove extraneous __KERNEL__ guards
  ARC: Update order of registers in KGDB to match GDB 7.5
  ARC: Remove unneeded Kconfig entry NO_DMA
  ARC: BUG() dumps stack after @msg (@msg now same as in generic BUG))
  ARC: refactoring: reduce the scope of some local vars
  ARC: remove gcc mpy heuristics
  ARC: RIP @running_on_hw
  ARC: Update comments about uncached address space
  ARC: rename kconfig option for unaligned emulation
  ARC: [nsimosci] Allow "headless" models to boot
  ARC: [arcfpga] Get rid of ARC_BOARD_ANGEL4 and ARC_BOARD_ML509
  ARC: [arcfpga] Remove more dead code
  ARC: [plat*] move code out of .init_machine into common
  ARC: [arcfpga] consolidate machine description, DT
  ARC: Allow SMP kernel to build/boot on UP-only infrastructure
parents dc303408 56372082

arch/arc/Kconfig

+2 −4
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
config ARC

	def_bool y

	select BUILDTIME_EXTABLE_SORT

	select COMMON_CLK

	select CLONE_BACKWARDS

	# ARC Busybox based initramfs absolutely relies on DEVTMPFS for /dev

	select DEVTMPFS if !INITRAMFS_SOURCE=""
@@ -73,9 +74,6 @@ config STACKTRACE_SUPPORT 
config HAVE_LATENCYTOP_SUPPORT

	def_bool y



config NO_DMA

	def_bool n



source "init/Kconfig"

source "kernel/Kconfig.freezer"
@@ -354,7 +352,7 @@ config ARC_CURR_IN_REG 
	  kernel mode. This saves memory access for each such access





config ARC_MISALIGN_ACCESS

config ARC_EMUL_UNALIGNED

	bool "Emulate unaligned memory access (userspace only)"

	select SYSCTL_ARCH_UNALIGN_NO_WARN

	select SYSCTL_ARCH_UNALIGN_ALLOW

arch/arc/Makefile

+1 −16
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ ifdef CONFIG_ARC_CURR_IN_REG 
LINUXINCLUDE	+=  -include ${src}/arch/arc/include/asm/current.h

endif



upto_gcc42    :=  $(call cc-ifversion, -le, 0402, y)

upto_gcc44    :=  $(call cc-ifversion, -le, 0404, y)

atleast_gcc44 :=  $(call cc-ifversion, -ge, 0404, y)

atleast_gcc48 :=  $(call cc-ifversion, -ge, 0408, y)
@@ -60,25 +59,11 @@ ldflags-$(CONFIG_CPU_BIG_ENDIAN) += -EB 
# --build-id w/o "-marclinux". Default arc-elf32-ld is OK

ldflags-$(upto_gcc44)			+= -marclinux



ARC_LIBGCC				:= -mA7

cflags-$(CONFIG_ARC_HAS_HW_MPY)		+= -multcost=16



ifndef CONFIG_ARC_HAS_HW_MPY

	cflags-y	+= -mno-mpy



# newlib for ARC700 assumes MPY to be always present, which is generally true

# However, if someone really doesn't want MPY, we need to use the 600 ver

# which coupled with -mno-mpy will use mpy emulation

# With gcc 4.4.7, -mno-mpy is enough to make any other related adjustments,

# e.g. increased cost of MPY. With gcc 4.2.1 this had to be explicitly hinted



	ifeq ($(upto_gcc42),y)

		ARC_LIBGCC	:= -marc600

		cflags-y	+= -multcost=30

	endif

endif



LIBGCC	:= $(shell $(CC) $(ARC_LIBGCC) $(cflags-y) --print-libgcc-file-name)

LIBGCC	:= $(shell $(CC) $(cflags-y) --print-libgcc-file-name)



# Modules with short calls might break for calls into builtin-kernel

KBUILD_CFLAGS_MODULE	+= -mlong-calls

arch/arc/boot/dts/angel4.dts

+0 −5
Original line number Diff line number Diff line
@@ -24,11 +24,6 @@ 
		serial0 = &arcuart0;

	};



	memory {

		device_type = "memory";

		reg = <0x00000000 0x10000000>;	/* 256M */

	};



	fpga {

		compatible = "simple-bus";

		#address-cells = <1>;

arch/arc/boot/dts/nsimosci.dts

+1 −6
Original line number Diff line number Diff line
@@ -20,18 +20,13 @@ 
		/* this is for console on PGU */

		/* bootargs = "console=tty0 consoleblank=0"; */

		/* this is for console on serial */

		bootargs = "earlycon=uart8250,mmio32,0xc0000000,115200n8 console=ttyS0,115200n8 consoleblank=0 debug";

		bootargs = "earlycon=uart8250,mmio32,0xc0000000,115200n8 console=tty0 console=ttyS0,115200n8 consoleblank=0 debug";

	};



	aliases {

		serial0 = &uart0;

	};



	memory {

		device_type = "memory";

		reg = <0x80000000 0x10000000>;	/* 256M */

	};



	fpga {

		compatible = "simple-bus";

		#address-cells = <1>;

arch/arc/configs/fpga_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ CONFIG_MODULES=y 
# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARC_PLAT_FPGA_LEGACY=y

CONFIG_ARC_BOARD_ML509=y

# CONFIG_ARC_HAS_RTSC is not set

CONFIG_ARC_BUILTIN_DTB_NAME="angel4"

CONFIG_PREEMPT=y