- Drop ARM kirkwood kernel

- Enable SPI on ARM
- General 3.9 updates

8 files changed, 162 insertions, 130 deletions

diff --git a/Makefile.config b/Makefile.config
index 21c2a837b..78085481b 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -9,7 +9,6 @@ CONFIGFILES	= \
 	$(CFG)-i686-PAE.config $(CFG)-i686-PAEdebug.config \
 	$(CFG)-x86_64.config $(CFG)-x86_64-debug.config \
 	$(CFG)-s390x.config \
-	$(CFG)-armv5tel-kirkwood.config \
 	$(CFG)-armv7l.config  $(CFG)-armv7hl.config \
 	$(CFG)-armv7l-omap.config $(CFG)-armv7hl-omap.config \
 	$(CFG)-armv7l-tegra.config $(CFG)-armv7hl-tegra.config \
@@ -46,9 +45,6 @@ temp-armv7l-omap: config-arm-omap temp-arm-generic
 temp-armv7l-tegra: config-arm-tegra temp-arm-generic
 	perl merge.pl $^  > $@
 
-temp-armv5tel-kirkwood: config-arm-kirkwood temp-arm-generic
-	perl merge.pl $^  > $@
-
 temp-x86-32: config-x86-32-generic config-x86-generic
 	perl merge.pl $^  > $@
 
@@ -112,9 +108,6 @@ kernel-$(VERSION)-ppc64p7.config: config-powerpc64p7 temp-powerpc64-generic
 kernel-$(VERSION)-s390x.config: config-s390x temp-s390-generic
 	perl merge.pl $^ s390 > $@
 
-kernel-$(VERSION)-armv5tel-kirkwood.config: /dev/null temp-armv5tel-kirkwood
-	perl merge.pl $^ arm > $@
-
 kernel-$(VERSION)-armv7l.config: /dev/null temp-armv7
 	perl merge.pl $^ arm > $@
 
diff --git a/config-arm-generic b/config-arm-generic
index 1ff40a554..01e5a1c3c 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -38,6 +38,7 @@ CONFIG_ARM_ERRATA_742231=y
 CONFIG_ARM_ERRATA_754327=y
 CONFIG_ARM_ERRATA_764369=y
 CONFIG_ARM_ERRATA_775420=y
+CONFIG_PL310_ERRATA_753970=y
 
 # Generic ARM config options
 CONFIG_ZBOOT_ROM_TEXT=0
@@ -54,6 +55,8 @@ CONFIG_PL330_DMA=y
 # CONFIG_PID_IN_CONTEXTIDR is not set
 
 # Generic options we want for ARM that aren't defualt
+CONFIG_EARLY_PRINTK=y
+
 CONFIG_HIGHMEM=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 
@@ -122,6 +125,7 @@ CONFIG_SND_DESIGNWARE_I2S=m
 CONFIG_SND_SIMPLE_CARD=m
 # CONFIG_SND_SOC_CACHE_LZO is not set
 CONFIG_SND_SOC_ALL_CODECS=m
+CONFIG_SND_SPI=y
 
 CONFIG_AX88796=m
 CONFIG_AX88796_93CX6=y
@@ -154,6 +158,7 @@ CONFIG_MMC_SDHCI_PXAV2=m
 
 # CONFIG_DW_DMAC_BIG_ENDIAN_IO is not set
 
+CONFIG_SPI=y
 # Generic GPIO options
 CONFIG_GENERIC_GPIO=y
 
@@ -218,6 +223,10 @@ CONFIG_MTD_NAND_ORION=m
 # CONFIG_MTD_PLATRAM is not set
 # CONFIG_MTD_PHRAM is not set
 # CONFIG_MTD_SLRAM is not set
+CONFIG_MTD_DATAFLASH=m
+CONFIG_MTD_DATAFLASH_WRITE_VERIFY=y
+CONFIG_MTD_DATAFLASH_OTP=y
+CONFIG_MTD_SST25L=m
 CONFIG_MTD_UBI=m
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
 CONFIG_MTD_UBI_BEB_RESERVE=1
