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

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
...@@ -31,7 +31,7 @@ isa-y := $(isa-y)-up ...@@ -31,7 +31,7 @@ isa-y := $(isa-y)-up
endif endif
cflags-$(CONFIG_CPU_SH2) := $(call cc-option,-m2,) 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,) \ cflags-$(CONFIG_CPU_SH2A) += $(call cc-option,-m2a,) \
$(call cc-option,-m2a-nofpu,) \ $(call cc-option,-m2a-nofpu,) \
$(call cc-option,-m4-nofpu,) $(call cc-option,-m4-nofpu,)
......
...@@ -22,6 +22,16 @@ config SH_DEVICE_TREE ...@@ -22,6 +22,16 @@ config SH_DEVICE_TREE
have sufficient driver coverage to use this option; do not have sufficient driver coverage to use this option; do not
select it if you are using original SuperH hardware. 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 config SH_SOLUTION_ENGINE
bool "SolutionEngine" bool "SolutionEngine"
select SOLUTION_ENGINE select SOLUTION_ENGINE
......
...@@ -8,6 +8,7 @@ CONFIG_MEMORY_START=0x10000000 ...@@ -8,6 +8,7 @@ CONFIG_MEMORY_START=0x10000000
CONFIG_MEMORY_SIZE=0x04000000 CONFIG_MEMORY_SIZE=0x04000000
CONFIG_CPU_BIG_ENDIAN=y CONFIG_CPU_BIG_ENDIAN=y
CONFIG_SH_DEVICE_TREE=y CONFIG_SH_DEVICE_TREE=y
CONFIG_SH_JCORE_SOC=y
CONFIG_HZ_100=y CONFIG_HZ_100=y
CONFIG_CMDLINE_OVERWRITE=y CONFIG_CMDLINE_OVERWRITE=y
CONFIG_CMDLINE="console=ttyUL0 earlycon" CONFIG_CMDLINE="console=ttyUL0 earlycon"
...@@ -20,6 +21,7 @@ CONFIG_INET=y ...@@ -20,6 +21,7 @@ CONFIG_INET=y
CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y CONFIG_DEVTMPFS_MOUNT=y
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
CONFIG_SERIAL_EARLYCON=y
CONFIG_SERIAL_UARTLITE=y CONFIG_SERIAL_UARTLITE=y
CONFIG_SERIAL_UARTLITE_CONSOLE=y CONFIG_SERIAL_UARTLITE_CONSOLE=y
CONFIG_I2C=y CONFIG_I2C=y
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment