diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2012-02-21 23:05:36 +0000 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2012-02-21 23:05:36 +0000 |
| commit | 201cb5c64474ba2cce86faa327439b705ef425b0 (patch) | |
| tree | d13db5cf6f3e5005baf78e63c01208bc5bc7d657 | |
| parent | 598ed8b2a0012e687d94d80a04d7e47cd1aad045 (diff) | |
| download | kernel-201cb5c64474ba2cce86faa327439b705ef425b0.tar.gz kernel-201cb5c64474ba2cce86faa327439b705ef425b0.tar.xz kernel-201cb5c64474ba2cce86faa327439b705ef425b0.zip | |
update ARM configs to F-17 branch
| -rw-r--r-- | config-arm-generic | 13 | ||||
| -rw-r--r-- | config-arm-omap-generic | 3 | ||||
| -rw-r--r-- | config-arm-tegra | 1 | ||||
| -rw-r--r-- | kernel.spec | 7 |
4 files changed, 14 insertions, 10 deletions
diff --git a/config-arm-generic b/config-arm-generic index ea1390690..18e5e9f1e 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -26,6 +26,13 @@ CONFIG_ZBOOT_ROM_BSS=0 CONFIG_ATAGS_PROC=y +CONFIG_CPU_IDLE=y +# CONFIG_CPU_IDLE_GOV_LADDER is not set +ONFIG_CPU_IDLE_GOV_MENU=y + +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y + # CONFIG_FPE_NWFPE is not set CONFIG_FPE_FASTFPE=y CONFIG_VFP=y @@ -48,11 +55,6 @@ CONFIG_HW_PERF_EVENTS=y CONFIG_CMDLINE="console=ttyAM0,115200 root=/dev/sda1 rootdelay=20" -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y - -# CONFIG_CPU_IDLE is not set - CONFIG_LEDS=y CONFIG_LEDS_CPU=y @@ -181,6 +183,7 @@ CONFIG_LSM_MMAP_MIN_ADDR=32768 # CONFIG_DRM_RADEON is not set # CONFIG_ATM_HE is not set # CONFIG_SCSI_ACARD is not set +# CONFIG_SFC is not set # these all currently fail due to missing symbols __bad_udelay or # error: implicit declaration of function ‘iowrite32be’ diff --git a/config-arm-omap-generic b/config-arm-omap-generic index 473ae7a87..772121b45 100644 --- a/config-arm-omap-generic +++ b/config-arm-omap-generic @@ -150,9 +150,6 @@ CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE="" # CONFIG_AUTO_ZRELADDR is not set -CONFIG_CPU_IDLE=y -# CONFIG_CPU_IDLE_GOV_LADDER is not set -CONFIG_CPU_IDLE_GOV_MENU=y CONFIG_VFPv3=y CONFIG_NEON=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set diff --git a/config-arm-tegra b/config-arm-tegra index c024c2333..9037d4b26 100644 --- a/config-arm-tegra +++ b/config-arm-tegra @@ -20,7 +20,6 @@ CONFIG_MACH_VENTANA=y CONFIG_TEGRA_DEBUG_UARTD=y CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y CONFIG_SMP=y CONFIG_NR_CPUS=4 CONFIG_ARM_CPU_TOPOLOGY=y diff --git a/kernel.spec b/kernel.spec index 4f71ed6b2..571c434c1 100644 --- a/kernel.spec +++ b/kernel.spec @@ -269,9 +269,11 @@ Summary: The Linux kernel %define with_tegra 0 %define with_omap 0 %define with_imx 0 -%define with_highbank 0 %endif +# disable highbank ARM kernels for the time being +%define with_highbank 0 + # kernel-kirkwood is only built for armv5 %ifnarch armv5tel %define with_kirkwood 0 @@ -2369,6 +2371,9 @@ fi # ||----w | # || || %changelog +* Tue Feb 21 2012 Peter Robinson <pbrobinson@fedoraproject.org> +- update ARM configs to F-17 branch + * Tue Feb 21 2012 Josh Boyer <jwboyer@redhat.com> - ext4: fix resize when resizing within single group (rhbz 786454) - imon: don't wedge hardware after early callbacks (rhbz 781832) |