Commit 22a74909 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-defconfig-for-v3.15' of... 

Merge tag 'renesas-defconfig-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards

Merge "Renesas ARM based SoC Defconfig Updates for v3.15" from Simon Horman:

* Renesas ARM based SoC boards (Global)
  enable CONFIG_DEVTMPFS in defconfig

* r8a7791 SoC (R-Car M2) based Koelsch board
  - Enable SATA

* r8a7790 SoC (R-Car H2) based Lager board
  - Enable SATA, VIN and ADV7180 decoder in defconfig

* tag 'renesas-defconfig-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: shmobile: ape6evm: enable CONFIG_DEVTMPFS in defconfig
  ARM: shmobile: armadillo: enable CONFIG_DEVTMPFS in defconfig
  ARM: shmobile: bockw: enable CONFIG_DEVTMPFS in defconfig
  ARM: shmobile: genmai: enable CONFIG_DEVTMPFS in defconfig
  ARM: shmobile: kzm9d: enable CONFIG_DEVTMPFS in defconfig
  ARM: shmobile: kzm9g: enable CONFIG_DEVTMPFS in defconfig
  ARM: shmobile: lager: enable CONFIG_DEVTMPFS in defconfig
  ARM: shmobile: mackerel: enable CONFIG_DEVTMPFS in defconfig
  ARM: shmobile: marzen: enable CONFIG_DEVTMPFS in defconfig
  ARM: shmobile: lager: Enable SATA in defconfig
  ARM: shmobile: koelsch: Enable DEVTMPFS_MOUNT in defconfig
  ARM: shmobile: koelsch: Enable SATA in defconfig
  ARM: shmobile: lager: Enable VIN along with ADV7180 decoder in defconfig

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 65b108ec 0771ddff

arch/arm/configs/ape6evm_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ CONFIG_IP_PNP_DHCP=y 
# CONFIG_IPV6_SIT is not set

CONFIG_NETFILTER=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

# CONFIG_FW_LOADER_USER_HELPER is not set

CONFIG_NETDEVICES=y

# CONFIG_NET_CADENCE is not set

arch/arm/configs/armadillo800eva_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ CONFIG_IP_PNP_DHCP=y 
# CONFIG_IPV6 is not set

# CONFIG_WIRELESS is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_MD=y

arch/arm/configs/bockw_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ CONFIG_IP_PNP_DHCP=y 
# CONFIG_INET_DIAG is not set

# CONFIG_IPV6 is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

# CONFIG_STANDALONE is not set

# CONFIG_PREVENT_FIRMWARE_BUILD is not set

# CONFIG_FW_LOADER is not set

arch/arm/configs/genmai_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ CONFIG_IP_PNP_DHCP=y 
# CONFIG_IPV6 is not set

# CONFIG_WIRELESS is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_NETDEVICES=y

# CONFIG_NET_CORE is not set

# CONFIG_NET_VENDOR_ARC is not set

arch/arm/configs/koelsch_defconfig

+5 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ CONFIG_SYSCTL_SYSCALL=y 
CONFIG_EMBEDDED=y

CONFIG_PERF_EVENTS=y

CONFIG_SLAB=y

# CONFIG_BLOCK is not set

CONFIG_ARCH_SHMOBILE_LEGACY=y

CONFIG_ARCH_R8A7791=y

CONFIG_MACH_KOELSCH=y
@@ -35,7 +34,12 @@ CONFIG_UNIX=y 
CONFIG_INET=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_BLK_DEV_SD=y

CONFIG_ATA=y

CONFIG_SATA_RCAR=y

CONFIG_NETDEVICES=y

# CONFIG_NET_VENDOR_ARC is not set

# CONFIG_NET_CADENCE is not set