Skip to content

Commit 3a516b6

Browse files
committed
Merge tag 'mvebu-defconfig-3.15-2' of git://git.infradead.org/linux-mvebu into next/boards
Merge "mvebu defconfig changes for v3.15 (incremental pull #2)" from Jason Cooper - add multi_v5_defconfig - add mvebu_v5_defconfig - kirkwood: add HP T5325 devices * tag 'mvebu-defconfig-3.15-2' of git://git.infradead.org/linux-mvebu: ARM: kirkwood: Add HP T5325 devices to {multi|mvebu}_v5_defconfig ARM: config: Add mvebu_v5_defconfig ARM: config: Add a multi_v5_defconfig Signed-off-by: Arnd Bergmann <[email protected]>
2 parents af8cdfd + 7c8f827 commit 3a516b6

File tree

2 files changed

+375
-0
lines changed

2 files changed

+375
-0
lines changed
Lines changed: 194 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,194 @@
1+
CONFIG_SYSVIPC=y
2+
CONFIG_NO_HZ=y
3+
CONFIG_HIGH_RES_TIMERS=y
4+
CONFIG_LOG_BUF_SHIFT=19
5+
CONFIG_PROFILING=y
6+
CONFIG_OPROFILE=y
7+
CONFIG_KPROBES=y
8+
CONFIG_MODULES=y
9+
CONFIG_MODULE_UNLOAD=y
10+
# CONFIG_BLK_DEV_BSG is not set
11+
# CONFIG_ARCH_MULTI_V7 is not set
12+
CONFIG_ARCH_MVEBU=y
13+
CONFIG_MACH_KIRKWOOD=y
14+
CONFIG_MACH_T5325=y
15+
CONFIG_ARCH_MXC=y
16+
CONFIG_MACH_IMX25_DT=y
17+
CONFIG_MACH_IMX27_DT=y
18+
CONFIG_ARCH_U300=y
19+
CONFIG_PCI_MVEBU=y
20+
CONFIG_PREEMPT=y
21+
CONFIG_AEABI=y
22+
CONFIG_HIGHMEM=y
23+
CONFIG_ZBOOT_ROM_TEXT=0x0
24+
CONFIG_ZBOOT_ROM_BSS=0x0
25+
CONFIG_ARM_APPENDED_DTB=y
26+
CONFIG_ARM_ATAG_DTB_COMPAT=y
27+
CONFIG_CPU_FREQ=y
28+
CONFIG_CPU_FREQ_STAT_DETAILS=y
29+
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
30+
CONFIG_CPU_IDLE=y
31+
CONFIG_ARM_KIRKWOOD_CPUIDLE=y
32+
CONFIG_NET=y
33+
CONFIG_PACKET=y
34+
CONFIG_UNIX=y
35+
CONFIG_INET=y
36+
CONFIG_IP_MULTICAST=y
37+
CONFIG_IP_PNP=y
38+
CONFIG_IP_PNP_DHCP=y
39+
CONFIG_IP_PNP_BOOTP=y
40+
# CONFIG_IPV6 is not set
41+
CONFIG_NET_PKTGEN=m
42+
CONFIG_CFG80211=y
43+
CONFIG_MAC80211=y
44+
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
45+
CONFIG_MTD=y
46+
CONFIG_MTD_CMDLINE_PARTS=y
47+
CONFIG_MTD_BLOCK=y
48+
CONFIG_MTD_CFI=y
49+
CONFIG_MTD_JEDECPROBE=y
50+
CONFIG_MTD_CFI_ADV_OPTIONS=y
51+
CONFIG_MTD_CFI_GEOMETRY=y
52+
# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set
53+
CONFIG_MTD_CFI_INTELEXT=y
54+
CONFIG_MTD_CFI_STAA=y
55+
CONFIG_MTD_PHYSMAP=y
56+
CONFIG_MTD_M25P80=y
57+
CONFIG_MTD_NAND=y
58+
CONFIG_MTD_NAND_ORION=y
59+
CONFIG_BLK_DEV_LOOP=y
60+
CONFIG_EEPROM_AT24=y
61+
# CONFIG_SCSI_PROC_FS is not set
62+
CONFIG_BLK_DEV_SD=y
63+
CONFIG_BLK_DEV_SR=m
64+
CONFIG_CHR_DEV_SG=m
65+
CONFIG_ATA=y
66+
CONFIG_SATA_AHCI=y
67+
CONFIG_SATA_MV=y
68+
CONFIG_NETDEVICES=y
69+
CONFIG_NET_DSA_MV88E6123_61_65=y
70+
CONFIG_MV643XX_ETH=y
71+
CONFIG_R8169=y
72+
CONFIG_MARVELL_PHY=y
73+
CONFIG_LIBERTAS=y
74+
CONFIG_LIBERTAS_SDIO=y
75+
CONFIG_INPUT_EVDEV=y
76+
CONFIG_KEYBOARD_GPIO=y
77+
# CONFIG_INPUT_MOUSE is not set
78+
CONFIG_LEGACY_PTY_COUNT=16
79+
# CONFIG_DEVKMEM is not set
80+
CONFIG_SERIAL_8250=y
81+
CONFIG_SERIAL_8250_CONSOLE=y
82+
CONFIG_SERIAL_8250_RUNTIME_UARTS=2
83+
CONFIG_SERIAL_OF_PLATFORM=y
84+
# CONFIG_HW_RANDOM is not set
85+
CONFIG_I2C=y
86+
# CONFIG_I2C_COMPAT is not set
87+
CONFIG_I2C_CHARDEV=y
88+
CONFIG_I2C_MV64XXX=y
89+
CONFIG_I2C_NOMADIK=y
90+
CONFIG_SPI=y
91+
CONFIG_SPI_ORION=y
92+
CONFIG_GPIO_SYSFS=y
93+
CONFIG_POWER_SUPPLY=y
94+
CONFIG_POWER_RESET=y
95+
CONFIG_POWER_RESET_GPIO=y
96+
CONFIG_POWER_RESET_QNAP=y
97+
CONFIG_SENSORS_ADT7475=y
98+
CONFIG_SENSORS_LM63=y
99+
CONFIG_SENSORS_LM75=y
100+
CONFIG_SENSORS_LM85=y
101+
CONFIG_THERMAL=y
102+
CONFIG_KIRKWOOD_THERMAL=y
103+
CONFIG_WATCHDOG=y
104+
CONFIG_ORION_WATCHDOG=y
105+
CONFIG_FB=y
106+
CONFIG_SOUND=y
107+
CONFIG_SND=y
108+
CONFIG_SND_SOC=y
109+
CONFIG_SND_KIRKWOOD_SOC=y
110+
CONFIG_SND_KIRKWOOD_SOC_T5325=y
111+
# CONFIG_ABX500_CORE is not set
112+
CONFIG_REGULATOR=y
113+
CONFIG_REGULATOR_FIXED_VOLTAGE=y
114+
CONFIG_SOUND=y
115+
CONFIG_SND=y
116+
CONFIG_SND_SOC=y
117+
CONFIG_SND_KIRKWOOD_SOC=y
118+
CONFIG_HID_DRAGONRISE=y
119+
CONFIG_HID_GYRATION=y
120+
CONFIG_HID_TWINHAN=y
121+
CONFIG_HID_NTRIG=y
122+
CONFIG_HID_PANTHERLORD=y
123+
CONFIG_HID_PETALYNX=y
124+
CONFIG_HID_SAMSUNG=y
125+
CONFIG_HID_SONY=y
126+
CONFIG_HID_SUNPLUS=y
127+
CONFIG_HID_GREENASIA=y
128+
CONFIG_HID_SMARTJOYPLUS=y
129+
CONFIG_HID_TOPSEED=y
130+
CONFIG_HID_THRUSTMASTER=y
131+
CONFIG_HID_ZEROPLUS=y
132+
CONFIG_USB=y
133+
CONFIG_USB_XHCI_HCD=y
134+
CONFIG_USB_EHCI_HCD=y
135+
CONFIG_USB_EHCI_ROOT_HUB_TT=y
136+
CONFIG_USB_PRINTER=m
137+
CONFIG_USB_STORAGE=y
138+
CONFIG_USB_STORAGE_DATAFAB=y
139+
CONFIG_USB_STORAGE_FREECOM=y
140+
CONFIG_USB_STORAGE_SDDR09=y
141+
CONFIG_USB_STORAGE_SDDR55=y
142+
CONFIG_USB_STORAGE_JUMPSHOT=y
143+
CONFIG_MMC=y
144+
CONFIG_SDIO_UART=y
145+
CONFIG_MMC_MVSDIO=y
146+
CONFIG_NEW_LEDS=y
147+
CONFIG_LEDS_CLASS=y
148+
CONFIG_LEDS_GPIO=y
149+
CONFIG_LEDS_TRIGGERS=y
150+
CONFIG_LEDS_TRIGGER_TIMER=y
151+
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
152+
CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
153+
CONFIG_RTC_CLASS=y
154+
CONFIG_RTC_DRV_RS5C372=y
155+
CONFIG_RTC_DRV_PCF8563=y
156+
CONFIG_RTC_DRV_S35390A=y
157+
CONFIG_RTC_DRV_MV=y
158+
CONFIG_DMADEVICES=y
159+
CONFIG_MV_XOR=y
160+
CONFIG_STAGING=y
161+
CONFIG_FB_XGI=y
162+
CONFIG_EXT2_FS=y
163+
CONFIG_EXT3_FS=y
164+
# CONFIG_EXT3_FS_XATTR is not set
165+
CONFIG_EXT4_FS=y
166+
CONFIG_ISO9660_FS=m
167+
CONFIG_JOLIET=y
168+
CONFIG_UDF_FS=m
169+
CONFIG_MSDOS_FS=y
170+
CONFIG_VFAT_FS=y
171+
CONFIG_TMPFS=y
172+
CONFIG_JFFS2_FS=y
173+
CONFIG_CRAMFS=y
174+
CONFIG_NFS_FS=y
175+
CONFIG_ROOT_NFS=y
176+
CONFIG_NLS_CODEPAGE_437=y
177+
CONFIG_NLS_CODEPAGE_850=y
178+
CONFIG_NLS_ISO8859_1=y
179+
CONFIG_NLS_ISO8859_2=y
180+
CONFIG_NLS_UTF8=y
181+
CONFIG_DEBUG_INFO=y
182+
CONFIG_DEBUG_FS=y
183+
CONFIG_MAGIC_SYSRQ=y
184+
CONFIG_DEBUG_KERNEL=y
185+
# CONFIG_SCHED_DEBUG is not set
186+
# CONFIG_DEBUG_PREEMPT is not set
187+
# CONFIG_FTRACE is not set
188+
CONFIG_DEBUG_USER=y
189+
CONFIG_CRYPTO_CBC=m
190+
CONFIG_CRYPTO_PCBC=m
191+
# CONFIG_CRYPTO_ANSI_CPRNG is not set
192+
CONFIG_CRYPTO_DEV_MV_CESA=y
193+
CONFIG_CRC_CCITT=y
194+
CONFIG_LIBCRC32C=y
Lines changed: 181 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,181 @@
1+
CONFIG_SYSVIPC=y
2+
CONFIG_NO_HZ=y
3+
CONFIG_HIGH_RES_TIMERS=y
4+
CONFIG_LOG_BUF_SHIFT=19
5+
CONFIG_PROFILING=y
6+
CONFIG_OPROFILE=y
7+
CONFIG_KPROBES=y
8+
CONFIG_MODULES=y
9+
CONFIG_MODULE_UNLOAD=y
10+
# CONFIG_BLK_DEV_BSG is not set
11+
# CONFIG_ARCH_MULTI_V7 is not set
12+
CONFIG_ARCH_MVEBU=y
13+
CONFIG_MACH_KIRKWOOD=y
14+
CONFIG_MACH_T5325=y
15+
# CONFIG_CPU_FEROCEON_OLD_ID is not set
16+
CONFIG_PCI_MVEBU=y
17+
CONFIG_PREEMPT=y
18+
CONFIG_AEABI=y
19+
CONFIG_HIGHMEM=y
20+
CONFIG_ZBOOT_ROM_TEXT=0x0
21+
CONFIG_ZBOOT_ROM_BSS=0x0
22+
CONFIG_CPU_FREQ=y
23+
CONFIG_CPU_FREQ_STAT_DETAILS=y
24+
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
25+
CONFIG_CPU_IDLE=y
26+
CONFIG_NET=y
27+
CONFIG_PACKET=y
28+
CONFIG_UNIX=y
29+
CONFIG_INET=y
30+
CONFIG_IP_MULTICAST=y
31+
CONFIG_IP_PNP=y
32+
CONFIG_IP_PNP_DHCP=y
33+
CONFIG_IP_PNP_BOOTP=y
34+
# CONFIG_IPV6 is not set
35+
CONFIG_NET_PKTGEN=m
36+
CONFIG_CFG80211=y
37+
CONFIG_MAC80211=y
38+
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
39+
CONFIG_MTD=y
40+
CONFIG_MTD_CMDLINE_PARTS=y
41+
CONFIG_MTD_BLOCK=y
42+
CONFIG_MTD_CFI=y
43+
CONFIG_MTD_JEDECPROBE=y
44+
CONFIG_MTD_CFI_ADV_OPTIONS=y
45+
CONFIG_MTD_CFI_GEOMETRY=y
46+
# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set
47+
CONFIG_MTD_CFI_INTELEXT=y
48+
CONFIG_MTD_CFI_STAA=y
49+
CONFIG_MTD_PHYSMAP=y
50+
CONFIG_MTD_M25P80=y
51+
CONFIG_MTD_NAND=y
52+
CONFIG_MTD_NAND_ORION=y
53+
CONFIG_BLK_DEV_LOOP=y
54+
CONFIG_EEPROM_AT24=y
55+
# CONFIG_SCSI_PROC_FS is not set
56+
CONFIG_BLK_DEV_SD=y
57+
CONFIG_BLK_DEV_SR=m
58+
CONFIG_CHR_DEV_SG=m
59+
CONFIG_ATA=y
60+
CONFIG_SATA_AHCI=y
61+
CONFIG_SATA_MV=y
62+
CONFIG_NETDEVICES=y
63+
CONFIG_NET_DSA_MV88E6123_61_65=y
64+
CONFIG_MV643XX_ETH=y
65+
CONFIG_R8169=y
66+
CONFIG_MARVELL_PHY=y
67+
CONFIG_LIBERTAS=y
68+
CONFIG_LIBERTAS_SDIO=y
69+
CONFIG_INPUT_EVDEV=y
70+
CONFIG_KEYBOARD_GPIO=y
71+
# CONFIG_INPUT_MOUSE is not set
72+
CONFIG_LEGACY_PTY_COUNT=16
73+
# CONFIG_DEVKMEM is not set
74+
CONFIG_SERIAL_8250=y
75+
CONFIG_SERIAL_8250_CONSOLE=y
76+
CONFIG_SERIAL_8250_RUNTIME_UARTS=2
77+
CONFIG_SERIAL_OF_PLATFORM=y
78+
# CONFIG_HW_RANDOM is not set
79+
CONFIG_I2C=y
80+
# CONFIG_I2C_COMPAT is not set
81+
CONFIG_I2C_CHARDEV=y
82+
CONFIG_I2C_MV64XXX=y
83+
CONFIG_SPI=y
84+
CONFIG_SPI_ORION=y
85+
CONFIG_GPIO_SYSFS=y
86+
CONFIG_POWER_SUPPLY=y
87+
CONFIG_POWER_RESET=y
88+
CONFIG_POWER_RESET_GPIO=y
89+
CONFIG_POWER_RESET_QNAP=y
90+
CONFIG_SENSORS_ADT7475=y
91+
CONFIG_SENSORS_LM63=y
92+
CONFIG_SENSORS_LM75=y
93+
CONFIG_SENSORS_LM85=y
94+
CONFIG_THERMAL=y
95+
CONFIG_WATCHDOG=y
96+
CONFIG_ORION_WATCHDOG=y
97+
CONFIG_FB=y
98+
CONFIG_SOUND=y
99+
CONFIG_SND=y
100+
CONFIG_SND_SOC=y
101+
CONFIG_SND_KIRKWOOD_SOC=y
102+
CONFIG_SND_KIRKWOOD_SOC_T5325=y
103+
CONFIG_REGULATOR=y
104+
CONFIG_REGULATOR_FIXED_VOLTAGE=y
105+
CONFIG_HID_DRAGONRISE=y
106+
CONFIG_HID_GYRATION=y
107+
CONFIG_HID_TWINHAN=y
108+
CONFIG_HID_NTRIG=y
109+
CONFIG_HID_PANTHERLORD=y
110+
CONFIG_HID_PETALYNX=y
111+
CONFIG_HID_SAMSUNG=y
112+
CONFIG_HID_SONY=y
113+
CONFIG_HID_SUNPLUS=y
114+
CONFIG_HID_GREENASIA=y
115+
CONFIG_HID_SMARTJOYPLUS=y
116+
CONFIG_HID_TOPSEED=y
117+
CONFIG_HID_THRUSTMASTER=y
118+
CONFIG_HID_ZEROPLUS=y
119+
CONFIG_USB=y
120+
CONFIG_USB_XHCI_HCD=y
121+
CONFIG_USB_EHCI_HCD=y
122+
CONFIG_USB_EHCI_ROOT_HUB_TT=y
123+
CONFIG_USB_PRINTER=m
124+
CONFIG_USB_STORAGE=y
125+
CONFIG_USB_STORAGE_DATAFAB=y
126+
CONFIG_USB_STORAGE_FREECOM=y
127+
CONFIG_USB_STORAGE_SDDR09=y
128+
CONFIG_USB_STORAGE_SDDR55=y
129+
CONFIG_USB_STORAGE_JUMPSHOT=y
130+
CONFIG_MMC=y
131+
CONFIG_SDIO_UART=y
132+
CONFIG_MMC_MVSDIO=y
133+
CONFIG_NEW_LEDS=y
134+
CONFIG_LEDS_CLASS=y
135+
CONFIG_LEDS_GPIO=y
136+
CONFIG_LEDS_TRIGGERS=y
137+
CONFIG_LEDS_TRIGGER_TIMER=y
138+
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
139+
CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
140+
CONFIG_RTC_CLASS=y
141+
CONFIG_RTC_DRV_RS5C372=y
142+
CONFIG_RTC_DRV_PCF8563=y
143+
CONFIG_RTC_DRV_S35390A=y
144+
CONFIG_RTC_DRV_MV=y
145+
CONFIG_DMADEVICES=y
146+
CONFIG_MV_XOR=y
147+
CONFIG_STAGING=y
148+
CONFIG_FB_XGI=y
149+
CONFIG_EXT2_FS=y
150+
CONFIG_EXT3_FS=y
151+
# CONFIG_EXT3_FS_XATTR is not set
152+
CONFIG_EXT4_FS=y
153+
CONFIG_ISO9660_FS=m
154+
CONFIG_JOLIET=y
155+
CONFIG_UDF_FS=m
156+
CONFIG_MSDOS_FS=y
157+
CONFIG_VFAT_FS=y
158+
CONFIG_TMPFS=y
159+
CONFIG_JFFS2_FS=y
160+
CONFIG_CRAMFS=y
161+
CONFIG_NFS_FS=y
162+
CONFIG_ROOT_NFS=y
163+
CONFIG_NLS_CODEPAGE_437=y
164+
CONFIG_NLS_CODEPAGE_850=y
165+
CONFIG_NLS_ISO8859_1=y
166+
CONFIG_NLS_ISO8859_2=y
167+
CONFIG_NLS_UTF8=y
168+
CONFIG_DEBUG_INFO=y
169+
CONFIG_DEBUG_FS=y
170+
CONFIG_MAGIC_SYSRQ=y
171+
CONFIG_DEBUG_KERNEL=y
172+
# CONFIG_SCHED_DEBUG is not set
173+
# CONFIG_DEBUG_PREEMPT is not set
174+
# CONFIG_FTRACE is not set
175+
CONFIG_DEBUG_USER=y
176+
CONFIG_CRYPTO_CBC=m
177+
CONFIG_CRYPTO_PCBC=m
178+
# CONFIG_CRYPTO_ANSI_CPRNG is not set
179+
CONFIG_CRYPTO_DEV_MV_CESA=y
180+
CONFIG_CRC_CCITT=y
181+
CONFIG_LIBCRC32C=y

0 commit comments

Comments
 (0)