@@ -259,6 +268,7 @@ CONFIG_OF=y
 CONFIG_USE_OF=y
 CONFIG_OF_DEVICE=y
 CONFIG_OF_IRQ=y
+CONFIG_OF_GPIO=y
 CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_ARM_APPENDED_DTB=y
 CONFIG_PROC_DEVICETREE=y
@@ -281,25 +291,78 @@ CONFIG_EDAC_MM_EDAC=m
 CONFIG_EDAC_LEGACY_SYSFS=y
 
 CONFIG_RTC_DRV_88PM80X=m
+CONFIG_RTC_DRV_DS1305=m
+CONFIG_RTC_DRV_DS1390=m
+CONFIG_RTC_DRV_DS3234=m
+CONFIG_RTC_DRV_M41T93=m
+CONFIG_RTC_DRV_M41T94=m
+CONFIG_RTC_DRV_MAX6902=m
+CONFIG_RTC_DRV_MC13XXX=m
+CONFIG_RTC_DRV_PCF2123=m
 CONFIG_RTC_DRV_PL030=m
 CONFIG_RTC_DRV_PL031=m
+CONFIG_RTC_DRV_R9701=m
+CONFIG_RTC_DRV_RS5C348=m
+CONFIG_RTC_DRV_RX4581=m
 CONFIG_RTC_DRV_SNVS=m
+
 CONFIG_RFKILL_REGULATOR=m
 CONFIG_INPUT_88PM80X_ONKEY=y
 CONFIG_INPUT_GP2A=m
 CONFIG_INPUT_GPIO_TILT_POLLED=m
 CONFIG_INPUT_PWM_BEEPER=m
+CONFIG_INPUT_ARIZONA_HAPTICS=m
+CONFIG_INPUT_MC13783_PWRBUTTON=m
+
 CONFIG_SERIAL_AMBA_PL010=m
 CONFIG_SERIAL_AMBA_PL011=m
-CONFIG_GPIO_PL061=y
-CONFIG_GPIO_MCP23S08=m
+CONFIG_SERIAL_MAX3100=m
+CONFIG_SERIAL_MAX310X=y
+CONFIG_SERIAL_IFX6X60=m
+
+CONFIG_GPIO_74X164=m
 CONFIG_GPIO_ADNP=m
-CONFIG_PL310_ERRATA_753970=y
+CONFIG_GPIO_ARIZONA=m
+CONFIG_GPIO_MAX7301=m
+CONFIG_GPIO_MC33880=m
+CONFIG_GPIO_MCP23S08=m
+CONFIG_GPIO_PL061=y
+
+CONFIG_SPI_ALTERA=m
+CONFIG_SPI_BITBANG=m
+CONFIG_SPI_BUTTERFLY=m
+CONFIG_SPI_DW_MMIO=m
+CONFIG_SPI_GPIO=m
+CONFIG_SPI_LM70_LLP=m
+CONFIG_SPI_OC_TINY=m
+CONFIG_SPI_PL022=m
+CONFIG_SPI_SC18IS602=m
+CONFIG_SPI_XCOMM=m
+CONFIG_SPI_XILINX=m
+CONFIG_SPI_DESIGNWARE=m
+CONFIG_SPI_SPIDEV=m
+CONFIG_SPI_TLE62X0=m
+CONFIG_BMP085_SPI=m
+CONFIG_BMP085_SPI=m
+CONFIG_EEPROM_AT25=m
+CONFIG_EEPROM_93XX46=m
+CONFIG_KS8851=m
+CONFIG_MICREL_KS8995MA=m
+CONFIG_LIBERTAS_SPI=m
+CONFIG_P54_SPI=m
+CONFIG_P54_SPI_DEFAULT_EEPROM=y
 
 CONFIG_MFD_CORE=m
 CONFIG_MFD_88PM800=m
 CONFIG_MFD_88PM805=m
