diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 18:33:45 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 18:33:45 -0500 |
commit | 6c5096e5538b455bc3bea2b02588c380f070d8c6 (patch) | |
tree | a2d08974a0c6a6fd19dff90bd3ab1827c23a5764 /arch/arm/configs | |
parent | bab588fcfb6335c767d811a8955979f5440328e0 (diff) | |
parent | f628e3d92465303792d52c98fb0c95bef558f936 (diff) |
Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC board specific changes from Arnd Bergmann:
"These updates are all for board specific code, including
- defconfig updates for shmobile, davinci, bcm2835, imx, omap and
tegra
- SD/MMC and I2C support on bcm2835 (Raspberry PI)
- minor updates for PXA
- shmobile updates to GPIO usage in board files
- More things in OMAP board files are moved over to device tree
probing
- Better support for audio devices on some OMAP platforms"
* tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (55 commits)
ARM: imx_v4_v5_defconfig: Add VPU support
ARM: imx: configs: enable netfilter support
ARM: OMAP2+: Fix twl section warnings related to omap_twl4030_audio_init
ARM: OMAP2+: omap2plus_defconfig: enable omap1 rtc
RX-51: Register twl4030-madc device
RX-51: Add leds lp5523 names from Maemo 5 2.6.28 kernel
ARM: OMAP2+: AM33XX: omap2plus_defconfig: Add support for few drivers
ARM: OMAP1: nokia770: enable CBUS/Retu
ARM: OMAP2+: omap2plus_defconfig: enable CMA allocator
ARM: OMAP2+: omap2plus_defconfig: enable TFP410 chip support
ARM: OMAP3: igep0020: simplify GPIO LEDs dependencies
ARM: OMAP2+: craneboard: support the TPS65910 PMU
ARM: OMAP2+: craneboard: support NAND device
ARM: OMAP3: cm-t3517: add MMC support
ARM: OMAP2+: Remove apollon board support
ARM: shmobile: armadillo800eva: set clock rates before timer init
ARM: tegra: defconfig updates
ARM: shmobile: mackerel: Use gpio_request_one()
ARM: shmobile: kzm9g: Use gpio_request_one()
ARM: shmobile: bonito: Use gpio_request_one()
...
Diffstat (limited to 'arch/arm/configs')
-rw-r--r-- | arch/arm/configs/armadillo800eva_defconfig | 10 | ||||
-rw-r--r-- | arch/arm/configs/bcm2835_defconfig | 43 | ||||
-rw-r--r-- | arch/arm/configs/da8xx_omapl_defconfig | 3 | ||||
-rw-r--r-- | arch/arm/configs/davinci_all_defconfig | 3 | ||||
-rw-r--r-- | arch/arm/configs/imx_v4_v5_defconfig | 3 | ||||
-rw-r--r-- | arch/arm/configs/imx_v6_v7_defconfig | 1 | ||||
-rw-r--r-- | arch/arm/configs/kota2_defconfig | 2 | ||||
-rw-r--r-- | arch/arm/configs/kzm9d_defconfig | 4 | ||||
-rw-r--r-- | arch/arm/configs/kzm9g_defconfig | 4 | ||||
-rw-r--r-- | arch/arm/configs/mackerel_defconfig | 3 | ||||
-rw-r--r-- | arch/arm/configs/omap2plus_defconfig | 25 | ||||
-rw-r--r-- | arch/arm/configs/tegra_defconfig | 6 |
12 files changed, 84 insertions, 23 deletions
diff --git a/arch/arm/configs/armadillo800eva_defconfig b/arch/arm/configs/armadillo800eva_defconfig index 2e1a82577207..0b98100d2ae7 100644 --- a/arch/arm/configs/armadillo800eva_defconfig +++ b/arch/arm/configs/armadillo800eva_defconfig | |||
@@ -34,12 +34,11 @@ CONFIG_AEABI=y | |||
34 | CONFIG_FORCE_MAX_ZONEORDER=13 | 34 | CONFIG_FORCE_MAX_ZONEORDER=13 |
35 | CONFIG_ZBOOT_ROM_TEXT=0x0 | 35 | CONFIG_ZBOOT_ROM_TEXT=0x0 |
36 | CONFIG_ZBOOT_ROM_BSS=0x0 | 36 | CONFIG_ZBOOT_ROM_BSS=0x0 |
37 | CONFIG_CMDLINE="console=tty0 console=ttySC1,115200 earlyprintk=sh-sci.1,115200 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize=4096,wsize=4096 rw" | 37 | CONFIG_ARM_APPENDED_DTB=y |
38 | CONFIG_CMDLINE_FORCE=y | ||
39 | CONFIG_KEXEC=y | 38 | CONFIG_KEXEC=y |
40 | CONFIG_VFP=y | 39 | CONFIG_VFP=y |
41 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | 40 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set |
42 | # CONFIG_SUSPEND is not set | 41 | CONFIG_PM_RUNTIME=y |
43 | CONFIG_NET=y | 42 | CONFIG_NET=y |
44 | CONFIG_PACKET=y | 43 | CONFIG_PACKET=y |
45 | CONFIG_UNIX=y | 44 | CONFIG_UNIX=y |
@@ -91,14 +90,11 @@ CONFIG_I2C_SH_MOBILE=y | |||
91 | # CONFIG_HWMON is not set | 90 | # CONFIG_HWMON is not set |
92 | CONFIG_MEDIA_SUPPORT=y | 91 | CONFIG_MEDIA_SUPPORT=y |
93 | CONFIG_VIDEO_DEV=y | 92 | CONFIG_VIDEO_DEV=y |
94 | # CONFIG_RC_CORE is not set | 93 | CONFIG_MEDIA_CAMERA_SUPPORT=y |
95 | # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set | ||
96 | # CONFIG_V4L_USB_DRIVERS is not set | ||
97 | CONFIG_V4L_PLATFORM_DRIVERS=y | 94 | CONFIG_V4L_PLATFORM_DRIVERS=y |
98 | CONFIG_SOC_CAMERA=y | 95 | CONFIG_SOC_CAMERA=y |
99 | CONFIG_SOC_CAMERA_MT9T112=y | 96 | CONFIG_SOC_CAMERA_MT9T112=y |
100 | CONFIG_VIDEO_SH_MOBILE_CEU=y | 97 | CONFIG_VIDEO_SH_MOBILE_CEU=y |
101 | # CONFIG_RADIO_ADAPTERS is not set | ||
102 | CONFIG_FB=y | 98 | CONFIG_FB=y |
103 | CONFIG_FB_SH_MOBILE_LCDC=y | 99 | CONFIG_FB_SH_MOBILE_LCDC=y |
104 | CONFIG_FB_SH_MOBILE_HDMI=y | 100 | CONFIG_FB_SH_MOBILE_HDMI=y |
diff --git a/arch/arm/configs/bcm2835_defconfig b/arch/arm/configs/bcm2835_defconfig index 74e27f0ff6ad..af472e4ed451 100644 --- a/arch/arm/configs/bcm2835_defconfig +++ b/arch/arm/configs/bcm2835_defconfig | |||
@@ -1,11 +1,10 @@ | |||
1 | CONFIG_EXPERIMENTAL=y | ||
2 | # CONFIG_LOCALVERSION_AUTO is not set | 1 | # CONFIG_LOCALVERSION_AUTO is not set |
3 | CONFIG_SYSVIPC=y | 2 | CONFIG_SYSVIPC=y |
4 | CONFIG_BSD_PROCESS_ACCT=y | ||
5 | CONFIG_BSD_PROCESS_ACCT_V3=y | ||
6 | CONFIG_FHANDLE=y | 3 | CONFIG_FHANDLE=y |
7 | CONFIG_NO_HZ=y | 4 | CONFIG_NO_HZ=y |
8 | CONFIG_HIGH_RES_TIMERS=y | 5 | CONFIG_HIGH_RES_TIMERS=y |
6 | CONFIG_BSD_PROCESS_ACCT=y | ||
7 | CONFIG_BSD_PROCESS_ACCT_V3=y | ||
9 | CONFIG_LOG_BUF_SHIFT=18 | 8 | CONFIG_LOG_BUF_SHIFT=18 |
10 | CONFIG_CGROUP_FREEZER=y | 9 | CONFIG_CGROUP_FREEZER=y |
11 | CONFIG_CGROUP_DEVICE=y | 10 | CONFIG_CGROUP_DEVICE=y |
@@ -30,13 +29,10 @@ CONFIG_EMBEDDED=y | |||
30 | CONFIG_PROFILING=y | 29 | CONFIG_PROFILING=y |
31 | CONFIG_OPROFILE=y | 30 | CONFIG_OPROFILE=y |
32 | CONFIG_JUMP_LABEL=y | 31 | CONFIG_JUMP_LABEL=y |
33 | # CONFIG_BLOCK is not set | ||
34 | CONFIG_ARCH_BCM2835=y | 32 | CONFIG_ARCH_BCM2835=y |
35 | CONFIG_PREEMPT_VOLUNTARY=y | 33 | CONFIG_PREEMPT_VOLUNTARY=y |
36 | CONFIG_AEABI=y | 34 | CONFIG_AEABI=y |
37 | CONFIG_COMPACTION=y | ||
38 | CONFIG_KSM=y | 35 | CONFIG_KSM=y |
39 | CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 | ||
40 | CONFIG_CLEANCACHE=y | 36 | CONFIG_CLEANCACHE=y |
41 | CONFIG_SECCOMP=y | 37 | CONFIG_SECCOMP=y |
42 | CONFIG_CC_STACKPROTECTOR=y | 38 | CONFIG_CC_STACKPROTECTOR=y |
@@ -45,6 +41,11 @@ CONFIG_CRASH_DUMP=y | |||
45 | CONFIG_VFP=y | 41 | CONFIG_VFP=y |
46 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | 42 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set |
47 | # CONFIG_SUSPEND is not set | 43 | # CONFIG_SUSPEND is not set |
44 | CONFIG_NET=y | ||
45 | CONFIG_UNIX=y | ||
46 | CONFIG_INET=y | ||
47 | CONFIG_NETWORK_SECMARK=y | ||
48 | # CONFIG_WIRELESS is not set | ||
48 | CONFIG_DEVTMPFS=y | 49 | CONFIG_DEVTMPFS=y |
49 | CONFIG_DEVTMPFS_MOUNT=y | 50 | CONFIG_DEVTMPFS_MOUNT=y |
50 | # CONFIG_STANDALONE is not set | 51 | # CONFIG_STANDALONE is not set |
@@ -53,20 +54,42 @@ CONFIG_DEVTMPFS_MOUNT=y | |||
53 | # CONFIG_INPUT_MOUSE is not set | 54 | # CONFIG_INPUT_MOUSE is not set |
54 | # CONFIG_SERIO is not set | 55 | # CONFIG_SERIO is not set |
55 | # CONFIG_VT is not set | 56 | # CONFIG_VT is not set |
56 | # CONFIG_UNIX98_PTYS is not set | ||
57 | # CONFIG_LEGACY_PTYS is not set | 57 | # CONFIG_LEGACY_PTYS is not set |
58 | # CONFIG_DEVKMEM is not set | 58 | # CONFIG_DEVKMEM is not set |
59 | CONFIG_SERIAL_AMBA_PL011=y | 59 | CONFIG_SERIAL_AMBA_PL011=y |
60 | CONFIG_SERIAL_AMBA_PL011_CONSOLE=y | 60 | CONFIG_SERIAL_AMBA_PL011_CONSOLE=y |
61 | CONFIG_TTY_PRINTK=y | 61 | CONFIG_TTY_PRINTK=y |
62 | # CONFIG_HW_RANDOM is not set | 62 | # CONFIG_HW_RANDOM is not set |
63 | CONFIG_I2C=y | ||
64 | CONFIG_I2C_CHARDEV=y | ||
65 | CONFIG_I2C_BCM2835=y | ||
66 | CONFIG_GPIO_SYSFS=y | ||
63 | # CONFIG_HWMON is not set | 67 | # CONFIG_HWMON is not set |
64 | # CONFIG_USB_SUPPORT is not set | 68 | # CONFIG_USB_SUPPORT is not set |
69 | CONFIG_MMC=y | ||
70 | CONFIG_MMC_SDHCI=y | ||
71 | CONFIG_MMC_SDHCI_PLTFM=y | ||
72 | CONFIG_MMC_SDHCI_BCM2835=y | ||
65 | # CONFIG_IOMMU_SUPPORT is not set | 73 | # CONFIG_IOMMU_SUPPORT is not set |
66 | # CONFIG_FILE_LOCKING is not set | 74 | CONFIG_EXT2_FS=y |
67 | # CONFIG_DNOTIFY is not set | 75 | CONFIG_EXT2_FS_XATTR=y |
68 | # CONFIG_INOTIFY_USER is not set | 76 | CONFIG_EXT2_FS_POSIX_ACL=y |
77 | CONFIG_EXT3_FS=y | ||
78 | CONFIG_EXT3_FS_POSIX_ACL=y | ||
79 | CONFIG_EXT4_FS=y | ||
80 | CONFIG_EXT4_FS_POSIX_ACL=y | ||
81 | CONFIG_FANOTIFY=y | ||
82 | CONFIG_MSDOS_FS=y | ||
83 | CONFIG_VFAT_FS=y | ||
84 | CONFIG_TMPFS=y | ||
85 | CONFIG_TMPFS_POSIX_ACL=y | ||
69 | # CONFIG_MISC_FILESYSTEMS is not set | 86 | # CONFIG_MISC_FILESYSTEMS is not set |
87 | CONFIG_NFS_FS=y | ||
88 | CONFIG_NFSD=y | ||
89 | CONFIG_NLS_CODEPAGE_437=y | ||
90 | CONFIG_NLS_ASCII=y | ||
91 | CONFIG_NLS_ISO8859_1=y | ||
92 | CONFIG_NLS_UTF8=y | ||
70 | CONFIG_PRINTK_TIME=y | 93 | CONFIG_PRINTK_TIME=y |
71 | # CONFIG_ENABLE_WARN_DEPRECATED is not set | 94 | # CONFIG_ENABLE_WARN_DEPRECATED is not set |
72 | # CONFIG_ENABLE_MUST_CHECK is not set | 95 | # CONFIG_ENABLE_MUST_CHECK is not set |
diff --git a/arch/arm/configs/da8xx_omapl_defconfig b/arch/arm/configs/da8xx_omapl_defconfig index f29223954af8..6b36a5ae03c2 100644 --- a/arch/arm/configs/da8xx_omapl_defconfig +++ b/arch/arm/configs/da8xx_omapl_defconfig | |||
@@ -36,6 +36,7 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=m | |||
36 | CONFIG_CPU_FREQ_GOV_POWERSAVE=m | 36 | CONFIG_CPU_FREQ_GOV_POWERSAVE=m |
37 | CONFIG_CPU_FREQ_GOV_ONDEMAND=m | 37 | CONFIG_CPU_FREQ_GOV_ONDEMAND=m |
38 | CONFIG_CPU_IDLE=y | 38 | CONFIG_CPU_IDLE=y |
39 | CONFIG_PM_RUNTIME=y | ||
39 | CONFIG_NET=y | 40 | CONFIG_NET=y |
40 | CONFIG_PACKET=y | 41 | CONFIG_PACKET=y |
41 | CONFIG_UNIX=y | 42 | CONFIG_UNIX=y |
@@ -45,6 +46,8 @@ CONFIG_IP_PNP_DHCP=y | |||
45 | # CONFIG_INET_LRO is not set | 46 | # CONFIG_INET_LRO is not set |
46 | CONFIG_NETFILTER=y | 47 | CONFIG_NETFILTER=y |
47 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 48 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
49 | CONFIG_DEVTMPFS=y | ||
50 | CONFIG_DEVTMPFS_MOUNT=y | ||
48 | # CONFIG_FW_LOADER is not set | 51 | # CONFIG_FW_LOADER is not set |
49 | CONFIG_BLK_DEV_LOOP=m | 52 | CONFIG_BLK_DEV_LOOP=m |
50 | CONFIG_BLK_DEV_RAM=y | 53 | CONFIG_BLK_DEV_RAM=y |
diff --git a/arch/arm/configs/davinci_all_defconfig b/arch/arm/configs/davinci_all_defconfig index 4ea7c95719d2..3edc78a40b66 100644 --- a/arch/arm/configs/davinci_all_defconfig +++ b/arch/arm/configs/davinci_all_defconfig | |||
@@ -33,6 +33,7 @@ CONFIG_AEABI=y | |||
33 | CONFIG_LEDS=y | 33 | CONFIG_LEDS=y |
34 | CONFIG_ZBOOT_ROM_TEXT=0x0 | 34 | CONFIG_ZBOOT_ROM_TEXT=0x0 |
35 | CONFIG_ZBOOT_ROM_BSS=0x0 | 35 | CONFIG_ZBOOT_ROM_BSS=0x0 |
36 | CONFIG_PM_RUNTIME=y | ||
36 | CONFIG_NET=y | 37 | CONFIG_NET=y |
37 | CONFIG_PACKET=y | 38 | CONFIG_PACKET=y |
38 | CONFIG_UNIX=y | 39 | CONFIG_UNIX=y |
@@ -42,6 +43,8 @@ CONFIG_IP_PNP_DHCP=y | |||
42 | # CONFIG_INET_LRO is not set | 43 | # CONFIG_INET_LRO is not set |
43 | CONFIG_NETFILTER=y | 44 | CONFIG_NETFILTER=y |
44 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 45 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
46 | CONFIG_DEVTMPFS=y | ||
47 | CONFIG_DEVTMPFS_MOUNT=y | ||
45 | # CONFIG_FW_LOADER is not set | 48 | # CONFIG_FW_LOADER is not set |
46 | CONFIG_MTD=m | 49 | CONFIG_MTD=m |
47 | CONFIG_MTD_PARTITIONS=y | 50 | CONFIG_MTD_PARTITIONS=y |
diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig index ebbfb27e0e74..02c657af4005 100644 --- a/arch/arm/configs/imx_v4_v5_defconfig +++ b/arch/arm/configs/imx_v4_v5_defconfig | |||
@@ -61,6 +61,7 @@ CONFIG_IP_PNP_DHCP=y | |||
61 | # CONFIG_INET_LRO is not set | 61 | # CONFIG_INET_LRO is not set |
62 | # CONFIG_INET_DIAG is not set | 62 | # CONFIG_INET_DIAG is not set |
63 | # CONFIG_IPV6 is not set | 63 | # CONFIG_IPV6 is not set |
64 | CONFIG_NETFILTER=y | ||
64 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 65 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
65 | CONFIG_DEVTMPFS=y | 66 | CONFIG_DEVTMPFS=y |
66 | CONFIG_DEVTMPFS_MOUNT=y | 67 | CONFIG_DEVTMPFS_MOUNT=y |
@@ -127,6 +128,8 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y | |||
127 | CONFIG_SOC_CAMERA=y | 128 | CONFIG_SOC_CAMERA=y |
128 | CONFIG_SOC_CAMERA_OV2640=y | 129 | CONFIG_SOC_CAMERA_OV2640=y |
129 | CONFIG_VIDEO_MX2=y | 130 | CONFIG_VIDEO_MX2=y |
131 | CONFIG_V4L_MEM2MEM_DRIVERS=y | ||
132 | CONFIG_VIDEO_CODA=y | ||
130 | CONFIG_FB=y | 133 | CONFIG_FB=y |
131 | CONFIG_FB_IMX=y | 134 | CONFIG_FB_IMX=y |
132 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 135 | CONFIG_BACKLIGHT_LCD_SUPPORT=y |
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index 0a3966787563..e36b01025321 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig | |||
@@ -59,6 +59,7 @@ CONFIG_IP_PNP_DHCP=y | |||
59 | # CONFIG_INET_XFRM_MODE_BEET is not set | 59 | # CONFIG_INET_XFRM_MODE_BEET is not set |
60 | # CONFIG_INET_LRO is not set | 60 | # CONFIG_INET_LRO is not set |
61 | CONFIG_IPV6=y | 61 | CONFIG_IPV6=y |
62 | CONFIG_NETFILTER=y | ||
62 | # CONFIG_WIRELESS is not set | 63 | # CONFIG_WIRELESS is not set |
63 | CONFIG_DEVTMPFS=y | 64 | CONFIG_DEVTMPFS=y |
64 | CONFIG_DEVTMPFS_MOUNT=y | 65 | CONFIG_DEVTMPFS_MOUNT=y |
diff --git a/arch/arm/configs/kota2_defconfig b/arch/arm/configs/kota2_defconfig index fa83db1ef0eb..57ad3d47de70 100644 --- a/arch/arm/configs/kota2_defconfig +++ b/arch/arm/configs/kota2_defconfig | |||
@@ -21,7 +21,7 @@ CONFIG_ARCH_SHMOBILE=y | |||
21 | CONFIG_KEYBOARD_GPIO_POLLED=y | 21 | CONFIG_KEYBOARD_GPIO_POLLED=y |
22 | CONFIG_ARCH_SH73A0=y | 22 | CONFIG_ARCH_SH73A0=y |
23 | CONFIG_MACH_KOTA2=y | 23 | CONFIG_MACH_KOTA2=y |
24 | CONFIG_MEMORY_SIZE=0x1e0000000 | 24 | CONFIG_MEMORY_SIZE=0x1e000000 |
25 | # CONFIG_SH_TIMER_TMU is not set | 25 | # CONFIG_SH_TIMER_TMU is not set |
26 | # CONFIG_SWP_EMULATE is not set | 26 | # CONFIG_SWP_EMULATE is not set |
27 | CONFIG_CPU_BPREDICT_DISABLE=y | 27 | CONFIG_CPU_BPREDICT_DISABLE=y |
diff --git a/arch/arm/configs/kzm9d_defconfig b/arch/arm/configs/kzm9d_defconfig index 8c49df66cac3..6c37f4a98eb8 100644 --- a/arch/arm/configs/kzm9d_defconfig +++ b/arch/arm/configs/kzm9d_defconfig | |||
@@ -32,11 +32,9 @@ CONFIG_FORCE_MAX_ZONEORDER=13 | |||
32 | CONFIG_ZBOOT_ROM_TEXT=0x0 | 32 | CONFIG_ZBOOT_ROM_TEXT=0x0 |
33 | CONFIG_ZBOOT_ROM_BSS=0x0 | 33 | CONFIG_ZBOOT_ROM_BSS=0x0 |
34 | CONFIG_ARM_APPENDED_DTB=y | 34 | CONFIG_ARM_APPENDED_DTB=y |
35 | CONFIG_CMDLINE="console=tty0 console=ttyS1,115200n81 earlyprintk=serial8250-em.1,115200n81 mem=128M@0x40000000 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize=4096,wsize=4096" | ||
36 | CONFIG_CMDLINE_FORCE=y | ||
37 | CONFIG_VFP=y | 35 | CONFIG_VFP=y |
38 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | 36 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set |
39 | # CONFIG_SUSPEND is not set | 37 | CONFIG_PM_RUNTIME=y |
40 | CONFIG_NET=y | 38 | CONFIG_NET=y |
41 | CONFIG_PACKET=y | 39 | CONFIG_PACKET=y |
42 | CONFIG_UNIX=y | 40 | CONFIG_UNIX=y |
diff --git a/arch/arm/configs/kzm9g_defconfig b/arch/arm/configs/kzm9g_defconfig index afbae287436b..670c3b60f936 100644 --- a/arch/arm/configs/kzm9g_defconfig +++ b/arch/arm/configs/kzm9g_defconfig | |||
@@ -39,7 +39,7 @@ CONFIG_AEABI=y | |||
39 | CONFIG_HIGHMEM=y | 39 | CONFIG_HIGHMEM=y |
40 | CONFIG_ZBOOT_ROM_TEXT=0x0 | 40 | CONFIG_ZBOOT_ROM_TEXT=0x0 |
41 | CONFIG_ZBOOT_ROM_BSS=0x0 | 41 | CONFIG_ZBOOT_ROM_BSS=0x0 |
42 | CONFIG_CMDLINE="console=tty0 console=ttySC4,115200 root=/dev/nfs ip=dhcp ignore_loglevel earlyprintk=sh-sci.4,115200" | 42 | CONFIG_ARM_APPENDED_DTB=y |
43 | CONFIG_KEXEC=y | 43 | CONFIG_KEXEC=y |
44 | CONFIG_VFP=y | 44 | CONFIG_VFP=y |
45 | CONFIG_NEON=y | 45 | CONFIG_NEON=y |
@@ -85,6 +85,8 @@ CONFIG_I2C_CHARDEV=y | |||
85 | CONFIG_I2C_SH_MOBILE=y | 85 | CONFIG_I2C_SH_MOBILE=y |
86 | CONFIG_GPIO_PCF857X=y | 86 | CONFIG_GPIO_PCF857X=y |
87 | # CONFIG_HWMON is not set | 87 | # CONFIG_HWMON is not set |
88 | CONFIG_REGULATOR=y | ||
89 | CONFIG_REGULATOR_DUMMY=y | ||
88 | CONFIG_FB=y | 90 | CONFIG_FB=y |
89 | CONFIG_FB_SH_MOBILE_LCDC=y | 91 | CONFIG_FB_SH_MOBILE_LCDC=y |
90 | CONFIG_FRAMEBUFFER_CONSOLE=y | 92 | CONFIG_FRAMEBUFFER_CONSOLE=y |
diff --git a/arch/arm/configs/mackerel_defconfig b/arch/arm/configs/mackerel_defconfig index 2098ce155542..7594b3aff259 100644 --- a/arch/arm/configs/mackerel_defconfig +++ b/arch/arm/configs/mackerel_defconfig | |||
@@ -23,8 +23,9 @@ CONFIG_AEABI=y | |||
23 | CONFIG_FORCE_MAX_ZONEORDER=15 | 23 | CONFIG_FORCE_MAX_ZONEORDER=15 |
24 | CONFIG_ZBOOT_ROM_TEXT=0x0 | 24 | CONFIG_ZBOOT_ROM_TEXT=0x0 |
25 | CONFIG_ZBOOT_ROM_BSS=0x0 | 25 | CONFIG_ZBOOT_ROM_BSS=0x0 |
26 | CONFIG_CMDLINE="console=tty0, console=ttySC0,115200 earlyprintk=sh-sci.0,115200 root=/dev/nfs nfsroot=,tcp,v3 ip=dhcp memchunk.vpu=64m memchunk.veu0=8m memchunk.spu0=2m mem=240m" | 26 | CONFIG_ARM_APPENDED_DTB=y |
27 | CONFIG_KEXEC=y | 27 | CONFIG_KEXEC=y |
28 | CONFIG_VFP=y | ||
28 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | 29 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set |
29 | CONFIG_PM=y | 30 | CONFIG_PM=y |
30 | CONFIG_PM_RUNTIME=y | 31 | CONFIG_PM_RUNTIME=y |
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig index 5be2e4be802c..b16bae2c9a60 100644 --- a/arch/arm/configs/omap2plus_defconfig +++ b/arch/arm/configs/omap2plus_defconfig | |||
@@ -53,6 +53,11 @@ CONFIG_IP_PNP_RARP=y | |||
53 | # CONFIG_INET_LRO is not set | 53 | # CONFIG_INET_LRO is not set |
54 | # CONFIG_IPV6 is not set | 54 | # CONFIG_IPV6 is not set |
55 | CONFIG_NETFILTER=y | 55 | CONFIG_NETFILTER=y |
56 | CONFIG_CAN=m | ||
57 | CONFIG_CAN_RAW=m | ||
58 | CONFIG_CAN_BCM=m | ||
59 | CONFIG_CAN_C_CAN=m | ||
60 | CONFIG_CAN_C_CAN_PLATFORM=m | ||
56 | CONFIG_BT=m | 61 | CONFIG_BT=m |
57 | CONFIG_BT_HCIUART=m | 62 | CONFIG_BT_HCIUART=m |
58 | CONFIG_BT_HCIUART_H4=y | 63 | CONFIG_BT_HCIUART_H4=y |
@@ -65,6 +70,7 @@ CONFIG_MAC80211=m | |||
65 | CONFIG_MAC80211_RC_PID=y | 70 | CONFIG_MAC80211_RC_PID=y |
66 | CONFIG_MAC80211_RC_DEFAULT_PID=y | 71 | CONFIG_MAC80211_RC_DEFAULT_PID=y |
67 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 72 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
73 | CONFIG_CMA=y | ||
68 | CONFIG_CONNECTOR=y | 74 | CONFIG_CONNECTOR=y |
69 | CONFIG_DEVTMPFS=y | 75 | CONFIG_DEVTMPFS=y |
70 | CONFIG_DEVTMPFS_MOUNT=y | 76 | CONFIG_DEVTMPFS_MOUNT=y |
@@ -84,6 +90,9 @@ CONFIG_MTD_UBI=y | |||
84 | CONFIG_BLK_DEV_LOOP=y | 90 | CONFIG_BLK_DEV_LOOP=y |
85 | CONFIG_BLK_DEV_RAM=y | 91 | CONFIG_BLK_DEV_RAM=y |
86 | CONFIG_BLK_DEV_RAM_SIZE=16384 | 92 | CONFIG_BLK_DEV_RAM_SIZE=16384 |
93 | CONFIG_SENSORS_LIS3LV02D=m | ||
94 | CONFIG_SENSORS_TSL2550=m | ||
95 | CONFIG_SENSORS_LIS3_I2C=m | ||
87 | CONFIG_SCSI=y | 96 | CONFIG_SCSI=y |
88 | CONFIG_BLK_DEV_SD=y | 97 | CONFIG_BLK_DEV_SD=y |
89 | CONFIG_SCSI_MULTI_LUN=y | 98 | CONFIG_SCSI_MULTI_LUN=y |
@@ -109,6 +118,7 @@ CONFIG_USB_KC2190=y | |||
109 | CONFIG_INPUT_JOYDEV=y | 118 | CONFIG_INPUT_JOYDEV=y |
110 | CONFIG_INPUT_EVDEV=y | 119 | CONFIG_INPUT_EVDEV=y |
111 | CONFIG_KEYBOARD_GPIO=y | 120 | CONFIG_KEYBOARD_GPIO=y |
121 | CONFIG_KEYBOARD_MATRIX=m | ||
112 | CONFIG_KEYBOARD_TWL4030=y | 122 | CONFIG_KEYBOARD_TWL4030=y |
113 | CONFIG_INPUT_TOUCHSCREEN=y | 123 | CONFIG_INPUT_TOUCHSCREEN=y |
114 | CONFIG_TOUCHSCREEN_ADS7846=y | 124 | CONFIG_TOUCHSCREEN_ADS7846=y |
@@ -134,14 +144,17 @@ CONFIG_GPIO_SYSFS=y | |||
134 | CONFIG_GPIO_TWL4030=y | 144 | CONFIG_GPIO_TWL4030=y |
135 | CONFIG_W1=y | 145 | CONFIG_W1=y |
136 | CONFIG_POWER_SUPPLY=y | 146 | CONFIG_POWER_SUPPLY=y |
147 | CONFIG_SENSORS_LM75=m | ||
137 | CONFIG_WATCHDOG=y | 148 | CONFIG_WATCHDOG=y |
138 | CONFIG_OMAP_WATCHDOG=y | 149 | CONFIG_OMAP_WATCHDOG=y |
139 | CONFIG_TWL4030_WATCHDOG=y | 150 | CONFIG_TWL4030_WATCHDOG=y |
140 | CONFIG_MFD_TPS65217=y | 151 | CONFIG_MFD_TPS65217=y |
152 | CONFIG_MFD_TPS65910=y | ||
141 | CONFIG_REGULATOR_TWL4030=y | 153 | CONFIG_REGULATOR_TWL4030=y |
142 | CONFIG_REGULATOR_TPS65023=y | 154 | CONFIG_REGULATOR_TPS65023=y |
143 | CONFIG_REGULATOR_TPS6507X=y | 155 | CONFIG_REGULATOR_TPS6507X=y |
144 | CONFIG_REGULATOR_TPS65217=y | 156 | CONFIG_REGULATOR_TPS65217=y |
157 | CONFIG_REGULATOR_TPS65910=y | ||
145 | CONFIG_FB=y | 158 | CONFIG_FB=y |
146 | CONFIG_FIRMWARE_EDID=y | 159 | CONFIG_FIRMWARE_EDID=y |
147 | CONFIG_FB_MODE_HELPERS=y | 160 | CONFIG_FB_MODE_HELPERS=y |
@@ -153,6 +166,7 @@ CONFIG_OMAP2_DSS_SDI=y | |||
153 | CONFIG_OMAP2_DSS_DSI=y | 166 | CONFIG_OMAP2_DSS_DSI=y |
154 | CONFIG_FB_OMAP2=m | 167 | CONFIG_FB_OMAP2=m |
155 | CONFIG_PANEL_GENERIC_DPI=m | 168 | CONFIG_PANEL_GENERIC_DPI=m |
169 | CONFIG_PANEL_TFP410=m | ||
156 | CONFIG_PANEL_SHARP_LS037V7DW01=m | 170 | CONFIG_PANEL_SHARP_LS037V7DW01=m |
157 | CONFIG_PANEL_NEC_NL8048HL11_01B=m | 171 | CONFIG_PANEL_NEC_NL8048HL11_01B=m |
158 | CONFIG_PANEL_TAAL=m | 172 | CONFIG_PANEL_TAAL=m |
@@ -200,9 +214,20 @@ CONFIG_SDIO_UART=y | |||
200 | CONFIG_MMC_ARMMMCI=y | 214 | CONFIG_MMC_ARMMMCI=y |
201 | CONFIG_MMC_OMAP=y | 215 | CONFIG_MMC_OMAP=y |
202 | CONFIG_MMC_OMAP_HS=y | 216 | CONFIG_MMC_OMAP_HS=y |
217 | CONFIG_NEW_LEDS=y | ||
218 | CONFIG_LEDS_GPIO=y | ||
219 | CONFIG_LEDS_TRIGGERS=y | ||
220 | CONFIG_LEDS_TRIGGER_TIMER=y | ||
221 | CONFIG_LEDS_TRIGGER_ONESHOT=y | ||
222 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y | ||
223 | CONFIG_LEDS_TRIGGER_BACKLIGHT=y | ||
224 | CONFIG_LEDS_TRIGGER_CPU=y | ||
225 | CONFIG_LEDS_TRIGGER_GPIO=y | ||
226 | CONFIG_LEDS_TRIGGER_DEFAULT_ON=y | ||
203 | CONFIG_RTC_CLASS=y | 227 | CONFIG_RTC_CLASS=y |
204 | CONFIG_RTC_DRV_TWL92330=y | 228 | CONFIG_RTC_DRV_TWL92330=y |
205 | CONFIG_RTC_DRV_TWL4030=y | 229 | CONFIG_RTC_DRV_TWL4030=y |
230 | CONFIG_RTC_DRV_OMAP=y | ||
206 | CONFIG_DMADEVICES=y | 231 | CONFIG_DMADEVICES=y |
207 | CONFIG_DMA_OMAP=y | 232 | CONFIG_DMA_OMAP=y |
208 | CONFIG_EXT2_FS=y | 233 | CONFIG_EXT2_FS=y |
diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig index a7827fd0616f..aba4881d20e5 100644 --- a/arch/arm/configs/tegra_defconfig +++ b/arch/arm/configs/tegra_defconfig | |||
@@ -38,6 +38,7 @@ CONFIG_HIGHMEM=y | |||
38 | CONFIG_ZBOOT_ROM_TEXT=0x0 | 38 | CONFIG_ZBOOT_ROM_TEXT=0x0 |
39 | CONFIG_ZBOOT_ROM_BSS=0x0 | 39 | CONFIG_ZBOOT_ROM_BSS=0x0 |
40 | CONFIG_AUTO_ZRELADDR=y | 40 | CONFIG_AUTO_ZRELADDR=y |
41 | CONFIG_KEXEC=y | ||
41 | CONFIG_CPU_FREQ=y | 42 | CONFIG_CPU_FREQ=y |
42 | CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y | 43 | CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y |
43 | CONFIG_CPU_IDLE=y | 44 | CONFIG_CPU_IDLE=y |
@@ -106,12 +107,14 @@ CONFIG_BRCMFMAC=m | |||
106 | CONFIG_RT2X00=y | 107 | CONFIG_RT2X00=y |
107 | CONFIG_RT2800USB=m | 108 | CONFIG_RT2800USB=m |
108 | CONFIG_INPUT_EVDEV=y | 109 | CONFIG_INPUT_EVDEV=y |
110 | CONFIG_KEYBOARD_TEGRA=y | ||
109 | CONFIG_INPUT_MISC=y | 111 | CONFIG_INPUT_MISC=y |
110 | CONFIG_INPUT_MPU3050=y | 112 | CONFIG_INPUT_MPU3050=y |
111 | # CONFIG_LEGACY_PTYS is not set | 113 | # CONFIG_LEGACY_PTYS is not set |
112 | # CONFIG_DEVKMEM is not set | 114 | # CONFIG_DEVKMEM is not set |
113 | CONFIG_SERIAL_8250=y | 115 | CONFIG_SERIAL_8250=y |
114 | CONFIG_SERIAL_8250_CONSOLE=y | 116 | CONFIG_SERIAL_8250_CONSOLE=y |
117 | CONFIG_SERIAL_TEGRA=y | ||
115 | CONFIG_SERIAL_OF_PLATFORM=y | 118 | CONFIG_SERIAL_OF_PLATFORM=y |
116 | # CONFIG_HW_RANDOM is not set | 119 | # CONFIG_HW_RANDOM is not set |
117 | CONFIG_I2C=y | 120 | CONFIG_I2C=y |
@@ -127,6 +130,8 @@ CONFIG_GPIO_TPS6586X=y | |||
127 | CONFIG_GPIO_TPS65910=y | 130 | CONFIG_GPIO_TPS65910=y |
128 | CONFIG_POWER_SUPPLY=y | 131 | CONFIG_POWER_SUPPLY=y |
129 | CONFIG_BATTERY_SBS=y | 132 | CONFIG_BATTERY_SBS=y |
133 | CONFIG_POWER_RESET=y | ||
134 | CONFIG_POWER_RESET_GPIO=y | ||
130 | CONFIG_SENSORS_LM90=y | 135 | CONFIG_SENSORS_LM90=y |
131 | CONFIG_MFD_TPS6586X=y | 136 | CONFIG_MFD_TPS6586X=y |
132 | CONFIG_MFD_TPS65910=y | 137 | CONFIG_MFD_TPS65910=y |
@@ -186,6 +191,7 @@ CONFIG_RTC_INTF_SYSFS=y | |||
186 | CONFIG_RTC_INTF_PROC=y | 191 | CONFIG_RTC_INTF_PROC=y |
187 | CONFIG_RTC_INTF_DEV=y | 192 | CONFIG_RTC_INTF_DEV=y |
188 | CONFIG_RTC_DRV_MAX8907=y | 193 | CONFIG_RTC_DRV_MAX8907=y |
194 | CONFIG_RTC_DRV_TPS6586X=y | ||
189 | CONFIG_RTC_DRV_TPS65910=y | 195 | CONFIG_RTC_DRV_TPS65910=y |
190 | CONFIG_RTC_DRV_EM3027=y | 196 | CONFIG_RTC_DRV_EM3027=y |
191 | CONFIG_RTC_DRV_TEGRA=y | 197 | CONFIG_RTC_DRV_TEGRA=y |