diff --git a/Makefile.config b/Makefile.config index 331aa46b9..97e4704a3 100644 --- a/Makefile.config +++ b/Makefile.config @@ -9,7 +9,7 @@ CONFIGFILES = \ $(CFG)-i686-PAE.config $(CFG)-i686-PAEdebug.config \ $(CFG)-x86_64.config $(CFG)-x86_64-debug.config \ $(CFG)-s390x.config \ - $(CFG)-arm.config $(CFG)-armv5tel.config \ + $(CFG)-arm.config $(CFG)-armv5tel.config $(CFG)-armv7hl.config \ $(CFG)-armv5tel-kirkwood.config $(CFG)-armv7l-imx.config \ $(CFG)-armv7l-omap.config $(CFG)-armv7l-tegra.config \ $(CFG)-armv7hl-imx.config $(CFG)-armv7hl-highbank.config \ @@ -123,6 +123,9 @@ kernel-$(VERSION)-arm.config: /dev/null temp-arm-generic kernel-$(VERSION)-armv5tel.config: /dev/null temp-arm-generic perl merge.pl $^ arm > $@ +kernel-$(VERSION)-armv7hl.config: /dev/null temp-arm-generic + perl merge.pl $^ arm > $@ + kernel-$(VERSION)-armv5tel-kirkwood.config: /dev/null temp-armv5tel-kirkwood perl merge.pl $^ arm > $@ diff --git a/kernel.spec b/kernel.spec index 6dd289c40..50a1a266c 100644 --- a/kernel.spec +++ b/kernel.spec @@ -422,8 +422,8 @@ Summary: The Linux kernel %define make_target bzImage %define kernel_image arch/arm/boot/zImage %define with_backports 0 -# we build a up kernel on armv5tel. its used for qemu. -%ifnarch armv5tel +# we build a up kernel on base softfp/hardfp platforms. its used for qemu. +%ifnarch armv5tel armv7hl %define with_up 0 %endif # we only build headers/perf/tools on the base arm arches @@ -2299,6 +2299,9 @@ fi # ||----w | # || || %changelog +* Mon Feb 6 2012 Peter Robinson +- Build an ARM hardfp base versatile/qemu kernel + * Mon Feb 06 2012 Josh Boyer - 3.3.0-0.rc2.git4.1 - Linux 3.3-rc2-git4 (upstream 23783f817bceedd6d4e549385e3f400ea64059e5) - Build and ship turbostat and x86_energy_perf_policy in kernel-tools