+CONFIG_MFD_ARIZONA_SPI=m
+CONFIG_MFD_MC13XXX_SPI=m
 CONFIG_MFD_SYSCON=y
+# CONFIG_MFD_WM5102 is not set
+# CONFIG_MFD_WM5110 is not set
+# CONFIG_MFD_TPS65912_SPI is not set
+# CONFIG_MFD_DA9052_SPI is not set
+# CONFIG_MFD_WM831X_SPI is not set
 # CONFIG_MFD_TPS80031 is not set
 # CONFIG_MFD_AS3711 is not set
 # CONFIG_MFD_SMSC is not set
@@ -312,6 +375,7 @@ CONFIG_REGULATOR_USERSPACE_CONSUMER=m
 CONFIG_REGULATOR_GPIO=m
 CONFIG_REGULATOR_AD5398=m
 CONFIG_REGULATOR_ANATOP=m
+CONFIG_REGULATOR_ARIZONA=m
 CONFIG_REGULATOR_FAN53555=m
 CONFIG_REGULATOR_ISL6271A=m
 CONFIG_REGULATOR_LP3972=m
@@ -321,14 +385,28 @@ CONFIG_REGULATOR_MAX8649=m
 CONFIG_REGULATOR_MAX8660=m
 CONFIG_REGULATOR_MAX8952=m
 CONFIG_REGULATOR_MAX8973=m
+CONFIG_REGULATOR_MC13783=m
+CONFIG_REGULATOR_MC13892=m
 CONFIG_REGULATOR_LP3971=m
 CONFIG_REGULATOR_TPS51632=m
 CONFIG_REGULATOR_TPS62360=m
 CONFIG_REGULATOR_TPS65023=m
+CONFIG_REGULATOR_TPS6524X=m
 CONFIG_REGULATOR_TPS6507X=m
 CONFIG_CHARGER_MANAGER=y
 CONFIG_EXTCON_GPIO=m
 
+CONFIG_SENSORS_AD7314=m
+CONFIG_SENSORS_ADCXX=m
+CONFIG_SENSORS_LM70=m
+CONFIG_SENSORS_MAX1111=m
+CONFIG_SENSORS_MC13783_ADC=m
+CONFIG_SENSORS_ADS7871=m
+CONFIG_SENSORS_LIS3_SPI=m
+
+CONFIG_IEEE802154_AT86RF230=m
+CONFIG_IEEE802154_MRF24J40=m
+
 # CONFIG_ARM_VIRT_EXT is not set
 # CONFIG_PINCTRL_EXYNOS4 is not set
 # CONFIG_PINCTRL_EXYNOS5440 is not set
@@ -349,6 +427,9 @@ CONFIG_EXTCON_GPIO=m
 # CONFIG_HVC_DCC is not set
 # CONFIG_LEDS_RENESAS_TPU is not set
 # CONFIG_LEDS_PWM is not set
+CONFIG_LEDS_DAC124S085=m
+CONFIG_LEDS_MC13783=m
+
 # CONFIG_VIRTIO_CONSOLE is not set
 
 #  Possibly part of Snowball
@@ -380,7 +461,6 @@ CONFIG_EXTCON_GPIO=m
 # CONFIG_SUNGEM is not set
 # CONFIG_FB_SAVAGE is not set
 # CONFIG_FB_RADEON is not set
-# CONFIG_DRM_RADEON is not set
 # CONFIG_ATM_HE is not set
 # CONFIG_SCSI_ACARD is not set
 # CONFIG_SFC is not set
@@ -388,26 +468,59 @@ CONFIG_EXTCON_GPIO=m
 # these all currently fail due to missing symbols __bad_udelay or
 # error: implicit declaration of function ‘iowrite32be’
 # CONFIG_SND_ALI5451 is not set
-# CONFIG_DRM_NOUVEAU is not set 
 # CONFIG_MLX4_EN is not set
 
