aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2016-02-24 15:17:50 -0500
committerOlof Johansson <olof@lixom.net>2016-02-24 15:17:50 -0500
commite631847a9be381f2a5c983bdc0660de81f914f8d (patch)
treee87527cf9aeba040886d69aa7a4ff5d72f43b4c0
parent5eb38462589d822adcc297d0599d179f49ca0fe2 (diff)
parent52abf1eff88d291c5ba092dc93fc8065efd94236 (diff)
Merge tag 'realview-defconfig-redux' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/defconfig
This makes the RealView defconfig select SMP on UP so we only need one defconfig for RealView, then adds USB mass storage configuration. * tag 'realview-defconfig-redux' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator: ARM: realview: enable USB storage in the defconfig ARM: realview: delete realview-smp_defconfig ARM: realview: activate SMP on the default defconfig Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat
-rw-r--r--arch/arm/configs/realview-smp_defconfig105
-rw-r--r--arch/arm/configs/realview_defconfig5
2 files changed, 5 insertions, 105 deletions
diff --git a/arch/arm/configs/realview-smp_defconfig b/arch/arm/configs/realview-smp_defconfig
deleted file mode 100644
index 93efdcfcf98f..000000000000
--- a/arch/arm/configs/realview-smp_defconfig
+++ /dev/null
@@ -1,105 +0,0 @@
1# CONFIG_SWAP is not set
2CONFIG_SYSVIPC=y
3CONFIG_NO_HZ_FULL=y
4CONFIG_NO_HZ=y
5CONFIG_HIGH_RES_TIMERS=y
6CONFIG_LOG_BUF_SHIFT=14
7CONFIG_PERF_EVENTS=y
8CONFIG_SLAB=y
9CONFIG_MODULES=y
10CONFIG_MODULE_UNLOAD=y
11# CONFIG_BLK_DEV_BSG is not set
12# CONFIG_IOSCHED_CFQ is not set
13CONFIG_ARCH_MULTI_V6=y
14CONFIG_ARCH_REALVIEW=y
15CONFIG_REALVIEW_DT=y
16CONFIG_MACH_REALVIEW_EB=y
17CONFIG_REALVIEW_EB_ARM1136=y
18CONFIG_REALVIEW_EB_ARM1176=y
19CONFIG_REALVIEW_EB_A9MP=y
20CONFIG_REALVIEW_EB_ARM11MP=y
21CONFIG_REALVIEW_EB_ARM11MP_REVB=y
22CONFIG_MACH_REALVIEW_PB11MP=y
23CONFIG_MACH_REALVIEW_PB1176=y
24CONFIG_MACH_REALVIEW_PBA8=y
25CONFIG_MACH_REALVIEW_PBX=y
26CONFIG_SMP=y
27CONFIG_AEABI=y
28CONFIG_ZBOOT_ROM_TEXT=0x0
29CONFIG_ZBOOT_ROM_BSS=0x0
30CONFIG_CMDLINE="root=/dev/nfs nfsroot=10.1.69.3:/work/nfsroot ip=dhcp console=ttyAMA0 mem=128M"
31CONFIG_VFP=y
32CONFIG_NET=y
33CONFIG_PACKET=y
34CONFIG_UNIX=y
35CONFIG_INET=y
36CONFIG_IP_PNP=y
37CONFIG_IP_PNP_DHCP=y
38CONFIG_IP_PNP_BOOTP=y
39# CONFIG_INET_LRO is not set
40# CONFIG_IPV6 is not set
41CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
42CONFIG_MTD=y
43CONFIG_MTD_CMDLINE_PARTS=y
44CONFIG_MTD_AFS_PARTS=y
45CONFIG_MTD_BLOCK=y
46CONFIG_MTD_CFI=y
47CONFIG_MTD_CFI_INTELEXT=y
48CONFIG_MTD_CFI_AMDSTD=y
49CONFIG_MTD_ROM=y
50CONFIG_MTD_PHYSMAP=y
51CONFIG_ARM_CHARLCD=y
52CONFIG_NETDEVICES=y
53CONFIG_SMC91X=y
54CONFIG_SMSC911X=y
55CONFIG_SMSC_PHY=y
56# CONFIG_SERIO_SERPORT is not set
57CONFIG_SERIO_AMBAKMI=y
58CONFIG_LEGACY_PTY_COUNT=16
59CONFIG_SERIAL_AMBA_PL011=y
60CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
61# CONFIG_HW_RANDOM is not set
62CONFIG_I2C=y
63CONFIG_I2C_VERSATILE=y
64CONFIG_SPI=y
65CONFIG_GPIOLIB=y
66# CONFIG_HWMON is not set
67CONFIG_FB=y
68CONFIG_FB_ARMCLCD=y
69CONFIG_FRAMEBUFFER_CONSOLE=y
70CONFIG_LOGO=y
71# CONFIG_LOGO_LINUX_MONO is not set
72# CONFIG_LOGO_LINUX_VGA16 is not set
73CONFIG_SOUND=y
74CONFIG_SND=y
75CONFIG_SND_MIXER_OSS=y
76CONFIG_SND_PCM_OSS=y
77# CONFIG_SND_DRIVERS is not set
78CONFIG_SND_ARMAACI=y
79CONFIG_USB=y
80CONFIG_USB_ISP1760=y
81CONFIG_MMC=y
82CONFIG_MMC_ARMMMCI=y
83CONFIG_NEW_LEDS=y
84CONFIG_LEDS_CLASS=y
85CONFIG_LEDS_VERSATILE=y
86CONFIG_LEDS_TRIGGERS=y
87CONFIG_LEDS_TRIGGER_HEARTBEAT=y
88CONFIG_LEDS_TRIGGER_CPU=y
89CONFIG_RTC_CLASS=y
90CONFIG_RTC_DRV_DS1307=y
91CONFIG_RTC_DRV_PL031=y
92CONFIG_VFAT_FS=y
93CONFIG_TMPFS=y
94CONFIG_CRAMFS=y
95CONFIG_NFS_FS=y
96CONFIG_ROOT_NFS=y
97CONFIG_NLS_CODEPAGE_437=y
98CONFIG_NLS_ISO8859_1=y
99CONFIG_DEBUG_FS=y
100CONFIG_MAGIC_SYSRQ=y
101CONFIG_DEBUG_KERNEL=y
102# CONFIG_SCHED_DEBUG is not set
103# CONFIG_FTRACE is not set
104CONFIG_DEBUG_USER=y
105# CONFIG_CRYPTO_HW is not set
diff --git a/arch/arm/configs/realview_defconfig b/arch/arm/configs/realview_defconfig
index 8f56fb3ff51d..9e77dc7b828f 100644
--- a/arch/arm/configs/realview_defconfig
+++ b/arch/arm/configs/realview_defconfig
@@ -1,5 +1,6 @@
1# CONFIG_SWAP is not set 1# CONFIG_SWAP is not set
2CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
3CONFIG_NO_HZ_FULL=y
3CONFIG_HIGH_RES_TIMERS=y 4CONFIG_HIGH_RES_TIMERS=y
4CONFIG_LOG_BUF_SHIFT=14 5CONFIG_LOG_BUF_SHIFT=14
5CONFIG_PERF_EVENTS=y 6CONFIG_PERF_EVENTS=y
@@ -21,6 +22,7 @@ CONFIG_MACH_REALVIEW_PB11MP=y
21CONFIG_MACH_REALVIEW_PB1176=y 22CONFIG_MACH_REALVIEW_PB1176=y
22CONFIG_MACH_REALVIEW_PBA8=y 23CONFIG_MACH_REALVIEW_PBA8=y
23CONFIG_MACH_REALVIEW_PBX=y 24CONFIG_MACH_REALVIEW_PBX=y
25CONFIG_SMP=y
24CONFIG_AEABI=y 26CONFIG_AEABI=y
25CONFIG_ZBOOT_ROM_TEXT=0x0 27CONFIG_ZBOOT_ROM_TEXT=0x0
26CONFIG_ZBOOT_ROM_BSS=0x0 28CONFIG_ZBOOT_ROM_BSS=0x0
@@ -46,6 +48,8 @@ CONFIG_MTD_CFI_AMDSTD=y
46CONFIG_MTD_ROM=y 48CONFIG_MTD_ROM=y
47CONFIG_MTD_PHYSMAP=y 49CONFIG_MTD_PHYSMAP=y
48CONFIG_ARM_CHARLCD=y 50CONFIG_ARM_CHARLCD=y
51CONFIG_SCSI=y
52CONFIG_BLK_DEV_SD=y
49CONFIG_NETDEVICES=y 53CONFIG_NETDEVICES=y
50CONFIG_SMC91X=y 54CONFIG_SMC91X=y
51CONFIG_SMSC911X=y 55CONFIG_SMSC911X=y
@@ -74,6 +78,7 @@ CONFIG_SND_PCM_OSS=y
74# CONFIG_SND_DRIVERS is not set 78# CONFIG_SND_DRIVERS is not set
75CONFIG_SND_ARMAACI=y 79CONFIG_SND_ARMAACI=y
76CONFIG_USB=y 80CONFIG_USB=y
81CONFIG_USB_STORAGE=y
77CONFIG_USB_ISP1760=y 82CONFIG_USB_ISP1760=y
78CONFIG_MMC=y 83CONFIG_MMC=y
79CONFIG_MMC_ARMMMCI=y 84CONFIG_MMC_ARMMMCI=y
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-15 02:06:35 -0400