- Have kernel provide kernel-highbank for upgrade to unified
- Update mvebu configs - Drop unused ARM patches
This commit is contained in:
parent
45e320120e
commit
a614d46fe4
|
@ -1,10 +0,0 @@
|
|||
--- linux-3.6.0-0.rc3.git2.1.fc18.x86_64/drivers/staging/omapdrm/omap_drv.c.orig 2012-08-28 22:52:35.950826671 +0100
|
||||
+++ linux-3.6.0-0.rc3.git2.1.fc18.x86_64/drivers/staging/omapdrm/omap_drv.c 2012-08-28 22:52:49.393910353 +0100
|
||||
@@ -761,7 +761,6 @@
|
||||
.irq_postinstall = dev_irq_postinstall,
|
||||
.irq_uninstall = dev_irq_uninstall,
|
||||
.irq_handler = dev_irq_handler,
|
||||
- .reclaim_buffers = drm_core_reclaim_buffers,
|
||||
#ifdef CONFIG_DEBUG_FS
|
||||
.debugfs_init = omap_debugfs_init,
|
||||
.debugfs_cleanup = omap_debugfs_cleanup,
|
|
@ -1,39 +0,0 @@
|
|||
read_current_timer is used in the get_cycles() function when
|
||||
ARM_ARCH_TIMER is set, and that function can be inlined into
|
||||
driver modules, so we should export the function to avoid
|
||||
errors like
|
||||
|
||||
ERROR: "read_current_timer" [drivers/video/udlfb.ko] undefined!
|
||||
ERROR: "read_current_timer" [crypto/tcrypt.ko] undefined!
|
||||
|
||||
Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
|
||||
Cc: Shinya Kuribayashi <shinya.kuribayashi.px@xxxxxxxxxxx>
|
||||
Cc: Stephen Boyd <sboyd@xxxxxxxxxxxxxx>
|
||||
Cc: Will Deacon <will.deacon@xxxxxxx>
|
||||
Cc: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
|
||||
---
|
||||
arch/arm/kernel/arch_timer.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/arch/arm/kernel/arch_timer.c b/arch/arm/kernel/arch_timer.c
|
||||
index cf25880..6327d1f 100644
|
||||
--- a/arch/arm/kernel/arch_timer.c
|
||||
+++ b/arch/arm/kernel/arch_timer.c
|
||||
@@ -14,6 +14,7 @@
|
||||
#include <linux/device.h>
|
||||
#include <linux/smp.h>
|
||||
#include <linux/cpu.h>
|
||||
+#include <linux/export.h>
|
||||
#include <linux/jiffies.h>
|
||||
#include <linux/clockchips.h>
|
||||
#include <linux/interrupt.h>
|
||||
@@ -232,6 +233,7 @@ int read_current_timer(unsigned long *timer_val)
|
||||
*timer_val = arch_counter_get_cntpct();
|
||||
return 0;
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(read_current_timer);
|
||||
|
||||
static struct clocksource clocksource_counter = {
|
||||
.name = "arch_sys_counter",
|
||||
--
|
||||
1.7.10
|
|
@ -186,7 +186,6 @@ CONFIG_ARM_AMBA=y
|
|||
|
||||
# mvebu
|
||||
CONFIG_MV_XOR=y
|
||||
CONFIG_RTC_DRV_88PM80X=m
|
||||
CONFIG_CRYPTO_DEV_MV_CESA=m
|
||||
CONFIG_MV643XX_ETH=m
|
||||
CONFIG_I2C_MV64XXX=m
|
||||
|
@ -195,10 +194,16 @@ CONFIG_PINCTRL_ARMADA_370=y
|
|||
CONFIG_PINCTRL_ARMADA_XP=y
|
||||
CONFIG_PINCTRL_DOVE=y
|
||||
CONFIG_EDAC_MV64X60=m
|
||||
CONFIG_MVNETA=m
|
||||
CONFIG_SATA_MV=m
|
||||
CONFIG_MARVELL_PHY=m
|
||||
CONFIG_RTC_DRV_S35390A=y
|
||||
CONFIG_RTC_DRV_88PM80X=m
|
||||
CONFIG_RTC_DRV_MV=m
|
||||
CONFIG_MVMDIO=m
|
||||
CONFIG_MVNETA=m
|
||||
CONFIG_GPIO_MVEBU=y
|
||||
CONFIG_MVEBU_CLK_CORE=y
|
||||
CONFIG_MVEBU_CLK_GATING=y
|
||||
|
||||
# Allwinner a1x
|
||||
# CONFIG_SUNXI_RFKILL=y
|
||||
|
|
15
kernel.spec
15
kernel.spec
|
@ -256,9 +256,9 @@ Summary: The Linux kernel
|
|||
|
||||
# kernel up (versatile express), tegra and omap are only built on armv7 hfp/sfp
|
||||
%ifnarch armv7hl armv7l
|
||||
%endif
|
||||
%define with_omap 0
|
||||
%define with_tegra 0
|
||||
%endif
|
||||
|
||||
# kernel-kirkwood is only built for armv5
|
||||
%ifnarch armv5tel
|
||||
|
@ -485,6 +485,8 @@ Provides: kernel-drm = 4.3.0\
|
|||
Provides: kernel-drm-nouveau = 16\
|
||||
Provides: kernel-modeset = 1\
|
||||
Provides: kernel-uname-r = %{KVERREL}%{?1:.%{1}}\
|
||||
Provides: kernel-highbank\
|
||||
Provides: kernel-highbank-uname-r = %{KVERREL}%{?1:.%{1}}\
|
||||
Requires(pre): %{kernel_prereq}\
|
||||
Requires(pre): %{initrd_prereq}\
|
||||
Requires(pre): linux-firmware >= 20120206-0.1.git06c8f81\
|
||||
|
@ -714,13 +716,9 @@ Patch20000: 0001-efifb-Skip-DMI-checks-if-the-bootloader-knows-what-i.patch
|
|||
Patch20001: 0002-x86-EFI-Calculate-the-EFI-framebuffer-size-instead-o.patch
|
||||
|
||||
# ARM
|
||||
Patch21000: arm-read_current_timer.patch
|
||||
# http://lists.infradead.org/pipermail/linux-arm-kernel/2012-December/137164.html
|
||||
Patch21002: arm-alignment-faults.patch
|
||||
|
||||
# OMAP
|
||||
Patch21003: arm-fix-omapdrm.patch
|
||||
|
||||
# ARM tegra
|
||||
Patch21004: arm-tegra-nvec-kconfig.patch
|
||||
Patch21005: arm-tegra-usb-no-reset-linux33.patch
|
||||
|
@ -1336,8 +1334,6 @@ ApplyPatch vmbugon-warnon.patch
|
|||
#
|
||||
# ARM
|
||||
#
|
||||
#ApplyPatch arm-read_current_timer.patch
|
||||
#ApplyPatch arm-fix-omapdrm.patch
|
||||
|
||||
#ApplyPatch arm-tegra-nvec-kconfig.patch
|
||||
ApplyPatch arm-tegra-usb-no-reset-linux33.patch
|
||||
|
@ -2358,6 +2354,11 @@ fi
|
|||
# ||----w |
|
||||
# || ||
|
||||
%changelog
|
||||
* Fri Mar 8 2013 Peter Robinson <pbrobinson@fedoraproject.org>
|
||||
- Have kernel provide kernel-highbank for upgrade to unified
|
||||
- Update mvebu configs
|
||||
- Drop unused ARM patches
|
||||
|
||||
* Thu Mar 07 2013 Josh Boyer <jwboyer@redhat.com>
|
||||
- Fix DMI regression (rhbz 916444)
|
||||
- Fix logitech-dj HID bug from Benjamin Tissoires (rhbz 840391)
|
||||
|
|
Loading…
Reference in New Issue