+CONFIG_TOUCHSCREEN_ADS7846=m
+CONFIG_TOUCHSCREEN_AD7877=m
+CONFIG_TOUCHSCREEN_TSC2005=m
+CONFIG_TOUCHSCREEN_MC13783=m
+
 # drivers/input/touchscreen/eeti_ts.c:65:2: error: implicit declaration of function 'irq_to_gpio' [-Werror=implicit-function-declaration]
 # CONFIG_TOUCHSCREEN_EETI is not set
 # CONFIG_TOUCHSCREEN_EGALAX is not set 
 # CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
-#
+
+# CONFIG_PANEL_LGPHILIPS_LB035Q02 is not set
+# CONFIG_PANEL_ACX565AKM is not set
+# CONFIG_PANEL_N8X0 is not set
+
+# CONFIG_LCD_L4F00242T03 is not set
+# CONFIG_LCD_LMS283GF05 is not set
+# CONFIG_LCD_LTV350QV is not set
+# CONFIG_LCD_ILI9320 is not set
+# CONFIG_LCD_TDO24M is not set
+# CONFIG_LCD_VGG2432A4 is not set
+# CONFIG_LCD_S6E63M0 is not set
+# CONFIG_LCD_LD9040 is not set
+# CONFIG_LCD_AMS369FG06 is not set
+# CONFIG_LCD_LMS501KF03 is not set
+# CONFIG_LCD_HX8357 is not set
+
 # CONFIG_FB_MX3 is not set
 # CONFIG_MX3_IPU is not set
 # CONFIG_MX3_IPU_IRQS is not set
 # CONFIG_SND_ATMEL_SOC is not set
 
 # CONFIG_NET_VENDOR_CIRRUS is not set
+# CONFIG_NET_VENDOR_MICROCHIP is not set
 # CONFIG_CS89x0 is not set
 # CONFIG_DVB_USB_PCTV452E is not set
 # CONFIG_PINCTRL_EXYNOS is not set
-CONFIG_VIRTUALIZATION=y
+# CONFIG_VIRTUALIZATION is not set
 
 CONFIG_XZ_DEC_ARM=y
-CONFIG_DRM_TILCDC=m
+
+# CONFIG_EZX_PCAP is not set
+
+# CONFIG_EXTCON_ARIZONA is not set
+
+# CONFIG_VIRTUALIZATION is not set
+# CONFIG_VIRTIO_PCI is not set
+# VIRTIO_MMIO is not set
+# REMOTEPROC is not set
+# RPMSG is not set
+
+# CONFIG_LATTICE_ECP3_CONFIG is not set
+# CONFIG_DRM_TILCDC is not set
 CONFIG_OF_DISPLAY_TIMING=y
 CONFIG_OF_VIDEOMODE=y
