Update to 3.8-rc1

2025-02-16 23:57:11 +00:00 · 2012-12-25 23:06:02 -05:00 · 2012-12-25 23:06:02 -05:00 · 8fa31cefa1
commit 8fa31cefa1
parent d9eefea179
5 changed files with 263 additions and 101 deletions
--- a/core/linux-kirkwood-dt/PKGBUILD
+++ b/core/linux-kirkwood-dt/PKGBUILD
@ -7,7 +7,7 @@ pkgbase=linux-kirkwood-dt
 pkgname=('linux-kirkwood-dt' 'linux-headers-kirkwood-dt')
 #pkgname=linux-test       # Build kernel with a different name
 _kernelname=${pkgname#linux}
-_basekernel=next.20121016
+_basekernel=3.8_rc1
 pkgver=${_basekernel}
 pkgrel=0
 cryptover=1.5
@ -19,25 +19,26 @@ options=('!strip')
 source=('support.patch'
        'config'
 	'dts-bootarg-wipe.patch'
-	'read_current_timer2.patch'
-        'change-default-console-loglevel.patch'
        'usb-add-reset-resume-quirk-for-several-webcams.patch'
+	'rtl871x-arm.patch'
+	'pending-3.8.patch'
        "http://download.gna.org/cryptodev-linux/cryptodev-linux-${cryptover}.tar.gz"
-	"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/3.6.0-v5/0001-block-cgroups-kconfig-build-bits-for-BFQ-v5-3.6.patch"
-        "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/3.6.0-v5/0002-block-introduce-the-BFQ-v5-I-O-sched-for-3.6.patch")
+	"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/3.7.0-v5r1/0001-block-cgroups-kconfig-build-bits-for-BFQ-v5r1-3.7.patch"
+        "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/3.7.0-v5r1/0002-block-introduce-the-BFQ-v5r1-I-O-sched-for-3.7.patch")
+
 md5sums=('f5d3635da03cb45904bedd69b47133de'
-         '7d7ee71db286f04672f404609fcec98a'
-	 '874483fdd661993035c04d3e96abad37'
-	 'c811a057604262b3e5b502d5214ee497'
-         '9d3c56a4b999c8bfbd4018089a62f662'
+         '729a6f753bd402efff95d68f111454b6'
+         '6d955c1f4882be73618018fc3b419ebf'
         'd00814b57448895e65fbbc800e8a58ba'
+         'c38fa5f5065be065282887e0a3e2dc63'
+         'a3d5a876ac8ac41457c104cc04ae9b47'
         '3a4b8d23c1708283e29477931d63ffb8'
-	 'f8d5472706d94a2707dd53bad5ccd00e'
-         'b5df48a60787f0abe275fe9df1bbef35')
+         '9daa5f662145f91b25b91b9fbeb874d9'
+         'c80954ae588d8c168a0b1ae9ffe84c0e')

 __gitroot="git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git"
 __gitname="linux-next"
