aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-04-22 12:20:15 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2015-04-22 12:20:15 -0400
commite5ac320de1fe3ef5a5afa5f8a0cd19b0c5373a37 (patch)
tree022243a657a53921afe1cc86314cd6cb843cc28f /arch/arm/configs
parent7d2b6ef19cf0f98cef17aa5185de3631a618710a (diff)
parent89522f0f8bd5056dec21bb7de073cbd5886e435c (diff)
Merge tag 'armsoc-multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC multiplatform code changes from Olof Johansson: "The changes here belong to two main platforms: - Atmel At91 is flipping the bit and going multiplatform. This includes some cleanups and removal of code, and the final flip of config dependencies - Shmobile has several platforms that are going multiplatform, but this branch also contains a bunch of cleanups that they weren't able to keep separate in a good way. THere's also a removal of one of their SoCs and the corresponding boards (sh7372 and mackerel)" * tag 'armsoc-multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (67 commits) ARM: at91/pm: move AT91_MEMCTRL_* to pm.h ARM: at91/pm: move the standby functions to pm.c ARM: at91: fix pm_suspend.S compilation when ARMv6 is selected ARM: at91: add a Kconfig dependency on multi-platform ARM: at91: drop AT91_TIMER_HZ ARM: at91: remove hardware.h ARM: at91: remove SoC headers ARM: at91: remove useless mach/cpu.h ARM: at91: remove unused headers ARM: at91: switch at91_dt_defconfig to multiplatform ARM: at91: switch to multiplatform ARM: shmobile: r8a7778: enable multiplatform target ARM: shmobile: bockw: add sound to DT ARM: shmobile: r8a7778: add sound to DT ARM: shmobile: bockw: add devices hooked up to i2c0 to DT DT: i2c: add trivial binding for OKI ML86V7667 video decoder ARM: shmobile: r8a7778: common clock framework CPG driver ARM: shmobile: bockw dts: set extal clock frequency ARM: shmobile: bockw dts: Move Ethernet node to BSC ARM: shmobile: r8a73a4: Remove legacy code ...
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/ape6evm_defconfig109
-rw-r--r--arch/arm/configs/at91_dt_defconfig5
-rw-r--r--arch/arm/configs/mackerel_defconfig157
3 files changed, 4 insertions, 267 deletions
diff --git a/arch/arm/configs/ape6evm_defconfig b/arch/arm/configs/ape6evm_defconfig
deleted file mode 100644
index 9e9a72e3d30f..000000000000
--- a/arch/arm/configs/ape6evm_defconfig
+++ /dev/null
@@ -1,109 +0,0 @@
1CONFIG_SYSVIPC=y
2CONFIG_POSIX_MQUEUE=y
3CONFIG_NO_HZ=y
4CONFIG_HIGH_RES_TIMERS=y
5CONFIG_BSD_PROCESS_ACCT=y
6CONFIG_IKCONFIG=y
7CONFIG_IKCONFIG_PROC=y
8CONFIG_LOG_BUF_SHIFT=16
9CONFIG_CGROUPS=y
10CONFIG_CGROUP_SCHED=y
11CONFIG_KALLSYMS_ALL=y
12CONFIG_EMBEDDED=y
13CONFIG_PERF_EVENTS=y
14CONFIG_SLAB=y
15CONFIG_ARCH_SHMOBILE_LEGACY=y
16CONFIG_ARCH_R8A73A4=y
17CONFIG_MACH_APE6EVM=y
18# CONFIG_ARM_THUMB is not set
19CONFIG_CPU_BPREDICT_DISABLE=y
20CONFIG_PL310_ERRATA_588369=y
21CONFIG_ARM_ERRATA_754322=y
22CONFIG_SMP=y
23CONFIG_SCHED_MC=y
24CONFIG_HAVE_ARM_ARCH_TIMER=y
25CONFIG_NR_CPUS=8
26CONFIG_AEABI=y
27CONFIG_HIGHMEM=y
28CONFIG_HIGHPTE=y
29# CONFIG_HW_PERF_EVENTS is not set
30# CONFIG_COMPACTION is not set
31# CONFIG_CROSS_MEMORY_ATTACH is not set
32CONFIG_ARM_APPENDED_DTB=y
33CONFIG_VFP=y
34CONFIG_NEON=y
35CONFIG_BINFMT_MISC=y
36CONFIG_PM=y
37CONFIG_NET=y
38CONFIG_PACKET=y
39CONFIG_UNIX=y
40CONFIG_XFRM_USER=y
41CONFIG_NET_KEY=y
42CONFIG_NET_KEY_MIGRATE=y
43CONFIG_INET=y
44CONFIG_IP_MULTICAST=y
45CONFIG_IP_PNP=y
46CONFIG_IP_PNP_DHCP=y
47# CONFIG_INET_LRO is not set
48# CONFIG_IPV6_SIT is not set
49CONFIG_NETFILTER=y
50CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
51CONFIG_DEVTMPFS=y
52CONFIG_DEVTMPFS_MOUNT=y
53# CONFIG_FW_LOADER_USER_HELPER is not set
54CONFIG_NETDEVICES=y
55# CONFIG_NET_CADENCE is not set
56CONFIG_SMC91X=y
57CONFIG_SMSC911X=y
58# CONFIG_INPUT_MOUSEDEV is not set
59CONFIG_INPUT_EVDEV=y
60CONFIG_KEYBOARD_GPIO=y
61# CONFIG_INPUT_MOUSE is not set
62# CONFIG_SERIO is not set
63CONFIG_SERIAL_NONSTANDARD=y
64CONFIG_SERIAL_SH_SCI=y
65CONFIG_SERIAL_SH_SCI_NR_UARTS=12
66CONFIG_SERIAL_SH_SCI_CONSOLE=y
67CONFIG_I2C=y
68CONFIG_I2C_SH_MOBILE=y
69CONFIG_GPIO_SH_PFC=y
70CONFIG_GPIOLIB=y
71# CONFIG_HWMON is not set
72CONFIG_THERMAL=y
73CONFIG_RCAR_THERMAL=y
74CONFIG_REGULATOR=y
75CONFIG_REGULATOR_FIXED_VOLTAGE=y
76CONFIG_REGULATOR_GPIO=y
77CONFIG_REGULATOR_MAX8973=y
78# CONFIG_HID is not set
79# CONFIG_USB_SUPPORT is not set
80CONFIG_MMC=y
81CONFIG_MMC_SDHI=y
82CONFIG_MMC_SH_MMCIF=y
83CONFIG_NEW_LEDS=y
84CONFIG_LEDS_CLASS=y
85CONFIG_LEDS_GPIO=y
86CONFIG_DMADEVICES=y
87CONFIG_SH_DMAE=y
88# CONFIG_IOMMU_SUPPORT is not set
89# CONFIG_DNOTIFY is not set
90CONFIG_TMPFS=y
91# CONFIG_MISC_FILESYSTEMS is not set
92CONFIG_NFS_FS=y
93CONFIG_NFS_V3_ACL=y
94CONFIG_NFS_V4=y
95CONFIG_NFS_V4_1=y
96CONFIG_ROOT_NFS=y
97CONFIG_MAGIC_SYSRQ=y
98CONFIG_ENABLE_DEFAULT_TRACERS=y
99CONFIG_CRYPTO_CBC=y
100CONFIG_CRYPTO_ECB=y
101CONFIG_CRYPTO_MD5=y
102CONFIG_CRYPTO_MICHAEL_MIC=y
103CONFIG_CRYPTO_TWOFISH=y
104CONFIG_CRC_CCITT=y
105CONFIG_CRC16=y
106CONFIG_CRC_T10DIF=y
107CONFIG_CRC_ITU_T=y
108CONFIG_CRC7=y
109CONFIG_LIBCRC32C=y
diff --git a/arch/arm/configs/at91_dt_defconfig b/arch/arm/configs/at91_dt_defconfig
index 811e72bbe642..bcef49a21801 100644
--- a/arch/arm/configs/at91_dt_defconfig
+++ b/arch/arm/configs/at91_dt_defconfig
@@ -13,10 +13,13 @@ CONFIG_MODULE_UNLOAD=y
13# CONFIG_BLK_DEV_BSG is not set 13# CONFIG_BLK_DEV_BSG is not set
14# CONFIG_IOSCHED_DEADLINE is not set 14# CONFIG_IOSCHED_DEADLINE is not set
15# CONFIG_IOSCHED_CFQ is not set 15# CONFIG_IOSCHED_CFQ is not set
16CONFIG_ARCH_MULTI_V4T=y
17CONFIG_ARCH_MULTI_V5=y
18# CONFIG_ARCH_MULTI_V7 is not set
16CONFIG_ARCH_AT91=y 19CONFIG_ARCH_AT91=y
20CONFIG_SOC_SAM_V4_V5=y
17CONFIG_SOC_AT91RM9200=y 21CONFIG_SOC_AT91RM9200=y
18CONFIG_SOC_AT91SAM9=y 22CONFIG_SOC_AT91SAM9=y
19CONFIG_AT91_TIMER_HZ=128
20CONFIG_AEABI=y 23CONFIG_AEABI=y
21CONFIG_UACCESS_WITH_MEMCPY=y 24CONFIG_UACCESS_WITH_MEMCPY=y
22CONFIG_ZBOOT_ROM_TEXT=0x0 25CONFIG_ZBOOT_ROM_TEXT=0x0
diff --git a/arch/arm/configs/mackerel_defconfig b/arch/arm/configs/mackerel_defconfig
deleted file mode 100644
index 05a529311b4d..000000000000
--- a/arch/arm/configs/mackerel_defconfig
+++ /dev/null
@@ -1,157 +0,0 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y
3CONFIG_IKCONFIG=y
4CONFIG_IKCONFIG_PROC=y
5CONFIG_LOG_BUF_SHIFT=16
6# CONFIG_UTS_NS is not set
7# CONFIG_IPC_NS is not set
8# CONFIG_USER_NS is not set
9# CONFIG_PID_NS is not set
10# CONFIG_NET_NS is not set
11CONFIG_SLAB=y
12CONFIG_MODULES=y
13CONFIG_MODULE_UNLOAD=y
14# CONFIG_BLK_DEV_BSG is not set
15# CONFIG_IOSCHED_DEADLINE is not set
16# CONFIG_IOSCHED_CFQ is not set
17CONFIG_ARCH_SHMOBILE_LEGACY=y
18CONFIG_ARCH_SH7372=y
19CONFIG_MACH_MACKEREL=y
20CONFIG_MEMORY_SIZE=0x10000000
21CONFIG_AEABI=y
22# CONFIG_OABI_COMPAT is not set
23CONFIG_FORCE_MAX_ZONEORDER=15
24CONFIG_ZBOOT_ROM_TEXT=0x0
25CONFIG_ZBOOT_ROM_BSS=0x0
26CONFIG_ARM_APPENDED_DTB=y
27CONFIG_KEXEC=y
28CONFIG_VFP=y
29# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
30CONFIG_PM=y
31CONFIG_NET=y
32CONFIG_PACKET=y
33CONFIG_UNIX=y
34CONFIG_INET=y
35CONFIG_IP_MULTICAST=y
36CONFIG_IP_PNP=y
37CONFIG_IP_PNP_DHCP=y
38# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
39# CONFIG_INET_XFRM_MODE_TUNNEL is not set
40# CONFIG_INET_XFRM_MODE_BEET is not set
41# CONFIG_IPV6 is not set
42# CONFIG_WIRELESS is not set
43CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
44CONFIG_DEVTMPFS=y
45CONFIG_DEVTMPFS_MOUNT=y
46# CONFIG_FIRMWARE_IN_KERNEL is not set
47CONFIG_MTD=y
48CONFIG_MTD_CONCAT=y
49CONFIG_MTD_PARTITIONS=y
50CONFIG_MTD_CHAR=y
51CONFIG_MTD_BLOCK=y
52CONFIG_MTD_CFI=y
53CONFIG_MTD_CFI_ADV_OPTIONS=y
54CONFIG_MTD_CFI_INTELEXT=y
55CONFIG_MTD_PHYSMAP=y
56CONFIG_MTD_ARM_INTEGRATOR=y
57CONFIG_MTD_BLOCK2MTD=y
58CONFIG_SCSI=y
59CONFIG_BLK_DEV_SD=y
60# CONFIG_SCSI_LOWLEVEL is not set
61CONFIG_NETDEVICES=y
62CONFIG_NET_ETHERNET=y
63CONFIG_SMSC911X=y
64# CONFIG_NETDEV_1000 is not set
65# CONFIG_NETDEV_10000 is not set
66# CONFIG_WLAN is not set
67# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
68# CONFIG_INPUT_KEYBOARD is not set
69# CONFIG_INPUT_MOUSE is not set
70CONFIG_SERIAL_SH_SCI=y
71CONFIG_SERIAL_SH_SCI_NR_UARTS=8
72CONFIG_SERIAL_SH_SCI_CONSOLE=y
73# CONFIG_LEGACY_PTYS is not set
74# CONFIG_HW_RANDOM is not set
75CONFIG_I2C=y
76CONFIG_I2C_SH_MOBILE=y
77# CONFIG_HWMON is not set
78# CONFIG_MFD_SUPPORT is not set
79CONFIG_REGULATOR=y
80CONFIG_FB=y
81CONFIG_FB_MODE_HELPERS=y
82CONFIG_FB_SH_MOBILE_LCDC=y
83CONFIG_FB_SH_MOBILE_HDMI=y
84CONFIG_FRAMEBUFFER_CONSOLE=y
85CONFIG_LOGO=y
86# CONFIG_LOGO_LINUX_MONO is not set
87# CONFIG_LOGO_LINUX_CLUT224 is not set
88# CONFIG_SND_SUPPORT_OLD_API is not set
89# CONFIG_SND_VERBOSE_PROCFS is not set
90# CONFIG_SND_DRIVERS is not set
91# CONFIG_SND_ARM is not set
92CONFIG_SND_SOC_SH4_FSI=y
93CONFIG_USB=y
94CONFIG_USB_RENESAS_USBHS_HCD=y
95CONFIG_USB_RENESAS_USBHS=y
96CONFIG_USB_STORAGE=y
97CONFIG_USB_GADGET=y
98CONFIG_USB_RENESAS_USBHS_UDC=y
99CONFIG_MMC=y
100CONFIG_MMC_SDHI=y
101CONFIG_MMC_SH_MMCIF=y
102CONFIG_DMADEVICES=y
103CONFIG_SH_DMAE=y
104CONFIG_EXT2_FS=y
105CONFIG_EXT2_FS_XATTR=y
106CONFIG_EXT2_FS_POSIX_ACL=y
107CONFIG_EXT2_FS_SECURITY=y
108CONFIG_EXT2_FS_XIP=y
109CONFIG_EXT3_FS=y
110# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
111CONFIG_EXT3_FS_POSIX_ACL=y
112CONFIG_EXT3_FS_SECURITY=y
113# CONFIG_DNOTIFY is not set
114CONFIG_MSDOS_FS=y
115CONFIG_VFAT_FS=y
116CONFIG_TMPFS=y
117# CONFIG_MISC_FILESYSTEMS is not set
118CONFIG_NFS_FS=y
119CONFIG_NFS_V3=y
120CONFIG_NFS_V3_ACL=y
121CONFIG_NFS_V4=y
122CONFIG_NFS_V4_1=y
123CONFIG_ROOT_NFS=y
124CONFIG_NLS_CODEPAGE_437=y
125CONFIG_NLS_CODEPAGE_737=y
126CONFIG_NLS_CODEPAGE_775=y
127CONFIG_NLS_CODEPAGE_850=y
128CONFIG_NLS_CODEPAGE_852=y
129CONFIG_NLS_CODEPAGE_855=y
130CONFIG_NLS_CODEPAGE_857=y
131CONFIG_NLS_CODEPAGE_860=y
132CONFIG_NLS_CODEPAGE_861=y
133CONFIG_NLS_CODEPAGE_862=y
134CONFIG_NLS_CODEPAGE_863=y
135CONFIG_NLS_CODEPAGE_864=y
136CONFIG_NLS_CODEPAGE_865=y
137CONFIG_NLS_CODEPAGE_866=y
138CONFIG_NLS_CODEPAGE_869=y
139CONFIG_NLS_ISO8859_1=y
140CONFIG_NLS_ISO8859_2=y
141CONFIG_NLS_ISO8859_3=y
142CONFIG_NLS_ISO8859_4=y
143CONFIG_NLS_ISO8859_5=y
144CONFIG_NLS_ISO8859_6=y
145CONFIG_NLS_ISO8859_7=y
146CONFIG_NLS_ISO8859_9=y
147CONFIG_NLS_ISO8859_13=y
148CONFIG_NLS_ISO8859_14=y
149CONFIG_NLS_ISO8859_15=y
150CONFIG_NLS_KOI8_R=y
151CONFIG_NLS_KOI8_U=y
152CONFIG_NLS_UTF8=y
153# CONFIG_ENABLE_WARN_DEPRECATED is not set
154# CONFIG_ENABLE_MUST_CHECK is not set
155# CONFIG_ARM_UNWIND is not set
156CONFIG_CRYPTO=y
157CONFIG_CRYPTO_ANSI_CPRNG=y
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-22 23:33:53 -0500