diff --git a/config-arm-kirkwood b/config-arm-kirkwood
deleted file mode 100644
index 2112723f3..000000000
--- a/config-arm-kirkwood
+++ /dev/null
@@ -1,76 +0,0 @@
-CONFIG_ARCH_KIRKWOOD=y
-CONFIG_ARCH_KIRKWOOD_DT=y
-# CONFIG_SMP is not set
-# CONFIG_VFP is not set
-
-CONFIG_MACH_D2NET_V2=y
-CONFIG_MACH_DB88F6281_BP=y
-CONFIG_MACH_DOCKSTAR=y
-CONFIG_MACH_DOCKSTAR_DT=y
-CONFIG_MACH_DREAMPLUG_DT=y
-CONFIG_MACH_ESATA_SHEEVAPLUG=y
-CONFIG_MACH_DLINK_KIRKWOOD_DT=y
-CONFIG_MACH_GOFLEXNET_DT=y
-CONFIG_MACH_GURUPLUG=y
-CONFIG_MACH_ICONNECT_DT=y
-CONFIG_MACH_IB62X0_DT=y
-CONFIG_MACH_INETSPACE_V2=y
-CONFIG_MACH_INETSPACE_V2_DT=y
-CONFIG_MACH_IOMEGA_IX2_200_DT=y
-CONFIG_MACH_KM_KIRKWOOD_DT=y
-CONFIG_MACH_LSXL_DT=y
-CONFIG_MACH_MPLCEC4_DT=y
-CONFIG_MACH_MV88F6281GTW_GE=y
-CONFIG_MACH_NETSPACE_LITE_V2_DT=y
-CONFIG_MACH_NETSPACE_MAX_V2=y
-CONFIG_MACH_NETSPACE_MAX_V2_DT=y
-CONFIG_MACH_NETSPACE_MINI_V2_DT=y
-CONFIG_MACH_NETSPACE_V2=y
-CONFIG_MACH_NETSPACE_V2_DT=y
-CONFIG_MACH_NET2BIG_V2=y
-CONFIG_MACH_NET5BIG_V2=y
-CONFIG_MACH_NSA310_DT=y
-CONFIG_MACH_OPENBLOCKS_A6_DT=y
-CONFIG_MACH_OPENRD_BASE=y
-CONFIG_MACH_OPENRD_CLIENT=y
-CONFIG_MACH_OPENRD_ULTIMATE=y
-CONFIG_MACH_RD88F6192_NAS=y
-CONFIG_MACH_RD88F6281=y
-CONFIG_MACH_SHEEVAPLUG=y
-CONFIG_MACH_TOPKICK_DT=y
-CONFIG_MACH_TS219=y
-CONFIG_MACH_TS219_DT=y
-CONFIG_MACH_TS41X=y
-CONFIG_MACH_T5325=y
-
-CONFIG_CACHE_FEROCEON_L2=y
-CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH=y
-CONFIG_MTD_NAND_ORION=m
-CONFIG_MV643XX_ETH=m
-CONFIG_I2C_MV64XXX=m
-CONFIG_GPIO_GENERIC_PLATFORM=y
-CONFIG_GPIO_MCP23S08=m
-CONFIG_ORION_WATCHDOG=m
-CONFIG_SND_KIRKWOOD_SOC=m
-CONFIG_SND_KIRKWOOD_SOC_OPENRD=m
-CONFIG_SND_KIRKWOOD_SOC_T5325=m
-CONFIG_MMC_MVSDIO=m
-CONFIG_LEDS_NS2=m
-CONFIG_LEDS_NETXBIG=m
-CONFIG_RTC_DRV_MV=y
-CONFIG_MV_XOR=y
-CONFIG_CRYPTO_DEV_MV_CESA=m
-# CONFIG_PINCTRL_EXYNOS is not set
-CONFIG_PINCTRL_MVEBU=y
-CONFIG_PINCTRL_KIRKWOOD=y
-
-# CONFIG_CPU_FEROCEON_OLD_ID is not set
-# CONFIG_INPUT_GP2A is not set
-# CONFIG_INPUT_GPIO_TILT_POLLED is not set
-# CONFIG_HIGHPTE is not set
-# CONFIG_EDAC is not set
-
-
-CONFIG_FB_XGI=m
-CONFIG_POWER_RESET_QNAP=y
-CONFIG_CPU_IDLE_KIRKWOOD=y
diff --git a/config-arm-omap b/config-arm-omap
index 7a9c73113..817828f48 100644
--- a/config-arm-omap
+++ b/config-arm-omap
@@ -108,7 +108,6 @@ CONFIG_OUTER_CACHE_SYNC=y
 CONFIG_CACHE_L2X0=y
 CONFIG_CACHE_PL310=y
 CONFIG_ARM_DMA_MEM_BUFFERABLE=y
-CONFIG_CPU_HAS_PMU=y
 CONFIG_ARM_ERRATA_430973=y
 # CONFIG_ARM_ERRATA_458693 is not set
 # CONFIG_ARM_ERRATA_460075 is not set
@@ -138,7 +137,6 @@ CONFIG_CMDLINE=""
 # CONFIG_AUTO_ZRELADDR is not set
 CONFIG_VFPv3=y
 CONFIG_NEON=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_BINFMT_MISC=m
 CONFIG_PM_DEBUG=y
 # CONFIG_PM_ADVANCED_DEBUG is not set
