Commit 415bfd9c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-20190617' of git://git.sourceforge.jp/gitroot/uclinux-h8/linux 

Pull SH updates from Yoshinori Sato.

kprobe fix, defconfig updates and a SH Kconfig fix.

* tag 'for-linus-20190617' of git://git.sourceforge.jp/gitroot/uclinux-h8/linux:
  arch/sh: Check for kprobe trap number before trying to handle a kprobe trap
  sh: configs: Remove useless UEVENT_HELPER_PATH
  Fix allyesconfig output.
parents 57a8ec38 d3023897

arch/sh/boards/Kconfig

+3 −11
Original line number Diff line number Diff line
@@ -8,27 +8,19 @@ config SH_ALPHA_BOARD 
	bool



config SH_DEVICE_TREE

	bool "Board Described by Device Tree"

	bool

	select OF

	select OF_EARLY_FLATTREE

	select TIMER_OF

	select COMMON_CLK

	select GENERIC_CALIBRATE_DELAY

	help

	  Select Board Described by Device Tree to build a kernel that

	  does not hard-code any board-specific knowledge but instead uses

	  a device tree blob provided by the boot-loader. You must enable

	  drivers for any hardware you want to use separately. At this

	  time, only boards based on the open-hardware J-Core processors

	  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 SH_DEVICE_TREE

	select CLKSRC_JCORE_PIT

	select JCORE_AIC

	default y if CPU_J2

	depends on CPU_J2

	help

	  Select this option to include drivers core components of the

	  J-Core SoC, including interrupt controllers and timers.

arch/sh/configs/ap325rxa_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ CONFIG_IP_PNP_DHCP=y 
# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_IPV6 is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_BLOCK=y

arch/sh/configs/apsh4a3a_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ CONFIG_IP_PNP=y 
CONFIG_IP_PNP_DHCP=y

# CONFIG_IPV6 is not set

# CONFIG_WIRELESS is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

# CONFIG_FW_LOADER is not set

CONFIG_MTD=y

CONFIG_MTD_BLOCK=y

arch/sh/configs/apsh4ad0a_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ CONFIG_NET_KEY=y 
CONFIG_INET=y

# CONFIG_IPV6 is not set

# CONFIG_WIRELESS is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

# CONFIG_FW_LOADER is not set

CONFIG_MTD=y

CONFIG_MTD_CFI=y

arch/sh/configs/cayman_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ CONFIG_UNIX=y 
CONFIG_INET=y

CONFIG_IP_PNP=y

# CONFIG_IPV6 is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

# CONFIG_FW_LOADER is not set

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE