aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-02-20 03:25:23 -0500
committerOlof Johansson <olof@lixom.net>2014-02-20 03:25:23 -0500
commit22a74909b1ad9db2c05e1aa3441ec5607be4bc0c (patch)
tree3c8c485ec552114ca0d23542a8113a963156d984
parent65b108ecde8d7308cab945724ee82065d149357a (diff)
parent0771ddff31186836f62a20c42e7958bd37f7b4ed (diff)
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: Olof Johansson <olof@lixom.net>
Diffstat
-rw-r--r--arch/arm/configs/ape6evm_defconfig2
-rw-r--r--arch/arm/configs/armadillo800eva_defconfig2
-rw-r--r--arch/arm/configs/bockw_defconfig2
-rw-r--r--arch/arm/configs/genmai_defconfig2
-rw-r--r--arch/arm/configs/koelsch_defconfig6
-rw-r--r--arch/arm/configs/kzm9d_defconfig2
-rw-r--r--arch/arm/configs/kzm9g_defconfig2
-rw-r--r--arch/arm/configs/lager_defconfig13
-rw-r--r--arch/arm/configs/mackerel_defconfig2
-rw-r--r--arch/arm/configs/marzen_defconfig2
10 files changed, 34 insertions, 1 deletions
diff --git a/arch/arm/configs/ape6evm_defconfig b/arch/arm/configs/ape6evm_defconfig
index cb26c62dc722..bb396c0e5fda 100644
--- a/arch/arm/configs/ape6evm_defconfig
+++ b/arch/arm/configs/ape6evm_defconfig
@@ -48,6 +48,8 @@ CONFIG_IP_PNP_DHCP=y
48# CONFIG_IPV6_SIT is not set 48# CONFIG_IPV6_SIT is not set
49CONFIG_NETFILTER=y 49CONFIG_NETFILTER=y
50CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 50CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
51CONFIG_DEVTMPFS=y
52CONFIG_DEVTMPFS_MOUNT=y
51# CONFIG_FW_LOADER_USER_HELPER is not set 53# CONFIG_FW_LOADER_USER_HELPER is not set
52CONFIG_NETDEVICES=y 54CONFIG_NETDEVICES=y
53# CONFIG_NET_CADENCE is not set 55# CONFIG_NET_CADENCE is not set
diff --git a/arch/arm/configs/armadillo800eva_defconfig b/arch/arm/configs/armadillo800eva_defconfig
index 9287a62de830..065adddeee3e 100644
--- a/arch/arm/configs/armadillo800eva_defconfig
+++ b/arch/arm/configs/armadillo800eva_defconfig
@@ -58,6 +58,8 @@ CONFIG_IP_PNP_DHCP=y
58# CONFIG_IPV6 is not set 58# CONFIG_IPV6 is not set
59# CONFIG_WIRELESS is not set 59# CONFIG_WIRELESS is not set
60CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 60CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
61CONFIG_DEVTMPFS=y
62CONFIG_DEVTMPFS_MOUNT=y
61CONFIG_SCSI=y 63CONFIG_SCSI=y
62CONFIG_BLK_DEV_SD=y 64CONFIG_BLK_DEV_SD=y
63CONFIG_MD=y 65CONFIG_MD=y
diff --git a/arch/arm/configs/bockw_defconfig b/arch/arm/configs/bockw_defconfig
index 80cff50beb34..e816140d81c5 100644
--- a/arch/arm/configs/bockw_defconfig
+++ b/arch/arm/configs/bockw_defconfig
@@ -44,6 +44,8 @@ CONFIG_IP_PNP_DHCP=y
44# CONFIG_INET_DIAG is not set 44# CONFIG_INET_DIAG is not set
45# CONFIG_IPV6 is not set 45# CONFIG_IPV6 is not set
46CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 46CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
47CONFIG_DEVTMPFS=y
48CONFIG_DEVTMPFS_MOUNT=y
47# CONFIG_STANDALONE is not set 49# CONFIG_STANDALONE is not set
48# CONFIG_PREVENT_FIRMWARE_BUILD is not set 50# CONFIG_PREVENT_FIRMWARE_BUILD is not set
49# CONFIG_FW_LOADER is not set 51# CONFIG_FW_LOADER is not set
diff --git a/arch/arm/configs/genmai_defconfig b/arch/arm/configs/genmai_defconfig
index aa0b704f48af..c56a7ff1dcd7 100644
--- a/arch/arm/configs/genmai_defconfig
+++ b/arch/arm/configs/genmai_defconfig
@@ -50,6 +50,8 @@ CONFIG_IP_PNP_DHCP=y
50# CONFIG_IPV6 is not set 50# CONFIG_IPV6 is not set
51# CONFIG_WIRELESS is not set 51# CONFIG_WIRELESS is not set
52CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 52CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
53CONFIG_DEVTMPFS=y
54CONFIG_DEVTMPFS_MOUNT=y
53CONFIG_NETDEVICES=y 55CONFIG_NETDEVICES=y
54# CONFIG_NET_CORE is not set 56# CONFIG_NET_CORE is not set
55# CONFIG_NET_VENDOR_ARC is not set 57# CONFIG_NET_VENDOR_ARC is not set
diff --git a/arch/arm/configs/koelsch_defconfig b/arch/arm/configs/koelsch_defconfig
index e248f49d5549..30157975998a 100644
--- a/arch/arm/configs/koelsch_defconfig
+++ b/arch/arm/configs/koelsch_defconfig
@@ -8,7 +8,6 @@ CONFIG_SYSCTL_SYSCALL=y
8CONFIG_EMBEDDED=y 8CONFIG_EMBEDDED=y
9CONFIG_PERF_EVENTS=y 9CONFIG_PERF_EVENTS=y
10CONFIG_SLAB=y 10CONFIG_SLAB=y
11# CONFIG_BLOCK is not set
12CONFIG_ARCH_SHMOBILE_LEGACY=y 11CONFIG_ARCH_SHMOBILE_LEGACY=y
13CONFIG_ARCH_R8A7791=y 12CONFIG_ARCH_R8A7791=y
14CONFIG_MACH_KOELSCH=y 13CONFIG_MACH_KOELSCH=y
@@ -35,7 +34,12 @@ CONFIG_UNIX=y
35CONFIG_INET=y 34CONFIG_INET=y
36CONFIG_IP_PNP=y 35CONFIG_IP_PNP=y
37CONFIG_IP_PNP_DHCP=y 36CONFIG_IP_PNP_DHCP=y
37CONFIG_DEVTMPFS=y
38CONFIG_DEVTMPFS_MOUNT=y
38CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 39CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
40CONFIG_BLK_DEV_SD=y
41CONFIG_ATA=y
42CONFIG_SATA_RCAR=y
39CONFIG_NETDEVICES=y 43CONFIG_NETDEVICES=y
40# CONFIG_NET_VENDOR_ARC is not set 44# CONFIG_NET_VENDOR_ARC is not set
41# CONFIG_NET_CADENCE is not set 45# CONFIG_NET_CADENCE is not set
diff --git a/arch/arm/configs/kzm9d_defconfig b/arch/arm/configs/kzm9d_defconfig
index e42ce3756af3..1cc330b06bf6 100644
--- a/arch/arm/configs/kzm9d_defconfig
+++ b/arch/arm/configs/kzm9d_defconfig
@@ -50,6 +50,8 @@ CONFIG_IP_PNP_DHCP=y
50# CONFIG_IPV6 is not set 50# CONFIG_IPV6 is not set
51# CONFIG_WIRELESS is not set 51# CONFIG_WIRELESS is not set
52CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 52CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
53CONFIG_DEVTMPFS=y
54CONFIG_DEVTMPFS_MOUNT=y
53# CONFIG_BLK_DEV is not set 55# CONFIG_BLK_DEV is not set
54CONFIG_NETDEVICES=y 56CONFIG_NETDEVICES=y
55# CONFIG_NET_VENDOR_BROADCOM is not set 57# CONFIG_NET_VENDOR_BROADCOM is not set
diff --git a/arch/arm/configs/kzm9g_defconfig b/arch/arm/configs/kzm9g_defconfig
index 9934dbc23d64..12bd1f63c399 100644
--- a/arch/arm/configs/kzm9g_defconfig
+++ b/arch/arm/configs/kzm9g_defconfig
@@ -60,6 +60,8 @@ CONFIG_IRDA=y
60CONFIG_SH_IRDA=y 60CONFIG_SH_IRDA=y
61# CONFIG_WIRELESS is not set 61# CONFIG_WIRELESS is not set
62CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 62CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
63CONFIG_DEVTMPFS=y
64CONFIG_DEVTMPFS_MOUNT=y
63CONFIG_SCSI=y 65CONFIG_SCSI=y
64CONFIG_BLK_DEV_SD=y 66CONFIG_BLK_DEV_SD=y
65CONFIG_NETDEVICES=y 67CONFIG_NETDEVICES=y
diff --git a/arch/arm/configs/lager_defconfig b/arch/arm/configs/lager_defconfig
index 883443f8f4f3..3e7e0aef26c9 100644
--- a/arch/arm/configs/lager_defconfig
+++ b/arch/arm/configs/lager_defconfig
@@ -49,6 +49,11 @@ CONFIG_IP_PNP_DHCP=y
49# CONFIG_IPV6 is not set 49# CONFIG_IPV6 is not set
50# CONFIG_WIRELESS is not set 50# CONFIG_WIRELESS is not set
51CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 51CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
52CONFIG_DEVTMPFS=y
53CONFIG_DEVTMPFS_MOUNT=y
54CONFIG_BLK_DEV_SD=y
55CONFIG_ATA=y
56CONFIG_SATA_RCAR=y
52CONFIG_NETDEVICES=y 57CONFIG_NETDEVICES=y
53# CONFIG_NET_CORE is not set 58# CONFIG_NET_CORE is not set
54# CONFIG_NET_VENDOR_ARC is not set 59# CONFIG_NET_VENDOR_ARC is not set
@@ -90,6 +95,14 @@ CONFIG_RCAR_THERMAL=y
90CONFIG_REGULATOR=y 95CONFIG_REGULATOR=y
91CONFIG_REGULATOR_FIXED_VOLTAGE=y 96CONFIG_REGULATOR_FIXED_VOLTAGE=y
92CONFIG_REGULATOR_GPIO=y 97CONFIG_REGULATOR_GPIO=y
98CONFIG_MEDIA_SUPPORT=y
99CONFIG_MEDIA_CAMERA_SUPPORT=y
100CONFIG_V4L_PLATFORM_DRIVERS=y
101CONFIG_SOC_CAMERA=y
102CONFIG_SOC_CAMERA_PLATFORM=y
103CONFIG_VIDEO_RCAR_VIN=y
104# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
105CONFIG_VIDEO_ADV7180=y
93CONFIG_DRM=y 106CONFIG_DRM=y
94CONFIG_DRM_RCAR_DU=y 107CONFIG_DRM_RCAR_DU=y
95# CONFIG_USB_SUPPORT is not set 108# CONFIG_USB_SUPPORT is not set
diff --git a/arch/arm/configs/mackerel_defconfig b/arch/arm/configs/mackerel_defconfig
index a61e1653fc5e..57ececba2ae6 100644
--- a/arch/arm/configs/mackerel_defconfig
+++ b/arch/arm/configs/mackerel_defconfig
@@ -42,6 +42,8 @@ CONFIG_IP_PNP_DHCP=y
42# CONFIG_IPV6 is not set 42# CONFIG_IPV6 is not set
43# CONFIG_WIRELESS is not set 43# CONFIG_WIRELESS is not set
44CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 44CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
45CONFIG_DEVTMPFS=y
46CONFIG_DEVTMPFS_MOUNT=y
45# CONFIG_FIRMWARE_IN_KERNEL is not set 47# CONFIG_FIRMWARE_IN_KERNEL is not set
46CONFIG_MTD=y 48CONFIG_MTD=y
47CONFIG_MTD_CONCAT=y 49CONFIG_MTD_CONCAT=y
diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig
index f21bd405cc2a..92994f7f6fd8 100644
--- a/arch/arm/configs/marzen_defconfig
+++ b/arch/arm/configs/marzen_defconfig
@@ -43,6 +43,8 @@ CONFIG_IP_PNP_DHCP=y
43# CONFIG_IPV6 is not set 43# CONFIG_IPV6 is not set
44# CONFIG_WIRELESS is not set 44# CONFIG_WIRELESS is not set
45CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 45CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
46CONFIG_DEVTMPFS=y
47CONFIG_DEVTMPFS_MOUNT=y
46# CONFIG_STANDALONE is not set 48# CONFIG_STANDALONE is not set
47# CONFIG_PREVENT_FIRMWARE_BUILD is not set 49# CONFIG_PREVENT_FIRMWARE_BUILD is not set
48# CONFIG_FW_LOADER is not set 50# CONFIG_FW_LOADER is not set
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-14 23:06:15 -0400