@@ -148,6 +146,8 @@ CONFIG_PM_SLEEP_SMP=y
 CONFIG_ARCH_HAS_OPP=y
 CONFIG_PM_OPP=y
 
+# OMAP thermal temp. Can likely be built as module but doesn't autoload so build in to ensure performance on PandaES
+CONFIG_OMAP_BANDGAP=y
 CONFIG_OMAP4_THERMAL=y
 CONFIG_OMAP5_THERMAL=y
 
@@ -156,7 +156,9 @@ CONFIG_OMAP5_THERMAL=y
 #
 CONFIG_WL_TI=y
 CONFIG_WLCORE_SDIO=m
+CONFIG_WLCORE_SPI=m
 CONFIG_TI_ST=m
+CONFIG_TI_DAC7512=m
 # CONFIG_TI_CPSW is not set
 CONFIG_MTD_NAND_OMAP2=y
 CONFIG_MTD_NAND_OMAP_PREFETCH=y
@@ -165,6 +167,10 @@ CONFIG_WL1251_SPI=m
 CONFIG_WL12XX_SPI=m
 CONFIG_WL12XX_SDIO_TEST=m
 CONFIG_WL18XX=m
+CONFIG_SPI_DAVINCI=m
+CONFIG_SPI_OMAP24XX=y
+CONFIG_MFD_TI_SSP=m
+CONFIG_SPI_TI_SSP=m
 CONFIG_NFC_WILINK=m
 CONFIG_INPUT_TWL4030_PWRBUTTON=m
 CONFIG_INPUT_TWL4030_VIBRA=m
@@ -197,7 +203,6 @@ CONFIG_LEDS_LP8788=m
 CONFIG_MTD_ONENAND_OMAP2=y
 CONFIG_HDQ_MASTER_OMAP=m
 CONFIG_I2C_OMAP=m
-CONFIG_SPI_OMAP24XX=m
 CONFIG_MFD_OMAP_USB_HOST=y
 CONFIG_MFD_WL1273_CORE=m
 CONFIG_MFD_LP8788=y
@@ -336,7 +341,6 @@ CONFIG_PWM_TWL_LED=m
 # CONFIG_TIDSPBRIDGE_BACKTRACE is not set
 
 # CONFIG_OMAP_REMOTEPROC is not set
-# CONFIG_OMAP_BANDGAP is not set
 # CONFIG_OMAP_IOVMM is not set
 
 CONFIG_CRYPTO_DEV_OMAP_SHAM=m
@@ -363,3 +367,8 @@ CONFIG_CRYPTO_DEV_OMAP_AES=m
 # CONFIG_OMAP2_DSS_DEBUGFS is not set
 # CONFIG_ARM_PSCI is not set
 # CONFIG_WILINK_PLATFORM_DATA is not set
+
+# VIRTIO_PCI is not set
+# VIRTIO_MMIO is not set
+# REMOTEPROC is not set
+# RPMSG is not set
diff --git a/config-arm-tegra b/config-arm-tegra
index ede85c03e..eaeaa4f9e 100644
--- a/config-arm-tegra
+++ b/config-arm-tegra
@@ -41,6 +41,8 @@ CONFIG_TEGRA_SYSTEM_DMA=y
 CONFIG_TEGRA_EMC_SCALING_ENABLE=y
 CONFIG_TEGRA_AHB=y
 CONFIG_TEGRA20_APB_DMA=y
+CONFIG_SPI_TEGRA20_SFLASH=m
+CONFIG_SPI_TEGRA20_SLINK=m
 CONFIG_ARM_THUMBEE=y
 CONFIG_SWP_EMULATE=y
 # CONFIG_CPU_BPREDICT_DISABLE is not set
@@ -65,6 +67,8 @@ CONFIG_ARM_ERRATA_720789=y
 CONFIG_GPIO_GENERIC_PLATFORM=y
 # CONFIG_GPIO_MCP23S08 is not set
 # CONFIG_KEYBOARD_TEGRA is not set
