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

Commit 147fdd8c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sh-for-4.9' of git://git.libc.org/linux-sh 

Pull arch/sh updates from Rich Felker:
 "Minor changes to improve J2 support and match Kconfig expectations of
  other subsystems"

* tag 'sh-for-4.9' of git://git.libc.org/linux-sh:
  sh: add earlycon support to j2_defconfig
  sh: add Kconfig option for J-Core SoC core drivers
  sh: support CPU_J2 when compiler lacks -mj2
parents 893e2c5c 99f453f8

arch/sh/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ isa-y := $(isa-y)-up 
endif



cflags-$(CONFIG_CPU_SH2)		:= $(call cc-option,-m2,)

cflags-$(CONFIG_CPU_J2)			:= $(call cc-option,-mj2,)

cflags-$(CONFIG_CPU_J2)			+= $(call cc-option,-mj2,)

cflags-$(CONFIG_CPU_SH2A)		+= $(call cc-option,-m2a,) \

					   $(call cc-option,-m2a-nofpu,) \

					   $(call cc-option,-m4-nofpu,)

arch/sh/boards/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -22,6 +22,16 @@ config SH_DEVICE_TREE 
	  have sufficient driver coverage to use this option; do not

	  select it if you are using original SuperH hardware.



config SH_JCORE_SOC

	bool "J-Core SoC"

	depends on SH_DEVICE_TREE && (CPU_SH2 || CPU_J2)

	select CLKSRC_JCORE_PIT

	select JCORE_AIC

	default y if CPU_J2

	help

	  Select this option to include drivers core components of the

	  J-Core SoC, including interrupt controllers and timers.



config SH_SOLUTION_ENGINE

	bool "SolutionEngine"

	select SOLUTION_ENGINE

arch/sh/configs/j2_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ CONFIG_MEMORY_START=0x10000000 
CONFIG_MEMORY_SIZE=0x04000000

CONFIG_CPU_BIG_ENDIAN=y

CONFIG_SH_DEVICE_TREE=y

CONFIG_SH_JCORE_SOC=y

CONFIG_HZ_100=y

CONFIG_CMDLINE_OVERWRITE=y

CONFIG_CMDLINE="console=ttyUL0 earlycon"
@@ -20,6 +21,7 @@ CONFIG_INET=y 
CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_NETDEVICES=y

CONFIG_SERIAL_EARLYCON=y

CONFIG_SERIAL_UARTLITE=y

CONFIG_SERIAL_UARTLITE_CONSOLE=y

CONFIG_I2C=y