diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 21:32:45 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 21:32:45 -0400 |
commit | ac9e7ab32fe42489808c8d9fc89ad413d2805766 (patch) | |
tree | d5628b62e23fae6a0acd000a7bb16030c89f2073 /arch/arm/configs | |
parent | 2a2bf85f05e42b12ea6bfe821e2d19221cf93555 (diff) | |
parent | b98138e00d96abc85b100c9b6886f105d9868ab5 (diff) |
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM soc cleanups, part 2 from Olof Johansson:
"A shorter cleanup branch submitted separately due to dependencies with
some of the previous topics.
Major thing here is that the Broadcom bcmring platform is removed.
It's an SoC that's used on some stationary VoIP platforms, and is in
desperate need of some cleanup. Broadcom came back and suggested that
we just deprecate the platform for now, since they aren't going to
spend the resources needed on cleaning it up, and there are no users
of the platform directly from mainline."
Fix some conflicts due to BCM2835 getting added next to the removed
BCMRING, and removal of tegra files that had been converted to
devicetree.
* tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: Orion5x: ts78xx: Add IOMEM for virtual addresses.
ARM: ux500: use __iomem pointers for MMIO
ARM: Remove mach-bcmring
ARM: clps711x: Remove board support for CEIVA
ARM: clps711x: Fix register definitions
ARM: clps711x: Fix lowlevel debug-macro
ARM: clps711x: Added simple clock framework
pinctrl: tegra: move pinconf-tegra.h content into drivers/pinctrl
ARM: tegra: delete unused headers
ARM: tegra: remove useless includes of <mach/*.h>
ARM: tegra: remove dead code
Diffstat (limited to 'arch/arm/configs')
-rw-r--r-- | arch/arm/configs/bcmring_defconfig | 79 |
1 files changed, 0 insertions, 79 deletions
diff --git a/arch/arm/configs/bcmring_defconfig b/arch/arm/configs/bcmring_defconfig deleted file mode 100644 index 9e6a8fe13164..000000000000 --- a/arch/arm/configs/bcmring_defconfig +++ /dev/null | |||
@@ -1,79 +0,0 @@ | |||
1 | CONFIG_EXPERIMENTAL=y | ||
2 | # CONFIG_LOCALVERSION_AUTO is not set | ||
3 | # CONFIG_SWAP is not set | ||
4 | CONFIG_SYSVIPC=y | ||
5 | CONFIG_EXPERT=y | ||
6 | CONFIG_KALLSYMS_EXTRA_PASS=y | ||
7 | # CONFIG_HOTPLUG is not set | ||
8 | # CONFIG_ELF_CORE is not set | ||
9 | # CONFIG_EPOLL is not set | ||
10 | # CONFIG_SIGNALFD is not set | ||
11 | # CONFIG_TIMERFD is not set | ||
12 | # CONFIG_EVENTFD is not set | ||
13 | # CONFIG_AIO is not set | ||
14 | CONFIG_PERF_EVENTS=y | ||
15 | # CONFIG_VM_EVENT_COUNTERS is not set | ||
16 | # CONFIG_SLUB_DEBUG is not set | ||
17 | # CONFIG_COMPAT_BRK is not set | ||
18 | CONFIG_MODULES=y | ||
19 | CONFIG_MODULE_UNLOAD=y | ||
20 | # CONFIG_BLK_DEV_BSG is not set | ||
21 | # CONFIG_IOSCHED_DEADLINE is not set | ||
22 | # CONFIG_IOSCHED_CFQ is not set | ||
23 | CONFIG_ARCH_BCMRING=y | ||
24 | CONFIG_BCM_ZRELADDR=0x8000 | ||
25 | CONFIG_CPU_32v6K=y | ||
26 | CONFIG_NO_HZ=y | ||
27 | CONFIG_PREEMPT=y | ||
28 | CONFIG_AEABI=y | ||
29 | # CONFIG_OABI_COMPAT is not set | ||
30 | CONFIG_UACCESS_WITH_MEMCPY=y | ||
31 | CONFIG_ZBOOT_ROM_TEXT=0x0e000000 | ||
32 | CONFIG_ZBOOT_ROM_BSS=0x0ea00000 | ||
33 | CONFIG_ZBOOT_ROM=y | ||
34 | CONFIG_NET=y | ||
35 | # CONFIG_WIRELESS is not set | ||
36 | CONFIG_MTD=y | ||
37 | CONFIG_MTD_CONCAT=y | ||
38 | CONFIG_MTD_PARTITIONS=y | ||
39 | CONFIG_MTD_CMDLINE_PARTS=y | ||
40 | CONFIG_MTD_CHAR=y | ||
41 | CONFIG_MTD_BLOCK=y | ||
42 | CONFIG_MTD_CFI=y | ||
43 | CONFIG_MTD_CFI_ADV_OPTIONS=y | ||
44 | CONFIG_MTD_CFI_GEOMETRY=y | ||
45 | # CONFIG_MTD_CFI_I2 is not set | ||
46 | CONFIG_MTD_NAND=y | ||
47 | CONFIG_MTD_NAND_VERIFY_WRITE=y | ||
48 | CONFIG_MTD_NAND_BCM_UMI=y | ||
49 | CONFIG_MTD_NAND_BCM_UMI_HWCS=y | ||
50 | # CONFIG_MISC_DEVICES is not set | ||
51 | # CONFIG_INPUT_MOUSEDEV is not set | ||
52 | # CONFIG_INPUT_KEYBOARD is not set | ||
53 | # CONFIG_INPUT_MOUSE is not set | ||
54 | # CONFIG_SERIO is not set | ||
55 | # CONFIG_CONSOLE_TRANSLATIONS is not set | ||
56 | # CONFIG_DEVKMEM is not set | ||
57 | CONFIG_SERIAL_AMBA_PL011=y | ||
58 | CONFIG_SERIAL_AMBA_PL011_CONSOLE=y | ||
59 | CONFIG_LEGACY_PTY_COUNT=64 | ||
60 | # CONFIG_HW_RANDOM is not set | ||
61 | # CONFIG_HWMON is not set | ||
62 | # CONFIG_VGA_CONSOLE is not set | ||
63 | # CONFIG_HID_SUPPORT is not set | ||
64 | # CONFIG_USB_SUPPORT is not set | ||
65 | # CONFIG_FILE_LOCKING is not set | ||
66 | # CONFIG_DNOTIFY is not set | ||
67 | # CONFIG_INOTIFY_USER is not set | ||
68 | # CONFIG_PROC_PAGE_MONITOR is not set | ||
69 | CONFIG_TMPFS=y | ||
70 | CONFIG_JFFS2_FS=y | ||
71 | CONFIG_JFFS2_SUMMARY=y | ||
72 | CONFIG_JFFS2_FS_XATTR=y | ||
73 | # CONFIG_JFFS2_FS_SECURITY is not set | ||
74 | # CONFIG_NETWORK_FILESYSTEMS is not set | ||
75 | # CONFIG_ENABLE_WARN_DEPRECATED is not set | ||
76 | CONFIG_MAGIC_SYSRQ=y | ||
77 | CONFIG_HEADERS_CHECK=y | ||
78 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
79 | # CONFIG_ARM_UNWIND is not set | ||