+CONFIG_PINCTRL_TEGRA=y
+CONFIG_PINCTRL_TEGRA20=y
 CONFIG_USB_EHCI_TEGRA=y
 CONFIG_RTC_DRV_TEGRA=y
 
@@ -111,3 +115,7 @@ CONFIG_OF_PCI_IRQ=y
 
 # CONFIG_DRM_TEGRA_DEBUG is not set
 # CONFIG_ARM_PSCI is not set
+# CONFIG_TI_DAC7512 is not set
+# CONFIG_SPI_TOPCLIFF_PCH is not set
+# CONFIG_SPI_DW_PCI is not set
+# CONFIG_SPI_PXA2XX is not set
diff --git a/config-armv7 b/config-armv7
index bd96560f6..445323ecd 100644
--- a/config-armv7
+++ b/config-armv7
@@ -110,6 +110,8 @@ CONFIG_HIGH_RES_TIMERS=y
 CONFIG_SECCOMP=y
 CONFIG_STRICT_DEVMEM=y
 
+CONFIG_XZ_DEC_ARM=y
+
 CONFIG_PM=y
 CONFIG_PM_STD_PARTITION=""
 CONFIG_SUSPEND=y
@@ -124,10 +126,6 @@ CONFIG_CC_STACKPROTECTOR=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_UTS_NS is not set
-# CONFIG_IPC_NS is not set
-# CONFIG_PID_NS is not set
-# CONFIG_NET_NS is not set
 
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
@@ -203,7 +201,6 @@ CONFIG_MVNETA=m
 CONFIG_SATA_MV=m
 CONFIG_MARVELL_PHY=m
 CONFIG_RTC_DRV_S35390A=y
-CONFIG_USB_EHCI_MV=y
 
 # Allwinner a1x
 # CONFIG_SUNXI_RFKILL=y
@@ -241,8 +238,12 @@ CONFIG_USB_EHCI_MV=y
 # CONFIG_MMC_SUNXI=y
 # CONFIG_RTC_DRV_SUN4I=y
 
+# OMAP 
+# CONFIG_DRM_TILCDC is not set
+# CONFIG_SENSORS_LIS3_I2C is not set
+
 # imx 
-CONFIG_BACKLIGHT_PWM=m
+# CONFIG_BACKLIGHT_PWM is not set
 # CONFIG_DRM_IMX is not set
 # CONFIG_DRM_IMX_FB_HELPER=m
 # CONFIG_DRM_IMX_PARALLEL_DISPLAY=m
@@ -263,8 +264,8 @@ CONFIG_CRYPTO_DEV_PICOXCELL=m
 # ST Ericsson
 # CONFIG_I2C_NOMADIK is not set
 
-# OMAP
-# CONFIG_SENSORS_LIS3_I2C is not set
+# ZYNQ
+# CONFIG_LATTICE_ECP3_CONFIG is not set
 
 # General ARM drivers
 # Device tree
@@ -278,12 +279,15 @@ CONFIG_ARM_APPENDED_DTB=y
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_OF_SELFTEST is not set
 CONFIG_SERIAL_OF_PLATFORM=y
-CONFIG_OF_GPIO=y
 CONFIG_OF_PCI=y
 CONFIG_OF_PCI_IRQ=y
+CONFIG_OF_GPIO=y
 CONFIG_I2C_MUX_PINCTRL=m
 CONFIG_OF_MDIO=m
 
+CONFIG_OF_DISPLAY_TIMING=y
+CONFIG_OF_VIDEOMODE=y
+
 CONFIG_MDIO_BUS_MUX_GPIO=m
 CONFIG_GPIOLIB=y
 
@@ -469,8 +473,4 @@ CONFIG_VIRTUALIZATION=y
 # CONFIG_ARM_HIGHBANK_CPUFREQ is not set
 # CONFIG_RFKILL_REGULATOR is not set
 
