[kernel/f18] - Have kernel provide kernel-highbank for upgrade to unified - Update mvebu configs - Drop unused AR

[Peter Robinson]

commit a614d46fe4463c871cf104f0a69f2ebd51752a36
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Fri Mar 8 07:23:52 2013 +0000

    - Have kernel provide kernel-highbank for upgrade to unified
    - Update mvebu configs
    - Drop unused ARM patches

 arm-fix-omapdrm.patch        |   10 ----------
 arm-read_current_timer.patch |   39 ---------------------------------------
 config-armv7                 |    9 +++++++--
 kernel.spec                  |   15 ++++++++-------
 4 files changed, 15 insertions(+), 58 deletions(-)
---
diff --git a/config-armv7 b/config-armv7
index 0f84775..fa0ea0f 100644
--- a/config-armv7
+++ b/config-armv7
@@ -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
diff --git a/kernel.spec b/kernel.spec
index 324121c..2b824c4 100644
--- a/kernel.spec
+++ b/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 at 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 at redhat.com>
 - Fix DMI regression (rhbz 916444)
 - Fix logitech-dj HID bug from Benjamin Tissoires (rhbz 840391)