[kernel] - Temporarily disable ARM imx kernel due to missing clk patches - Add patch to fix OMAP build - Drop

[Peter Robinson]

commit d0e352027132c139deb8b3e64526ff781e4c64af
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sun Jun 10 23:41:53 2012 +0100

    - Temporarily disable ARM imx kernel due to missing clk patches
    - Add patch to fix OMAP build
    - Drop DTB mac patches as rejected upstream
    - General ARM cleanups

 arm-omap-dsp-inc.patch                             |   10 ++
 arm-omap-dt-compat.patch                           |   42 ---------
 ...port-reading-mac-address-from-device-tree.patch |   92 --------------------
 config-arm-generic                                 |   24 +-----
 config-arm-kirkwood                                |    2 +-
 kernel.spec                                        |   16 ++--
 6 files changed, 23 insertions(+), 163 deletions(-)
---
diff --git a/arm-omap-dsp-inc.patch b/arm-omap-dsp-inc.patch
new file mode 100644
index 0000000..8b69833
--- /dev/null
+++ b/arm-omap-dsp-inc.patch
@@ -0,0 +1,10 @@
+--- linux-3.5.0-0.rc2.git0.1.fc17.armv7hl/arch/arm/mach-omap2/dsp.c.orig	2012-06-10 05:54:50.000000000 -0400
++++ linux-3.5.0-0.rc2.git0.1.fc17.armv7hl/arch/arm/mach-omap2/dsp.c	2012-06-10 05:55:38.000000000 -0400
+@@ -20,6 +20,7 @@
+ 
+ #include <linux/module.h>
+ #include <linux/platform_device.h>
++#include <asm/memblock.h>
+ #include "cm2xxx_3xxx.h"
+ #include "prm2xxx_3xxx.h"
+ #ifdef CONFIG_BRIDGE_DVFS
diff --git a/config-arm-generic b/config-arm-generic
index 12fb61b..94d299b 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -101,35 +101,15 @@ CONFIG_DM9000_DEBUGLEVEL=4
 CONFIG_SMC911X=m
 CONFIG_SMSC911X=m
 
-# Generic MTD options. Platform specific set there
-CONFIG_MTD=y
-CONFIG_MTD_TESTS=m
-CONFIG_MTD_CMDLINE_PARTS=y
-# CONFIG_MTD_AFS_PARTS is not set
-# CONFIG_MTD_AR7_PARTS is not set
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_SM_FTL=m
-CONFIG_MTD_PHYSMAP=m
-# CONFIG_MTD_PHYSMAP_COMPAT is not set
-# CONFIG_MTD_GPIO_ADDR is not set
-CONFIG_MTD_PLATRAM=m
-CONFIG_MTD_AFS_PARTS=y
-CONFIG_MTD_ARM_INTEGRATOR=y
-CONFIG_MTD_IMPA7=y
-# CONFIG_MTD_PISMO is not set
-CONFIG_MTD_PHYSMAP_OF=m
-CONFIG_MTD_OF_PARTS=y
-
 CONFIG_MMC_SDHCI_PLTFM=m
 
 # Generic GPIO options
 CONFIG_GENERIC_GPIO=y
 
 CONFIG_MTD=m
+CONFIG_MTD_TESTS=m
 CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_AFS_PARTS=y
+# CONFIG_MTD_AFS_PARTS is not set
 CONFIG_MTD_CHAR=m
 CONFIG_MTD_BLKDEVS=m
 CONFIG_MTD_BLOCK=m
diff --git a/config-arm-kirkwood b/config-arm-kirkwood
index d026cc3..4d6dbf8 100644
--- a/config-arm-kirkwood
+++ b/config-arm-kirkwood
@@ -40,7 +40,7 @@ CONFIG_SND_KIRKWOOD_SOC_T5325=m
 CONFIG_MMC_MVSDIO=m
 CONFIG_LEDS_NS2=m
 CONFIG_LEDS_NETXBIG=m
-CONFIG_RTC_DRV_MV=m
+CONFIG_RTC_DRV_MV=y
 CONFIG_MV_XOR=y
 CONFIG_CRYPTO_DEV_MV_CESA=m
 
diff --git a/kernel.spec b/kernel.spec
index 6ed4d59..9bd5333 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -257,11 +257,11 @@ Summary: The Linux kernel
 
 # kernel up (versatile express), tegra, omap, imx and highbank are only built on armv7 hfp/sfp
 %ifnarch armv7hl armv7l
-%define with_imx 0
 %define with_highbank 0
 %define with_omap 0
 %define with_tegra 0
 %endif
+%define with_imx 0
 
 # kernel-kirkwood is only built for armv5
 %ifnarch armv5tel
@@ -714,9 +714,8 @@ Patch14000: hibernate-freeze-filesystems.patch
 Patch14010: lis3-improve-handling-of-null-rate.patch
 
 # ARM
-# Flattened devicetree support
-Patch21000: arm-omap-dt-compat.patch
-Patch21001: arm-smsc-support-reading-mac-address-from-device-tree.patch
+# OMAP
+Patch21000: arm-omap-dsp-inc.patch
 
 # ARM tegra
 Patch21004: arm-tegra-nvec-kconfig.patch
@@ -1298,8 +1297,7 @@ ApplyPatch taint-vbox.patch
 #
 # ARM
 #
-#ApplyPatch arm-omap-dt-compat.patch
-#ApplyPatch arm-smsc-support-reading-mac-address-from-device-tree.patch
+ApplyPatch arm-omap-dsp-inc.patch
 ApplyPatch arm-tegra-nvec-kconfig.patch
 ApplyPatch arm-tegra-usb-no-reset-linux33.patch
 ApplyPatch arm-tegra-sdhci-module-fix.patch
@@ -2278,6 +2276,12 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Sun Jun 10 2012 Peter Robinson <pbrobinson at fedoraproject.org>
+- Temporarily disable ARM imx kernel due to missing clk patches
+- Add patch to fix OMAP build
+- Drop DTB mac patches as rejected upstream
+- General ARM cleanups
+
 * Sat Jun 09 2012 Josh Boyer <jwboyer at redhat.com> - 3.5.0-0.rc2.git0.1
 - Linux v3.5-rc2