diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2013-08-16 16:13:34 +0100 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2013-08-19 09:37:57 -0400 |
| commit | 09ffc5546cb375d5ea3623ce29d937031fd322d0 (patch) | |
| tree | 30f7d5f5849ca2b7fdd2b7e37f17f2a814e869ce /config-arm-generic | |
| parent | cb5174043f2b39590be63b76c530a15a7c9e1fa0 (diff) | |
| download | kernel-09ffc5546cb375d5ea3623ce29d937031fd322d0.tar.gz kernel-09ffc5546cb375d5ea3623ce29d937031fd322d0.tar.xz kernel-09ffc5546cb375d5ea3623ce29d937031fd322d0.zip | |
Minor kernel configs cleanup merging duplicated config opts into generic
Merge config changes from the various arch configs into generic-config where there's overlapping identical configs across all architectures. If there's a single arch that is difference to the rest of the architectures that option remains in the arch specific config as it takes precedence over the generic config.
Diffstat (limited to 'config-arm-generic')
| -rw-r--r-- | config-arm-generic | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/config-arm-generic b/config-arm-generic index 3bda9fb5c..ba22d23bc 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -1,17 +1,12 @@ CONFIG_KUSER_HELPERS=y # CONFIG_ASYMMETRIC_KEY_TYPE is not set -# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set # CONFIG_COMMON_CLK_DEBUG is not set CONFIG_COMMON_CLK=y CONFIG_EARLY_PRINTK=y -CONFIG_ETHERNET=y CONFIG_FB_SSD1307=m -CONFIG_HIGH_RES_TIMERS=y CONFIG_HW_PERF_EVENTS=y CONFIG_MMC=y CONFIG_NFS_FS=y -CONFIG_NO_HZ=y -CONFIG_PERF_EVENTS=y # CONFIG_PID_IN_CONTEXTIDR is not set CONFIG_PWM=y CONFIG_RCU_FANOUT_LEAF=16 @@ -23,13 +18,14 @@ CONFIG_ARM_ARCH_TIMER=y # CONFIG_ARM_DT_BL_CPUFREQ is not set CONFIG_NR_CPUS=8 -# ARM generic HW +# ARM AMBA generic HW CONFIG_ARM_AMBA=y CONFIG_ARM_GIC=y CONFIG_MMC_ARMMMCI=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIO_AMBAKMI=y +CONFIG_OC_ETM=y # ARM VExpress CONFIG_ARCH_VEXPRESS=y |