-CONFIG_DRM_TILCDC=m
-CONFIG_OF_DISPLAY_TIMING=y
-CONFIG_OF_VIDEOMODE=y
-
 CONFIG_XZ_DEC_ARM=y
diff --git a/config-nodebug b/config-nodebug
index b52b784e9..7abd7b550 100644
--- a/config-nodebug
+++ b/config-nodebug
@@ -114,3 +114,5 @@ CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
 # CONFIG_MAC80211_MESSAGE_TRACING is not set
 
 # CONFIG_EDAC_DEBUG is not set
+
+# CONFIG_SPI_DEBUG is not set
diff --git a/kernel.spec b/kernel.spec
index 7a5a1b043..f14eda04a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -136,8 +136,6 @@ Summary: The Linux kernel
 %define with_omap      %{?_without_omap:      0} %{?!_without_omap:      1}
 # kernel-tegra (only valid for arm)
 %define with_tegra       %{?_without_tegra:       0} %{?!_without_tegra:       1}
-# kernel-kirkwood (only valid for arm)
-%define with_kirkwood       %{?_without_kirkwood:       0} %{?!_without_kirkwood:       1}
 #
 # Additional options for user-friendly one-off kernel building:
 #
@@ -257,11 +255,6 @@ Summary: The Linux kernel
 %define with_tegra 0
 %endif
 
-# kernel-kirkwood is only built for armv5
-%ifnarch armv5tel
-%define with_kirkwood 0
-%endif
-
 # if requested, only build base kernel
 %if %{with_baseonly}
 %define with_smp 0
@@ -584,7 +577,6 @@ Source100: config-armv7
 Source105: config-arm-generic
 Source110: config-arm-omap
 Source111: config-arm-tegra
-Source112: config-arm-kirkwood
 
 # This file is intentionally left empty in the stock kernel. Its a nicety
 # added for those wanting to do custom rebuilds with altered config opts.
@@ -1026,12 +1018,6 @@ This variant of the kernel has numerous debugging options enabled.
 It should only be installed when trying to gather additional information
 on kernel bugs, as some of these options impact performance noticably.
 
-%define variant_summary The Linux kernel compiled for marvell kirkwood boards
-%kernel_variant_package kirkwood
-%description kirkwood
-This package includes a version of the Linux kernel with support for
-marvell kirkwood based systems, i.e., guruplug, sheevaplug
-
 %define variant_summary The Linux kernel compiled for TI-OMAP boards
 %kernel_variant_package omap
 %description omap
@@ -1793,10 +1779,6 @@ BuildKernel %make_target %kernel_image PAEdebug
 BuildKernel %make_target %kernel_image PAE
 %endif
 
-%if %{with_kirkwood}
-BuildKernel %make_target %kernel_image kirkwood
-%endif
-
 %if %{with_omap}
 BuildKernel %make_target %kernel_image omap
 %endif
@@ -2127,9 +2109,6 @@ fi}\
 %kernel_variant_post -v PAEdebug -r (kernel|kernel-smp)
 %kernel_variant_preun PAEdebug
 
-%kernel_variant_preun kirkwood
-%kernel_variant_post -v kirkwood
-
 %kernel_variant_preun omap
 %kernel_variant_post -v omap
 
@@ -2279,7 +2258,6 @@ fi
 %kernel_variant_files %{with_debug} debug
 %kernel_variant_files %{with_pae} PAE
 %kernel_variant_files %{with_pae_debug} PAEdebug
-%kernel_variant_files %{with_kirkwood} kirkwood
 %kernel_variant_files %{with_omap} omap
 %kernel_variant_files %{with_tegra} tegra
 
@@ -2296,6 +2274,11 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Wed Feb 27 2013 Peter Robinson <pbrobinson@fedoraproject.org>
+- Drop ARM kirkwood kernel
+- Enable SPI on ARM
+- General 3.9 updates
+
 * Wed Feb 27 2013 Josh Boyer <jwboyer@redhat.com> - 3.9.0-0.rc0.git11.1
 - Linux v3.8-9456-g309667e