diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2012-05-09 14:19:03 +0100 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2012-05-09 14:19:03 +0100 |
| commit | a4e130d5dfff29a261c5ca29bc510873b09baefc (patch) | |
| tree | 348645eb353616104fceb0c6a06e19aa310f44bc | |
| parent | d07b00d49d07ab014e3f0f3345194891c4da9607 (diff) | |
| download | kernel-a4e130d5dfff29a261c5ca29bc510873b09baefc.tar.gz kernel-a4e130d5dfff29a261c5ca29bc510873b09baefc.tar.xz kernel-a4e130d5dfff29a261c5ca29bc510873b09baefc.zip | |
ARM: a few more minor config cleanups
| -rw-r--r-- | config-arm-versatile | 4 | ||||
| -rw-r--r-- | kernel.spec | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/config-arm-versatile b/config-arm-versatile index e82269ae9..58dc65c93 100644 --- a/config-arm-versatile +++ b/config-arm-versatile @@ -30,8 +30,8 @@ CONFIG_CPU_RMAP=y CONFIG_CPU_TLB_V7=y CONFIG_CPU_V7=y -CONFIG_THUMB2_AVOID_R_ARM_THM_JUMP11=y -CONFIG_THUMB2_KERNEL=y +# CONFIG_THUMB2_AVOID_R_ARM_THM_JUMP11 is not set +# CONFIG_THUMB2_KERNEL is not set CONFIG_TICK_ONESHOT=y CONFIG_ARM_ASM_UNIFIED=y diff --git a/kernel.spec b/kernel.spec index 0e24803b9..51089d6bd 100644 --- a/kernel.spec +++ b/kernel.spec @@ -255,19 +255,19 @@ Summary: The Linux kernel %define with_pae 0 %endif -# kernel up (versatile express), tegra, omap, imx and highbank are only built on armv7 hard and softfp +# kernel up (versatile express), tegra, omap, imx and highbank are only built on armv7 hfp/sfp %ifnarch armv7hl armv7l %define with_up 0 -%define with_omap 0 -%endif -%define with_tegra 0 %define with_imx 0 %define with_highbank 0 +%define with_omap 0 +%define with_tegra 0 +%endif # kernel-kirkwood is only built for armv5 %ifnarch armv5tel -%endif %define with_kirkwood 0 +%endif # if requested, only build base kernel %if %{with_baseonly} @@ -2329,6 +2329,7 @@ fi %changelog * Tue May 8 2012 Peter Robinson <pbrobinson@fedoraproject.org> - Restructure ARM configs to minimise duplication and pull all generic options +- Spilt Versatile config and use Express chip into dedicated config for qemu * Tue May 08 2012 Josh Boyer <jwboyer@redhat.com> - 3.4.0-0.rc6.git1.1 - Linux v3.4-rc6-20-g789505b |