-__gitbranch="next-20121016"
+__gitbranch="v3.8-rc1"

 build() {
  cd "${srcdir}"
@ -70,15 +71,21 @@ build() {
  # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
  # remove this when a Kconfig knob is made available by upstream
  # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
-  patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
+  # patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"

  # Fix read_current_timer so it's exported to modules, upstream is aware and
  # a proper fix is pending.
-  patch -Np1 -i "${srcdir}/read_current_timer2.patch"
+  #patch -Np1 -i "${srcdir}/read_current_timer2.patch"
+
+  # Hack fix for an alignment bug in RTL8712 driver
+  patch -Np1 -i "${srcdir}/rtl871x-arm.patch"
+
+  # General fixes queued for next release
+  patch -Np1 -i "${srcdir}/pending-3.8.patch"

  # Add BFQ patches
-  patch -Np1 -i "${srcdir}/0001-block-cgroups-kconfig-build-bits-for-BFQ-v5-3.6.patch"
-  patch -Np1 -i "${srcdir}/0002-block-introduce-the-BFQ-v5-I-O-sched-for-3.6.patch"
+  patch -Np1 -i "${srcdir}/0001-block-cgroups-kconfig-build-bits-for-BFQ-v5r1-3.7.patch"
+  patch -Np1 -i "${srcdir}/0002-block-introduce-the-BFQ-v5r1-I-O-sched-for-3.7.patch"
  cat "${srcdir}/config" > ./.config

  # set extraversion to pkgrel
@ -138,9 +145,10 @@ package_linux-kirkwood-dt() {
  mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot/dtb}
  make INSTALL_MOD_PATH="${pkgdir}" modules_install
  cp arch/$KARCH/boot/zImage "${pkgdir}/boot/zImage"
-  cp arch/$KARCH/boot/*.dtb "${pkgdir}/boot/dtb/."
+  cp arch/$KARCH/boot/dts/*.dtb "${pkgdir}/boot/dtb/."
  cp arch/$KARCH/boot/dts/skeleton.dtsi "${pkgdir}/boot/dtb/."
-  cp arch/$KARCH/boot/dts/kirkwood* "${pkgdir}/boot/dtb/."
+  cp arch/$KARCH/boot/dts/kirkwood*.dts "${pkgdir}/boot/dtb/."
+  cp arch/$KARCH/boot/dts/kirkwood*.dtsi "${pkgdir}/boot/dtb/."

  mkdir -p "${pkgdir}"/usr/local/sbin
  cp scripts/dtc/dtc "${pkgdir}/usr/local/sbin/."
--- a/core/linux-kirkwood-dt/config
+++ b/core/linux-kirkwood-dt/config
@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.6.0-0 Kernel Configuration
+# Linux/arm 3.8.0-0 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@ -20,6 +20,7 @@ CONFIG_GENERIC_BUG=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_HAVE_IRQ_WORK=y
 CONFIG_IRQ_WORK=y
+CONFIG_BUILDTIME_EXTABLE_SORT=y

 #
 # General setup
@ -178,9 +179,10 @@ CONFIG_HAVE_CLK=y
 CONFIG_HAVE_DMA_API_DEBUG=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
-CONFIG_GENERIC_KERNEL_THREAD=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
 CONFIG_MODULES_USE_ELF_REL=y
+CONFIG_CLONE_BACKWARDS=y

 #
 # GCOV-based kernel profiling
@ -254,14 +256,13 @@ CONFIG_MMU=y
 # CONFIG_ARCH_VERSATILE is not set
 # CONFIG_ARCH_AT91 is not set
 # CONFIG_ARCH_BCM2835 is not set
-# CONFIG_ARCH_CLPS711X is not set
 # CONFIG_ARCH_CNS3XXX is not set
+# CONFIG_ARCH_CLPS711X is not set
 # CONFIG_ARCH_GEMINI is not set
 # CONFIG_ARCH_SIRF is not set
 # CONFIG_ARCH_EBSA110 is not set
 # CONFIG_ARCH_EP93XX is not set
 # CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_MXC is not set
 # CONFIG_ARCH_MXS is not set
 # CONFIG_ARCH_NETX is not set
 # CONFIG_ARCH_H720X is not set
@ -271,12 +272,12 @@ CONFIG_MMU=y
 # CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_DOVE is not set
 CONFIG_ARCH_KIRKWOOD=y
-# CONFIG_ARCH_LPC32XX is not set
 # CONFIG_ARCH_MV78XX0 is not set
 # CONFIG_ARCH_ORION5X is not set
 # CONFIG_ARCH_MMP is not set
 # CONFIG_ARCH_KS8695 is not set
 # CONFIG_ARCH_W90X900 is not set
+# CONFIG_ARCH_LPC32XX is not set
 # CONFIG_ARCH_TEGRA is not set
 # CONFIG_ARCH_PXA is not set
 # CONFIG_ARCH_MSM is not set
@ -293,11 +294,10 @@ CONFIG_ARCH_KIRKWOOD=y
 # CONFIG_ARCH_U300 is not set
 # CONFIG_ARCH_U8500 is not set
 # CONFIG_ARCH_NOMADIK is not set
+# CONFIG_PLAT_SPEAR is not set
 # CONFIG_ARCH_DAVINCI is not set
 # CONFIG_ARCH_OMAP is not set
-# CONFIG_PLAT_SPEAR is not set
-# CONFIG_ARCH_VT8500 is not set
-# CONFIG_ARCH_ZYNQ is not set
+# CONFIG_ARCH_VT8500_SINGLE is not set
 # CONFIG_GPIO_PCA953X is not set
 # CONFIG_KEYBOARD_GPIO_POLLED is not set

@ -322,6 +322,14 @@ CONFIG_MACH_GOFLEXNET_DT=y
 CONFIG_MACH_LSXL_DT=y
 CONFIG_MACH_IOMEGA_IX2_200_DT=y
 CONFIG_MACH_KM_KIRKWOOD_DT=y
+CONFIG_MACH_INETSPACE_V2_DT=y
+CONFIG_MACH_MPLCEC4_DT=y
+CONFIG_MACH_NETSPACE_V2_DT=y
+CONFIG_MACH_NETSPACE_MAX_V2_DT=y
+CONFIG_MACH_NETSPACE_LITE_V2_DT=y
+CONFIG_MACH_NETSPACE_MINI_V2_DT=y
+CONFIG_MACH_OPENBLOCKS_A6_DT=y
+CONFIG_MACH_TOPKICK_DT=y
 CONFIG_MACH_TS219=y
 CONFIG_MACH_TS41X=y
 # CONFIG_MACH_DOCKSTAR is not set
@ -335,6 +343,8 @@ CONFIG_MACH_TS41X=y
 # CONFIG_MACH_NET2BIG_V2 is not set
 # CONFIG_MACH_NET5BIG_V2 is not set
 # CONFIG_MACH_T5325 is not set
+CONFIG_MACH_NSA310_DT=y
+# CONFIG_ARCH_VT8500 is not set
 CONFIG_PLAT_ORION=y
 CONFIG_PLAT_ORION_LEGACY=y

@ -422,7 +432,6 @@ CONFIG_ALIGNMENT_TRAP=y
 CONFIG_UACCESS_WITH_MEMCPY=y
 # CONFIG_SECCOMP is not set
 # CONFIG_CC_STACKPROTECTOR is not set
-# CONFIG_XEN is not set

 #
 # Boot options
@ -754,9 +763,11 @@ CONFIG_IP_SCTP=m
 CONFIG_NET_SCTPPROBE=m
 # CONFIG_SCTP_DBG_MSG is not set
 # CONFIG_SCTP_DBG_OBJCNT is not set
-# CONFIG_SCTP_HMAC_NONE is not set
-# CONFIG_SCTP_HMAC_SHA1 is not set
-CONFIG_SCTP_HMAC_MD5=y
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set
+CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE=y
+CONFIG_SCTP_COOKIE_HMAC_MD5=y
+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
 # CONFIG_RDS is not set
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
@ -766,10 +777,9 @@ CONFIG_L2TP=m
 CONFIG_STP=m
 CONFIG_BRIDGE=m
 CONFIG_BRIDGE_IGMP_SNOOPING=y
+CONFIG_HAVE_NET_DSA=y
 CONFIG_NET_DSA=y
-# CONFIG_NET_DSA_TAG_DSA is not set
 CONFIG_NET_DSA_TAG_EDSA=y
-# CONFIG_NET_DSA_TAG_TRAILER is not set
 CONFIG_VLAN_8021Q=m
 # CONFIG_VLAN_8021Q_GVRP is not set
 # CONFIG_DECNET is not set
@ -976,7 +986,7 @@ CONFIG_CFG80211_DEFAULT_PS=y
 # CONFIG_CFG80211_DEBUGFS is not set
 # CONFIG_CFG80211_INTERNAL_REGDB is not set
 CONFIG_CFG80211_WEXT=y
-CONFIG_LIB80211=y
+CONFIG_LIB80211=m
 CONFIG_LIB80211_CRYPT_WEP=m
 CONFIG_LIB80211_CRYPT_CCMP=m
 CONFIG_LIB80211_CRYPT_TKIP=m
@ -997,6 +1007,7 @@ CONFIG_WIMAX_DEBUG_LEVEL=8
 CONFIG_RFKILL=m
 CONFIG_RFKILL_LEDS=y
 CONFIG_RFKILL_INPUT=y
+CONFIG_RFKILL_REGULATOR=m
 CONFIG_RFKILL_GPIO=m
 # CONFIG_NET_9P is not set
 CONFIG_CAIF=m
@ -1032,7 +1043,6 @@ CONFIG_EXTRA_FIRMWARE=""
 #
 # Bus devices
 #
-# CONFIG_OMAP_OCP2SCP is not set
 # CONFIG_CONNECTOR is not set
 CONFIG_MTD=y
 # CONFIG_MTD_TESTS is not set
@ -1159,7 +1169,7 @@ CONFIG_OF_EARLY_FLATTREE=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_IRQ=y
 CONFIG_OF_DEVICE=y
-CONFIG_OF_I2C=m
+CONFIG_OF_I2C=y
 CONFIG_OF_NET=y
 CONFIG_OF_MDIO=y
 CONFIG_OF_PCI=y
@ -1176,10 +1186,8 @@ CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
-
-#
-# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
-#
+CONFIG_BLK_DEV_DRBD=m
+# CONFIG_DRBD_FAULT_INJECTION is not set
 CONFIG_BLK_DEV_NBD=m
 # CONFIG_BLK_DEV_NVME is not set
 CONFIG_BLK_DEV_SX8=m
@ -1314,6 +1322,7 @@ CONFIG_ISCSI_BOOT_SYSFS=m
 # CONFIG_MEGARAID_LEGACY is not set
 # CONFIG_MEGARAID_SAS is not set
 # CONFIG_SCSI_MPT2SAS is not set
+# CONFIG_SCSI_MPT3SAS is not set
 # CONFIG_SCSI_UFSHCD is not set
 # CONFIG_SCSI_HPTIOP is not set
 # CONFIG_LIBFC is not set
@ -1339,6 +1348,7 @@ CONFIG_ISCSI_BOOT_SYSFS=m
 # CONFIG_SCSI_PM8001 is not set
 # CONFIG_SCSI_SRP is not set
 # CONFIG_SCSI_BFA_FC is not set
+# CONFIG_SCSI_CHELSIO_FCOE is not set
 # CONFIG_SCSI_DH is not set
 # CONFIG_SCSI_OSD_INITIATOR is not set
 CONFIG_ATA=y
@ -1349,7 +1359,7 @@ CONFIG_SATA_PMP=y
 #
 # Controllers with non-SFF native interface
 #
-# CONFIG_SATA_AHCI is not set
+CONFIG_SATA_AHCI=y 
 # CONFIG_SATA_AHCI_PLATFORM is not set
 # CONFIG_SATA_INIC162X is not set
 # CONFIG_SATA_ACARD_AHCI is not set
@ -1533,6 +1543,9 @@ CONFIG_NET_VENDOR_ATHEROS=y
 # CONFIG_ATL1 is not set
 # CONFIG_ATL1E is not set
 # CONFIG_ATL1C is not set
+CONFIG_NET_CADENCE=y
+# CONFIG_ARM_AT91_ETHER is not set
+# CONFIG_MACB is not set
 CONFIG_NET_VENDOR_BROADCOM=y
 # CONFIG_B44 is not set
 # CONFIG_BNX2 is not set
@ -1581,6 +1594,7 @@ CONFIG_NET_VENDOR_I825XX=y
 # CONFIG_JME is not set
 CONFIG_NET_VENDOR_MARVELL=y
 CONFIG_MV643XX_ETH=y
+CONFIG_MVMDIO=y
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
 CONFIG_NET_VENDOR_MELLANOX=y
@ -1606,7 +1620,6 @@ CONFIG_NET_VENDOR_NVIDIA=y
 # CONFIG_FORCEDETH is not set
 CONFIG_NET_VENDOR_OKI=y
 CONFIG_PCH_GBE=y
-# CONFIG_PCH_PTP is not set
 # CONFIG_ETHOC is not set
 CONFIG_NET_PACKET_ENGINE=y
 # CONFIG_HAMACHI is not set
@ -1664,6 +1677,7 @@ CONFIG_PHYLIB=y
 #
 # MII PHY device drivers
 #
+# CONFIG_AT803X_PHY is not set
 # CONFIG_AMD_PHY is not set
 CONFIG_MARVELL_PHY=y
 # CONFIG_DAVICOM_PHY is not set
@ -1711,6 +1725,7 @@ CONFIG_USB_NET_AX8817X=m
 CONFIG_USB_NET_CDCETHER=m
 # CONFIG_USB_NET_CDC_EEM is not set
 CONFIG_USB_NET_CDC_NCM=m
+# CONFIG_USB_NET_CDC_MBIM is not set
 CONFIG_USB_NET_DM9601=m
 CONFIG_USB_NET_SMSC75XX=m
 CONFIG_USB_NET_SMSC95XX=m
@ -1751,6 +1766,7 @@ CONFIG_RTL8187_LEDS=y
 # CONFIG_MAC80211_HWSIM is not set
 CONFIG_MWL8K=m
 CONFIG_ATH_COMMON=m
+CONFIG_ATH_CARDS=m
 # CONFIG_ATH_DEBUG is not set
 CONFIG_ATH5K=m
 # CONFIG_ATH5K_DEBUG is not set
@ -1770,6 +1786,7 @@ CONFIG_CARL9170=m
 CONFIG_CARL9170_LEDS=y
 CONFIG_CARL9170_WPC=y
 # CONFIG_ATH6KL is not set
+CONFIG_AR5523=m
 CONFIG_B43=m
 CONFIG_B43_SSB=y
 CONFIG_B43_PCI_AUTOSELECT=y
@ -1853,6 +1870,7 @@ CONFIG_RT2X00_LIB_LEDS=y
 CONFIG_RTL8192CE=m
 CONFIG_RTL8192SE=m
 CONFIG_RTL8192DE=m
+CONFIG_RTL8723AE=m
 CONFIG_RTL8192CU=m
 CONFIG_RTLWIFI=m
 CONFIG_RTLWIFI_DEBUG=y
@ -1919,7 +1937,6 @@ CONFIG_KEYBOARD_TCA6416=m
 # CONFIG_KEYBOARD_SAMSUNG is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_OMAP4 is not set
 # CONFIG_KEYBOARD_XTKBD is not set
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=m
@ -1935,7 +1952,7 @@ CONFIG_MOUSE_APPLETOUCH=m
 CONFIG_MOUSE_BCM5974=m
 # CONFIG_MOUSE_VSXXXAA is not set
 # CONFIG_MOUSE_GPIO is not set
-CONFIG_MOUSE_SYNAPTICS_I2C=m
+CONFIG_MOUSE_SYNAPTICS_I2C=y
 # CONFIG_MOUSE_SYNAPTICS_USB is not set
 # CONFIG_INPUT_JOYSTICK is not set
 CONFIG_INPUT_TABLET=y
@ -2015,6 +2032,7 @@ CONFIG_SERIO_LIBPS2=m
 # CONFIG_SERIO_RAW is not set
 # CONFIG_SERIO_ALTERA_PS2 is not set
 # CONFIG_SERIO_PS2MULT is not set
+# CONFIG_SERIO_ARC_PS2 is not set
 # CONFIG_GAMEPORT is not set

 #
@ -2064,6 +2082,7 @@ CONFIG_SERIAL_OF_PLATFORM=y
 # CONFIG_SERIAL_IFX6X60 is not set
 # CONFIG_SERIAL_PCH_UART is not set
 # CONFIG_SERIAL_XILINX_PS_UART is not set
+# CONFIG_SERIAL_ARC is not set
 # CONFIG_HVC_DCC is not set
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_HW_RANDOM is not set
@ -2075,7 +2094,7 @@ CONFIG_DEVPORT=y
 CONFIG_I2C=m
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_COMPAT=y
-CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_CHARDEV=y
 # CONFIG_I2C_MUX is not set
 CONFIG_I2C_HELPER_AUTO=y

@ -2104,12 +2123,13 @@ CONFIG_I2C_HELPER_AUTO=y
 #
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
+# CONFIG_I2C_CBUS_GPIO is not set
 # CONFIG_I2C_DESIGNWARE_PLATFORM is not set
 # CONFIG_I2C_DESIGNWARE_PCI is not set
 # CONFIG_I2C_EG20T is not set
 # CONFIG_I2C_GPIO is not set
 # CONFIG_I2C_INTEL_MID is not set
-CONFIG_I2C_MV64XXX=m
+CONFIG_I2C_MV64XXX=y
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PCA_PLATFORM is not set
 # CONFIG_I2C_PXA_PCI is not set
@ -2160,7 +2180,15 @@ CONFIG_SPI_ORION=y
 #
 # PPS support
 #
-# CONFIG_PPS is not set
+CONFIG_PPS=y
+# CONFIG_PPS_DEBUG is not set
+
+#
+# PPS clients support
+#
+# CONFIG_PPS_CLIENT_KTIMER is not set
+# CONFIG_PPS_CLIENT_LDISC is not set
+# CONFIG_PPS_CLIENT_GPIO is not set

 #
 # PPS generators support
@ -2169,22 +2197,40 @@ CONFIG_SPI_ORION=y
 #
 # PTP clock support
 #
+CONFIG_PTP_1588_CLOCK=y

 #
-# Enable Device Drivers -> PPS to see the PTP clock options.
+# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
+CONFIG_PTP_1588_CLOCK_PCH=y
+CONFIG_PINCTRL=y
+
+#
+# Pin controllers
+#
+CONFIG_PINMUX=y
+CONFIG_PINCONF=y
+# CONFIG_DEBUG_PINCTRL is not set
+CONFIG_PINCTRL_SINGLE=y
+# CONFIG_PINCTRL_EXYNOS4 is not set
+# CONFIG_PINCTRL_EXYNOS5440 is not set
+CONFIG_PINCTRL_MVEBU=y
+CONFIG_PINCTRL_KIRKWOOD=y
 CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_GPIOLIB=y
 CONFIG_OF_GPIO=y
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_GENERIC=y

 #
 # Memory mapped GPIO drivers:
 #
 # CONFIG_GPIO_GENERIC_PLATFORM is not set
 # CONFIG_GPIO_EM is not set
+CONFIG_GPIO_MVEBU=y
+# CONFIG_GPIO_TS5500 is not set
 # CONFIG_GPIO_VX855 is not set

 #
@ -2219,6 +2265,10 @@ CONFIG_GPIO_SYSFS=y
 #
 # MODULbus GPIO expanders:
 #
+
+#
+# USB GPIO expanders:
+#
 CONFIG_W1=m

 #
@ -2229,7 +2279,6 @@ CONFIG_W1_MASTER_DS2490=m
 CONFIG_W1_MASTER_DS2482=m
 # CONFIG_W1_MASTER_DS1WM is not set
 CONFIG_W1_MASTER_GPIO=m
-# CONFIG_HDQ_MASTER_OMAP is not set

 #
 # 1-wire Slaves
@ -2258,10 +2307,15 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_BATTERY_BQ27x00 is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
+# CONFIG_CHARGER_ISP1704 is not set
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_GPIO is not set
+# CONFIG_CHARGER_MANAGER is not set
+# CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
+CONFIG_POWER_RESET=y
+CONFIG_POWER_RESET_GPIO=y
 # CONFIG_POWER_AVS is not set
 CONFIG_HWMON=m
 # CONFIG_HWMON_VID is not set
@ -2371,6 +2425,12 @@ CONFIG_SENSORS_LM90=m
 # CONFIG_SENSORS_W83627EHF is not set
 CONFIG_THERMAL=m
 CONFIG_THERMAL_HWMON=y
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
+# CONFIG_FAIR_SHARE is not set
+CONFIG_STEP_WISE=y
+# CONFIG_USER_SPACE is not set
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@ -2411,6 +2471,7 @@ CONFIG_SSB_SDIOHOST_POSSIBLE=y
 # CONFIG_SSB_DEBUG is not set
 CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
 CONFIG_SSB_DRIVER_PCICORE=y
+# CONFIG_SSB_DRIVER_GPIO is not set
 CONFIG_BCMA_POSSIBLE=y

 #
@ -2423,7 +2484,9 @@ CONFIG_BCMA_POSSIBLE=y
 #
 # CONFIG_MFD_CORE is not set
 # CONFIG_MFD_SM501 is not set
+# CONFIG_MFD_RTSX_PCI is not set
 # CONFIG_MFD_ASIC3 is not set
+# CONFIG_MFD_TI_AM335X_TSCADC is not set
 # CONFIG_HTC_EGPIO is not set
 # CONFIG_HTC_PASIC3 is not set
 # CONFIG_MFD_LM3533 is not set
@ -2454,7 +2517,30 @@ CONFIG_BCMA_POSSIBLE=y
 # CONFIG_MFD_VX855 is not set
 # CONFIG_MFD_WL1273_CORE is not set
 # CONFIG_MFD_SYSCON is not set
-# CONFIG_REGULATOR is not set
+# CONFIG_MFD_VIPERBOARD is not set
+# CONFIG_MFD_RETU is not set
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_DEBUG is not set
+# CONFIG_REGULATOR_DUMMY is not set
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
+# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
+# CONFIG_REGULATOR_GPIO is not set
+# CONFIG_REGULATOR_AD5398 is not set
+# CONFIG_REGULATOR_FAN53555 is not set
+# CONFIG_REGULATOR_ISL6271A is not set
+# CONFIG_REGULATOR_MAX1586 is not set
+# CONFIG_REGULATOR_MAX8649 is not set
+# CONFIG_REGULATOR_MAX8660 is not set
+# CONFIG_REGULATOR_MAX8952 is not set
+# CONFIG_REGULATOR_MAX8973 is not set
+# CONFIG_REGULATOR_LP3971 is not set
+# CONFIG_REGULATOR_LP3972 is not set
+# CONFIG_REGULATOR_TPS51632 is not set
+# CONFIG_REGULATOR_TPS62360 is not set
+# CONFIG_REGULATOR_TPS65023 is not set
+# CONFIG_REGULATOR_TPS6507X is not set
+# CONFIG_REGULATOR_TPS6524X is not set
 CONFIG_MEDIA_SUPPORT=m

 #
@ -2562,6 +2648,7 @@ CONFIG_LCD_CLASS_DEVICE=m
 # 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_PLATFORM is not set
@ -2587,6 +2674,7 @@ CONFIG_FRAMEBUFFER_CONSOLE=m
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
 # CONFIG_LOGO is not set
+# CONFIG_FB_SSD1307 is not set
 CONFIG_SOUND=m
 # CONFIG_SOUND_OSS_CORE is not set
 CONFIG_SND=m
@ -2663,6 +2751,7 @@ CONFIG_HID_KYE=m
 CONFIG_HID_UCLOGIC=m
 CONFIG_HID_WALTOP=m
 CONFIG_HID_GYRATION=m
+CONFIG_HID_ICADE=m
 CONFIG_HID_TWINHAN=m
 CONFIG_HID_KENSINGTON=m
 # CONFIG_HID_LCPOWER is not set
@ -2717,6 +2806,11 @@ CONFIG_HID_ZYDACRON=m
 CONFIG_USB_HID=m
 # CONFIG_HID_PID is not set
 CONFIG_USB_HIDDEV=y
+
+#
+# I2C HID support
+#
+# CONFIG_I2C_HID is not set
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
 CONFIG_USB_ARCH_HAS_XHCI=y
@ -2746,6 +2840,7 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_EHCI_PCI=y
 # CONFIG_USB_OXU210HP_HCD is not set
 # CONFIG_USB_ISP116X_HCD is not set
 # CONFIG_USB_ISP1760_HCD is not set
@ -2790,7 +2885,6 @@ CONFIG_USB_STORAGE_ONETOUCH=m
 # CONFIG_USB_STORAGE_KARMA is not set
 # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
 # CONFIG_USB_STORAGE_ENE_UB6250 is not set
-CONFIG_USB_UAS=m

 #
 # USB Imaging devices
@ -2899,13 +2993,14 @@ CONFIG_USB_EZUSB_FX2=m
 #
 # USB Physical Layer drivers
 #
-# CONFIG_OMAP_USB2 is not set
 # CONFIG_USB_ISP1301 is not set
+CONFIG_USB_RCAR_PHY=m
 # CONFIG_USB_GADGET is not set

 #
 # OTG and related infrastructure
 #
+CONFIG_USB_OTG_UTILS=y
 # CONFIG_USB_GPIO_VBUS is not set
 # CONFIG_USB_ULPI is not set
 # CONFIG_NOP_USB_XCEIV is not set
@ -2959,8 +3054,10 @@ CONFIG_LEDS_GPIO=y
 # CONFIG_LEDS_PCA955X is not set
 # CONFIG_LEDS_PCA9633 is not set
 # CONFIG_LEDS_DAC124S085 is not set
+CONFIG_LEDS_REGULATOR=m
 # CONFIG_LEDS_BD2802 is not set
 # CONFIG_LEDS_LT3593 is not set
+CONFIG_LEDS_NS2=y
 # CONFIG_LEDS_RENESAS_TPU is not set
 # CONFIG_LEDS_TCA6507 is not set
 # CONFIG_LEDS_LM355x is not set
@ -3013,6 +3110,7 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_ISL1208 is not set
 # CONFIG_RTC_DRV_ISL12022 is not set
 # CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_PCF8523 is not set
 # CONFIG_RTC_DRV_PCF8563 is not set
 # CONFIG_RTC_DRV_PCF8583 is not set
 # CONFIG_RTC_DRV_M41T80 is not set
@ -3104,7 +3202,6 @@ CONFIG_R8187SE=m
 CONFIG_RTL8192U=m
 # CONFIG_RTLLIB is not set
 CONFIG_R8712U=y
-# CONFIG_RTS_PSTOR is not set
 # CONFIG_RTS5139 is not set
 # CONFIG_TRANZPORT is not set
 # CONFIG_IDE_PHISON is not set
@ -3115,7 +3212,7 @@ CONFIG_USB_SERIAL_QUATECH2=m
 # CONFIG_DX_SEP is not set
 # CONFIG_ZRAM is not set
 # CONFIG_ZCACHE is not set
-CONFIG_ZSMALLOC=y
+# CONFIG_ZSMALLOC is not set
 # CONFIG_FB_SM7XX is not set
 # CONFIG_CRYSTALHD is not set
 CONFIG_FB_XGI=m
@ -3135,9 +3232,7 @@ CONFIG_FB_XGI=m
 # Android
 #
 # CONFIG_ANDROID is not set
-# CONFIG_PHONE is not set
 # CONFIG_USB_WPAN_HCD is not set
-# CONFIG_IPACK_BUS is not set
 # CONFIG_WIMAX_GDM72XX is not set
 # CONFIG_CSR_WIFI is not set
 CONFIG_ZCACHE2=y
@ -3146,6 +3241,7 @@ CONFIG_NET_VENDOR_SILICOM=y
 # CONFIG_BPCTL is not set
 # CONFIG_CED1401 is not set
 # CONFIG_DGRP is not set
+# CONFIG_SB105X is not set
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
@ -3154,6 +3250,8 @@ CONFIG_COMMON_CLK=y
 # Common Clock Framework
 #
 # CONFIG_COMMON_CLK_DEBUG is not set
+CONFIG_MVEBU_CLK_CORE=y
+CONFIG_MVEBU_CLK_GATING=y

 #
 # Hardware Spinlock drivers
@ -3177,6 +3275,7 @@ CONFIG_OF_IOMMU=y
 # CONFIG_IIO is not set
 # CONFIG_VME_BUS is not set
 # CONFIG_PWM is not set
+# CONFIG_IPACK_BUS is not set

 #
 # File systems
@ -3192,7 +3291,6 @@ CONFIG_EXT3_FS_XATTR=y
 CONFIG_EXT3_FS_POSIX_ACL=y
 # CONFIG_EXT3_FS_SECURITY is not set
 CONFIG_EXT4_FS=y
-CONFIG_EXT4_FS_XATTR=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 # CONFIG_EXT4_FS_SECURITY is not set
 # CONFIG_EXT4_DEBUG is not set
@ -3336,6 +3434,7 @@ CONFIG_ROMFS_ON_BLOCK=y
 # CONFIG_PSTORE is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
+# CONFIG_F2FS_FS is not set
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
 CONFIG_NFS_V2=m
@ -3367,6 +3466,7 @@ CONFIG_CIFS=m
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
 # CONFIG_CIFS_ACL is not set
+CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_DFS_UPCALL is not set
 # CONFIG_CIFS_SMB2 is not set
@ -3560,6 +3660,7 @@ CONFIG_SECURITY_NETWORK=y
 # CONFIG_SECURITY_NETWORK_XFRM is not set
 CONFIG_SECURITY_PATH=y
 # CONFIG_SECURITY_SELINUX is not set
+# CONFIG_SECURITY_SMACK is not set
 CONFIG_SECURITY_TOMOYO=y
 CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
 CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
@ -3663,6 +3764,7 @@ CONFIG_CRYPTO_ARC4=y
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_BLOWFISH_COMMON=m
 CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST_COMMON=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_DES=y
@ -3703,6 +3805,7 @@ CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IO=y
+CONFIG_PERCPU_RWSEM=y
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
 # CONFIG_CRC_T10DIF is not set
@ -3746,6 +3849,7 @@ CONFIG_DQL=y
 CONFIG_NLATTR=y
 CONFIG_GENERIC_ATOMIC64=y
 CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
+CONFIG_LRU_CACHE=m
 CONFIG_AVERAGE=y
 # CONFIG_CORDIC is not set
 # CONFIG_DDR is not set
--- a/core/linux-kirkwood-dt/dts-bootarg-wipe.patch
+++ b/core/linux-kirkwood-dt/dts-bootarg-wipe.patch
@ -1,6 +1,6 @@
 diff -ruN a/arch/arm/boot/dts/kirkwood-dns320.dts b/arch/arm/boot/dts/kirkwood-dns320.dts
--- a/arch/arm/boot/dts/kirkwood-dns320.dts	2012-10-11 10:40:49.000000000 -0400
-+++ b/arch/arm/boot/dts/kirkwood-dns320.dts	2012-10-11 10:44:31.000000000 -0400
+--- a/arch/arm/boot/dts/kirkwood-dns320.dts	2012-12-21 20:19:00.000000000 -0500
+++ b/arch/arm/boot/dts/kirkwood-dns320.dts	2012-12-24 11:35:26.000000000 -0500
@@ -12,7 +12,7 @@
 	};
 
@ -11,8 +11,8 @@ diff -ruN a/arch/arm/boot/dts/kirkwood-dns320.dts b/arch/arm/boot/dts/kirkwood-d
 
 	gpio-leds {
 diff -ruN a/arch/arm/boot/dts/kirkwood-dns325.dts b/arch/arm/boot/dts/kirkwood-dns325.dts
--- a/arch/arm/boot/dts/kirkwood-dns325.dts	2012-10-11 10:40:49.000000000 -0400
-+++ b/arch/arm/boot/dts/kirkwood-dns325.dts	2012-10-11 10:44:59.000000000 -0400
+--- a/arch/arm/boot/dts/kirkwood-dns325.dts	2012-12-21 20:19:00.000000000 -0500
+++ b/arch/arm/boot/dts/kirkwood-dns325.dts	2012-12-24 11:35:43.000000000 -0500
@@ -12,7 +12,7 @@
 	};
 
@ -23,9 +23,9 @@ diff -ruN a/arch/arm/boot/dts/kirkwood-dns325.dts b/arch/arm/boot/dts/kirkwood-d
 
 	gpio-leds {
 diff -ruN a/arch/arm/boot/dts/kirkwood-dockstar.dts b/arch/arm/boot/dts/kirkwood-dockstar.dts
--- a/arch/arm/boot/dts/kirkwood-dockstar.dts	2012-10-11 10:40:49.000000000 -0400
-+++ b/arch/arm/boot/dts/kirkwood-dockstar.dts	2012-10-11 10:46:05.000000000 -0400
-@@ -12,7 +12,7 @@
+--- a/arch/arm/boot/dts/kirkwood-dockstar.dts	2012-12-21 20:19:00.000000000 -0500
+++ b/arch/arm/boot/dts/kirkwood-dockstar.dts	2012-12-24 11:36:38.000000000 -0500
+@@ -13,7 +13,7 @@
 	};
 
 	chosen {
@ -35,9 +35,9 @@ diff -ruN a/arch/arm/boot/dts/kirkwood-dockstar.dts b/arch/arm/boot/dts/kirkwood
 
 	ocp@f1000000 {
 diff -ruN a/arch/arm/boot/dts/kirkwood-dreamplug.dts b/arch/arm/boot/dts/kirkwood-dreamplug.dts
--- a/arch/arm/boot/dts/kirkwood-dreamplug.dts	2012-10-11 10:40:49.000000000 -0400
-+++ b/arch/arm/boot/dts/kirkwood-dreamplug.dts	2012-10-11 10:46:21.000000000 -0400
-@@ -12,7 +12,7 @@
+--- a/arch/arm/boot/dts/kirkwood-dreamplug.dts	2012-12-21 20:19:00.000000000 -0500
+++ b/arch/arm/boot/dts/kirkwood-dreamplug.dts	2012-12-24 11:36:58.000000000 -0500
+@@ -13,7 +13,7 @@
 	};
 
 	chosen {
@ -47,9 +47,9 @@ diff -ruN a/arch/arm/boot/dts/kirkwood-dreamplug.dts b/arch/arm/boot/dts/kirkwoo
 
 	ocp@f1000000 {
 diff -ruN a/arch/arm/boot/dts/kirkwood-goflexnet.dts b/arch/arm/boot/dts/kirkwood-goflexnet.dts
--- a/arch/arm/boot/dts/kirkwood-goflexnet.dts	2012-10-11 10:40:49.000000000 -0400
-+++ b/arch/arm/boot/dts/kirkwood-goflexnet.dts	2012-10-11 10:46:44.000000000 -0400
-@@ -12,7 +12,7 @@
+--- a/arch/arm/boot/dts/kirkwood-goflexnet.dts	2012-12-21 20:19:00.000000000 -0500
+++ b/arch/arm/boot/dts/kirkwood-goflexnet.dts	2012-12-24 11:37:18.000000000 -0500
+@@ -13,7 +13,7 @@
 	};
 
 	chosen {
@ -59,9 +59,9 @@ diff -ruN a/arch/arm/boot/dts/kirkwood-goflexnet.dts b/arch/arm/boot/dts/kirkwoo
 
 	ocp@f1000000 {
 diff -ruN a/arch/arm/boot/dts/kirkwood-ib62x0.dts b/arch/arm/boot/dts/kirkwood-ib62x0.dts
--- a/arch/arm/boot/dts/kirkwood-ib62x0.dts	2012-10-11 10:40:49.000000000 -0400
-+++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts	2012-10-11 10:46:58.000000000 -0400
-@@ -12,7 +12,7 @@
+--- a/arch/arm/boot/dts/kirkwood-ib62x0.dts	2012-12-21 20:19:00.000000000 -0500
+++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts	2012-12-24 11:37:36.000000000 -0500
+@@ -13,7 +13,7 @@
 	};
 
 	chosen {
@ -71,21 +71,23 @@ diff -ruN a/arch/arm/boot/dts/kirkwood-ib62x0.dts b/arch/arm/boot/dts/kirkwood-i
 
 	ocp@f1000000 {
 diff -ruN a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood-iconnect.dts
--- a/arch/arm/boot/dts/kirkwood-iconnect.dts	2012-10-11 10:40:49.000000000 -0400
-+++ b/arch/arm/boot/dts/kirkwood-iconnect.dts	2012-10-11 10:47:18.000000000 -0400
-@@ -12,7 +12,7 @@
+--- a/arch/arm/boot/dts/kirkwood-iconnect.dts	2012-12-21 20:19:00.000000000 -0500
+++ b/arch/arm/boot/dts/kirkwood-iconnect.dts	2012-12-24 11:38:01.000000000 -0500
+@@ -13,9 +13,7 @@
 	};
 
 	chosen {
 -		bootargs = "console=ttyS0,115200n8 earlyprintk";
+-		linux,initrd-start = <0x4500040>;
+-		linux,initrd-end   = <0x4800000>;
 +		bootargs = "";
- 		linux,initrd-start = <0x4500040>;
- 		linux,initrd-end   = <0x4800000>;
 	};
+ 
+ 	ocp@f1000000 {
 diff -ruN a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
--- a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts	2012-10-11 10:40:49.000000000 -0400
-+++ b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts	2012-10-11 10:47:33.000000000 -0400
-@@ -12,7 +12,7 @@
+--- a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts	2012-12-21 20:19:00.000000000 -0500
+++ b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts	2012-12-24 11:38:17.000000000 -0500
+@@ -13,7 +13,7 @@
 	};
 
 	chosen {
@ -95,9 +97,9 @@ diff -ruN a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts b/arch/arm/boot/dts/ki
 
 	ocp@f1000000 {
 diff -ruN a/arch/arm/boot/dts/kirkwood-km_kirkwood.dts b/arch/arm/boot/dts/kirkwood-km_kirkwood.dts
--- a/arch/arm/boot/dts/kirkwood-km_kirkwood.dts	2012-10-11 10:40:49.000000000 -0400
-+++ b/arch/arm/boot/dts/kirkwood-km_kirkwood.dts	2012-10-11 10:47:49.000000000 -0400
-@@ -12,7 +12,7 @@
+--- a/arch/arm/boot/dts/kirkwood-km_kirkwood.dts	2012-12-21 20:19:00.000000000 -0500
+++ b/arch/arm/boot/dts/kirkwood-km_kirkwood.dts	2012-12-24 11:38:58.000000000 -0500
+@@ -13,7 +13,7 @@
 	};
 
 	chosen {
@ -107,9 +109,9 @@ diff -ruN a/arch/arm/boot/dts/kirkwood-km_kirkwood.dts b/arch/arm/boot/dts/kirkw
 
 	ocp@f1000000 {
 diff -ruN a/arch/arm/boot/dts/kirkwood-lsxl.dtsi b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
--- a/arch/arm/boot/dts/kirkwood-lsxl.dtsi	2012-10-11 10:40:49.000000000 -0400
-+++ b/arch/arm/boot/dts/kirkwood-lsxl.dtsi	2012-10-11 10:48:08.000000000 -0400
-@@ -2,7 +2,7 @@
+--- a/arch/arm/boot/dts/kirkwood-lsxl.dtsi	2012-12-21 20:19:00.000000000 -0500
+++ b/arch/arm/boot/dts/kirkwood-lsxl.dtsi	2012-12-24 11:39:36.000000000 -0500
+@@ -3,7 +3,7 @@
 
 / {
 	chosen {
@ -117,10 +119,70 @@ diff -ruN a/arch/arm/boot/dts/kirkwood-lsxl.dtsi b/arch/arm/boot/dts/kirkwood-ls
 +		bootargs = "";
 	};
 
+ 	ocp@f1000000 {
+diff -ruN a/arch/arm/boot/dts/kirkwood-mplcec4.dts b/arch/arm/boot/dts/kirkwood-mplcec4.dts
+--- a/arch/arm/boot/dts/kirkwood-mplcec4.dts	2012-12-21 20:19:00.000000000 -0500
+++ b/arch/arm/boot/dts/kirkwood-mplcec4.dts	2012-12-24 11:39:56.000000000 -0500
+@@ -13,7 +13,7 @@
+         };
+ 
+         chosen {
+-                bootargs = "console=ttyS0,115200n8 earlyprintk";
+                bootargs = "";
+         };
+ 
+ 	ocp@f1000000 {
+diff -ruN a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
+--- a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi	2012-12-21 20:19:00.000000000 -0500
+++ b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi	2012-12-24 11:40:11.000000000 -0500
+@@ -2,7 +2,7 @@
+ 
+ / {
+ 	chosen {
+-		bootargs = "console=ttyS0,115200n8";
+		bootargs = "";
+ 	};
+ 
+ 	ocp@f1000000 {
+diff -ruN a/arch/arm/boot/dts/kirkwood-nsa310.dts b/arch/arm/boot/dts/kirkwood-nsa310.dts
+--- a/arch/arm/boot/dts/kirkwood-nsa310.dts	2012-12-21 20:19:00.000000000 -0500
+++ b/arch/arm/boot/dts/kirkwood-nsa310.dts	2012-12-24 11:41:02.000000000 -0500
+@@ -12,7 +12,7 @@
+ 	};
+ 
+ 	chosen {
+-		bootargs = "console=ttyS0,115200";
+		bootargs = "";
+ 	};
+ 
+ 	ocp@f1000000 {
+diff -ruN a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
+--- a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts	2012-12-21 20:19:00.000000000 -0500
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts	2012-12-24 11:41:20.000000000 -0500
+@@ -13,7 +13,7 @@
+ 	};
+ 
+ 	chosen {
+-		bootargs = "console=ttyS0,115200n8 earlyprintk";
+		bootargs = "";
+ 	};
+ 
+ 	ocp@f1000000 {
+diff -ruN a/arch/arm/boot/dts/kirkwood-topkick.dts b/arch/arm/boot/dts/kirkwood-topkick.dts
+--- a/arch/arm/boot/dts/kirkwood-topkick.dts	2012-12-21 20:19:00.000000000 -0500
+++ b/arch/arm/boot/dts/kirkwood-topkick.dts	2012-12-24 11:41:40.000000000 -0500
+@@ -12,7 +12,7 @@
+ 	};
+ 
+ 	chosen {
+-		bootargs = "console=ttyS0,115200n8 earlyprintk";
+		bootargs = "";
+ 	};
+ 
 	ocp@f1000000 {
 diff -ruN a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-ts219.dtsi
--- a/arch/arm/boot/dts/kirkwood-ts219.dtsi	2012-10-11 10:40:49.000000000 -0400
-+++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi	2012-10-11 10:48:27.000000000 -0400
+--- a/arch/arm/boot/dts/kirkwood-ts219.dtsi	2012-12-21 20:19:00.000000000 -0500
+++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi	2012-12-24 11:42:09.000000000 -0500
@@ -10,7 +10,7 @@
 	};
 
--- a/core/linux-kirkwood-dt/linux-kirkwood-dt.install
+++ b/core/linux-kirkwood-dt/linux-kirkwood-dt.install
@ -2,7 +2,7 @@
 # arg 2:  the old package version

 KERNEL_NAME=-kirkwood-dt
-KERNEL_VERSION=3.7.0-0-next-20121016-ARCH+
+KERNEL_VERSION=3.8.0-0-ARCH+

 post_install () {
  # updating module dependencies
--- a/core/linux-kirkwood-dt/read_current_timer2.patch
+++ b/core/linux-kirkwood-dt/read_current_timer2.patch
@ -1,12 +0,0 @@
-diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
-index 60d3b73..6a37f8d 100644
--- a/arch/arm/kernel/armksyms.c
-+++ b/arch/arm/kernel/armksyms.c
-@@ -50,6 +50,7 @@ extern void fpundefinstr(void);
- 
-        /* platform dependent support */
- EXPORT_SYMBOL(arm_delay_ops);
-+EXPORT_SYMBOL(read_current_timer);
- 
-        /* networking */
- EXPORT_SYMBOL(csum_partial);