make a bootable system configuration for raspberry pi

15 files changed, 4306 insertions, 3053 deletions

diff --git a/target/linux/patches/3.9.8/bsd-compatibility.patch b/target/linux/patches/3.9.9/bsd-compatibility.patch
index 9e55150cc..9e55150cc 100644
--- a/target/linux/patches/3.9.8/bsd-compatibility.patch
+++ b/target/linux/patches/3.9.9/bsd-compatibility.patch
diff --git a/target/linux/patches/3.9.8/cris-etrax.patch b/target/linux/patches/3.9.9/cris-etrax.patch
index a80d9a8b8..a80d9a8b8 100644
--- a/target/linux/patches/3.9.8/cris-etrax.patch
+++ b/target/linux/patches/3.9.9/cris-etrax.patch
diff --git a/target/linux/patches/3.9.8/defaults.patch b/target/linux/patches/3.9.9/defaults.patch
index 58aae610b..58aae610b 100644
--- a/target/linux/patches/3.9.8/defaults.patch
+++ b/target/linux/patches/3.9.9/defaults.patch
diff --git a/target/linux/patches/3.9.8/disable-netfilter.patch b/target/linux/patches/3.9.9/disable-netfilter.patch
index 7b1ca013a..7b1ca013a 100644
--- a/target/linux/patches/3.9.8/disable-netfilter.patch
+++ b/target/linux/patches/3.9.9/disable-netfilter.patch
diff --git a/target/linux/patches/3.9.8/gemalto.patch b/target/linux/patches/3.9.9/gemalto.patch
index 65f7af1d7..65f7af1d7 100644
--- a/target/linux/patches/3.9.8/gemalto.patch
+++ b/target/linux/patches/3.9.9/gemalto.patch
diff --git a/target/linux/patches/3.9.8/lemote-rfkill.patch b/target/linux/patches/3.9.9/lemote-rfkill.patch
index a61488434..a61488434 100644
--- a/target/linux/patches/3.9.8/lemote-rfkill.patch
+++ b/target/linux/patches/3.9.9/lemote-rfkill.patch
diff --git a/target/linux/patches/3.9.8/mtd-rootfs.patch b/target/linux/patches/3.9.9/mtd-rootfs.patch
index 775d5fc80..775d5fc80 100644
--- a/target/linux/patches/3.9.8/mtd-rootfs.patch
+++ b/target/linux/patches/3.9.9/mtd-rootfs.patch
diff --git a/target/linux/patches/3.9.8/non-static.patch b/target/linux/patches/3.9.9/non-static.patch
index a967703d0..a967703d0 100644
--- a/target/linux/patches/3.9.8/non-static.patch
+++ b/target/linux/patches/3.9.9/non-static.patch
diff --git a/target/linux/patches/3.9.8/raspberry.patch b/target/linux/patches/3.9.9/raspberry.patch
index 77864a952..f50fc05c7 100644
--- a/target/linux/patches/3.9.8/raspberry.patch
+++ b/target/linux/patches/3.9.9/raspberry.patch
@@ -1,7 +1,7 @@
-diff -Nur linux-3.8.10.orig/arch/arm/configs/bcmrpi_defconfig linux-3.8.10/arch/arm/configs/bcmrpi_defconfig
---- linux-3.8.10.orig/arch/arm/configs/bcmrpi_defconfig	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.8.10/arch/arm/configs/bcmrpi_defconfig	2013-05-06 12:49:35.000000000 +0200
-@@ -0,0 +1,1032 @@
+diff -Nur linux-3.9.9/arch/arm/configs/bcmrpi_defconfig linux-rpi/arch/arm/configs/bcmrpi_defconfig
+--- linux-3.9.9/arch/arm/configs/bcmrpi_defconfig	1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/configs/bcmrpi_defconfig	2013-07-08 13:33:14.000000000 +0200
+@@ -0,0 +1,1034 @@
 +# CONFIG_ARM_PATCH_PHYS_VIRT is not set
 +CONFIG_EXPERIMENTAL=y
 +# CONFIG_LOCALVERSION_AUTO is not set
@@ -265,7 +265,6 @@ diff -Nur linux-3.8.10.orig/arch/arm/configs/bcmrpi_defconfig linux-3.8.10/arch/
 +CONFIG_BRIDGE_EBT_LOG=m
 +CONFIG_BRIDGE_EBT_ULOG=m
 +CONFIG_BRIDGE_EBT_NFLOG=m
-+CONFIG_IP_SCTP=m
 +CONFIG_L2TP=m
 +CONFIG_BRIDGE=m
 +CONFIG_VLAN_8021Q=m
@@ -853,6 +852,7 @@ diff -Nur linux-3.8.10.orig/arch/arm/configs/bcmrpi_defconfig linux-3.8.10/arch/
 +CONFIG_MMC_SDHCI_BCM2708=y
 +CONFIG_MMC_SDHCI_BCM2708_DMA=y
 +CONFIG_MMC_SPI=m
++CONFIG_LEDS_GPIO=m
 +CONFIG_RTC_CLASS=y
 +# CONFIG_RTC_HCTOSYS is not set
 +CONFIG_RTC_DRV_DS1307=m
@@ -920,6 +920,7 @@ diff -Nur linux-3.8.10.orig/arch/arm/configs/bcmrpi_defconfig linux-3.8.10/arch/
 +CONFIG_XFS_POSIX_ACL=y
 +CONFIG_XFS_RT=y
 +CONFIG_GFS2_FS=m
++CONFIG_GFS2_FS_LOCKING_DLM=y
 +CONFIG_OCFS2_FS=m
 +CONFIG_BTRFS_FS=m
 +CONFIG_BTRFS_FS_POSIX_ACL=y
@@ -1004,6 +1005,7 @@ diff -Nur linux-3.8.10.orig/arch/arm/configs/bcmrpi_defconfig linux-3.8.10/arch/
 +CONFIG_NLS_ISO8859_15=m
 +CONFIG_NLS_KOI8_R=m
 +CONFIG_NLS_KOI8_U=m
++CONFIG_DLM=m
 +CONFIG_PRINTK_TIME=y
 +CONFIG_DEBUG_FS=y
 +CONFIG_DETECT_HUNG_TASK=y
@@ -1034,9 +1036,9 @@ diff -Nur linux-3.8.10.orig/arch/arm/configs/bcmrpi_defconfig linux-3.8.10/arch/
 +# CONFIG_CRYPTO_HW is not set
 +CONFIG_CRC_ITU_T=y
 +CONFIG_LIBCRC32C=y
-diff -Nur linux-3.8.10.orig/arch/arm/configs/bcmrpi_emergency_defconfig linux-3.8.10/arch/arm/configs/bcmrpi_emergency_defconfig
---- linux-3.8.10.orig/arch/arm/configs/bcmrpi_emergency_defconfig	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.8.10/arch/arm/configs/bcmrpi_emergency_defconfig	2013-05-06 12:49:35.000000000 +0200
+diff -Nur linux-3.9.9/arch/arm/configs/bcmrpi_emergency_defconfig linux-rpi/arch/arm/configs/bcmrpi_emergency_defconfig
+--- linux-3.9.9/arch/arm/configs/bcmrpi_emergency_defconfig	1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/configs/bcmrpi_emergency_defconfig	2013-07-08 13:33:14.000000000 +0200
 @@ -0,0 +1,533 @@
 +CONFIG_EXPERIMENTAL=y
 +# CONFIG_LOCALVERSION_AUTO is not set
@@ -1571,137 +1573,91 @@ diff -Nur linux-3.8.10.orig/arch/arm/configs/bcmrpi_emergency_defconfig linux-3.
 +CONFIG_CRC_ITU_T=y
 +CONFIG_LIBCRC32C=y
 +CONFIG_F2FS=y
-diff -Nur linux-3.8.10.orig/arch/arm/configs/bcmrpi_quick_defconfig linux-3.8.10/arch/arm/configs/bcmrpi_quick_defconfig
---- linux-3.8.10.orig/arch/arm/configs/bcmrpi_quick_defconfig	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.8.10/arch/arm/configs/bcmrpi_quick_defconfig	2013-05-06 12:49:35.000000000 +0200
-@@ -0,0 +1,298 @@
+diff -Nur linux-3.9.9/arch/arm/configs/bcmrpi_quick_defconfig linux-rpi/arch/arm/configs/bcmrpi_quick_defconfig
+--- linux-3.9.9/arch/arm/configs/bcmrpi_quick_defconfig	1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/configs/bcmrpi_quick_defconfig	2013-07-08 13:33:14.000000000 +0200
+@@ -0,0 +1,197 @@
 +# CONFIG_ARM_PATCH_PHYS_VIRT is not set
-+CONFIG_EXPERIMENTAL=y
 +CONFIG_LOCALVERSION="-quick"
 +# CONFIG_LOCALVERSION_AUTO is not set
++# CONFIG_SWAP is not set
 +CONFIG_SYSVIPC=y
 +CONFIG_POSIX_MQUEUE=y
-+CONFIG_BSD_PROCESS_ACCT=y
-+CONFIG_BSD_PROCESS_ACCT_V3=y
-+CONFIG_FHANDLE=y
-+CONFIG_TASKSTATS=y
-+CONFIG_TASK_DELAY_ACCT=y
-+CONFIG_TASK_XACCT=y
-+CONFIG_TASK_IO_ACCOUNTING=y
-+CONFIG_AUDIT=y
 +CONFIG_NO_HZ=y
 +CONFIG_HIGH_RES_TIMERS=y
 +CONFIG_IKCONFIG=y
 +CONFIG_IKCONFIG_PROC=y
-+CONFIG_CGROUP_FREEZER=y
-+CONFIG_CGROUP_DEVICE=y
-+CONFIG_CGROUP_CPUACCT=y
-+CONFIG_RESOURCE_COUNTERS=y
-+CONFIG_BLK_CGROUP=y
-+CONFIG_NAMESPACES=y
-+CONFIG_SCHED_AUTOGROUP=y
-+CONFIG_RELAY=y
++CONFIG_KALLSYMS_ALL=y
 +CONFIG_EMBEDDED=y
++CONFIG_PERF_EVENTS=y
 +# CONFIG_COMPAT_BRK is not set
 +CONFIG_SLAB=y
-+CONFIG_PROFILING=y
-+CONFIG_OPROFILE=m
-+CONFIG_KPROBES=y
 +CONFIG_MODULES=y
 +CONFIG_MODULE_UNLOAD=y
 +CONFIG_MODVERSIONS=y
 +CONFIG_MODULE_SRCVERSION_ALL=y
 +# CONFIG_BLK_DEV_BSG is not set
-+CONFIG_BLK_DEV_THROTTLING=y
-+CONFIG_PARTITION_ADVANCED=y
-+CONFIG_MAC_PARTITION=y
-+CONFIG_EFI_PARTITION=y
-+CONFIG_CFQ_GROUP_IOSCHED=y
 +CONFIG_ARCH_BCM2708=y
-+# CONFIG_BCM2708_GPIO is not set
-+# CONFIG_BCM2708_VCMEM is not set
 +CONFIG_PREEMPT=y
 +CONFIG_AEABI=y
 +CONFIG_UACCESS_WITH_MEMCPY=y
-+CONFIG_SECCOMP=y
-+CONFIG_CC_STACKPROTECTOR=y
 +CONFIG_ZBOOT_ROM_TEXT=0x0
 +CONFIG_ZBOOT_ROM_BSS=0x0
 +CONFIG_CMDLINE="dwc_otg.lpm_enable=0 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait"
-+CONFIG_KEXEC=y
 +CONFIG_CPU_FREQ=y
-+CONFIG_CPU_FREQ_STAT=m
 +CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE=y
 +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 +CONFIG_CPU_FREQ_GOV_USERSPACE=y
 +CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-+# CONFIG_ARM_BCM2835_CPUFREQ is not set
 +CONFIG_CPU_IDLE=y
 +CONFIG_VFP=y
-+CONFIG_BINFMT_MISC=m
++CONFIG_BINFMT_MISC=y
 +CONFIG_NET=y
 +CONFIG_PACKET=y
 +CONFIG_UNIX=y
-+CONFIG_XFRM_USER=y
-+CONFIG_NET_KEY=m
 +CONFIG_INET=y
 +CONFIG_IP_MULTICAST=y
-+CONFIG_IP_ADVANCED_ROUTER=y
-+CONFIG_IP_MULTIPLE_TABLES=y
-+CONFIG_IP_ROUTE_MULTIPATH=y
-+CONFIG_IP_ROUTE_VERBOSE=y
 +CONFIG_IP_PNP=y
 +CONFIG_IP_PNP_DHCP=y
 +CONFIG_IP_PNP_RARP=y
-+CONFIG_NET_IPIP=m
 +CONFIG_SYN_COOKIES=y
-+CONFIG_INET_AH=m
-+CONFIG_INET_ESP=m
-+CONFIG_INET_IPCOMP=m
-+CONFIG_INET_XFRM_MODE_TRANSPORT=m
-+CONFIG_INET_XFRM_MODE_TUNNEL=m
-+CONFIG_INET_XFRM_MODE_BEET=m
-+CONFIG_INET_LRO=m
-+CONFIG_INET_DIAG=m
++# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
++# CONFIG_INET_XFRM_MODE_TUNNEL is not set
++# CONFIG_INET_XFRM_MODE_BEET is not set
++# CONFIG_INET_LRO is not set
++# CONFIG_INET_DIAG is not set
 +# CONFIG_IPV6 is not set
-+CONFIG_L2TP=m
-+CONFIG_NET_PKTGEN=m
 +# CONFIG_WIRELESS is not set
-+CONFIG_WIMAX=m
-+CONFIG_NET_9P=m
-+CONFIG_NFC=m
-+CONFIG_NFC_PN533=m
 +CONFIG_DEVTMPFS=y
 +CONFIG_DEVTMPFS_MOUNT=y
 +CONFIG_BLK_DEV_LOOP=y
-+CONFIG_BLK_DEV_CRYPTOLOOP=m
-+CONFIG_BLK_DEV_NBD=m
 +CONFIG_BLK_DEV_RAM=y
-+CONFIG_CDROM_PKTCDVD=m
-+CONFIG_EEPROM_93CX6=m
-+# CONFIG_BCM2708_VCHIQ is not set
 +CONFIG_SCSI=y
 +# CONFIG_SCSI_PROC_FS is not set
-+CONFIG_BLK_DEV_SD=y
-+CONFIG_CHR_DEV_ST=m
-+CONFIG_CHR_DEV_OSST=m
-+CONFIG_BLK_DEV_SR=m
-+CONFIG_SCSI_MULTI_LUN=y
 +# CONFIG_SCSI_LOWLEVEL is not set
 +CONFIG_NETDEVICES=y
-+CONFIG_MII=y
-+CONFIG_NETCONSOLE=m
-+CONFIG_TUN=m
-+CONFIG_PHYLIB=m
-+CONFIG_MDIO_BITBANG=m
-+CONFIG_SLIP=m
-+CONFIG_SLIP_COMPRESSED=y
++# CONFIG_NET_VENDOR_BROADCOM is not set
++# CONFIG_NET_VENDOR_CIRRUS is not set
++# CONFIG_NET_VENDOR_FARADAY is not set
++# CONFIG_NET_VENDOR_INTEL is not set
++# CONFIG_NET_VENDOR_MARVELL is not set
++# CONFIG_NET_VENDOR_MICREL is not set
++# CONFIG_NET_VENDOR_NATSEMI is not set
++# CONFIG_NET_VENDOR_SEEQ is not set
++# CONFIG_NET_VENDOR_STMICRO is not set
++# CONFIG_NET_VENDOR_WIZNET is not set
++CONFIG_USB_USBNET=y
++# CONFIG_USB_NET_AX8817X is not set
++# CONFIG_USB_NET_CDCETHER is not set
++# CONFIG_USB_NET_CDC_NCM is not set
++CONFIG_USB_NET_SMSC95XX=y
++# CONFIG_USB_NET_NET1080 is not set
++# CONFIG_USB_NET_CDC_SUBSET is not set
++# CONFIG_USB_NET_ZAURUS is not set
 +# CONFIG_WLAN is not set
-+CONFIG_INPUT_FF_MEMLESS=m
-+CONFIG_INPUT_POLLDEV=m
-+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-+CONFIG_INPUT_EVDEV=m
++# CONFIG_INPUT_MOUSEDEV is not set
++CONFIG_INPUT_EVDEV=y
 +# CONFIG_INPUT_KEYBOARD is not set
 +# CONFIG_INPUT_MOUSE is not set
 +# CONFIG_SERIO is not set
@@ -1711,171 +1667,116 @@ diff -Nur linux-3.8.10.orig/arch/arm/configs/bcmrpi_quick_defconfig linux-3.8.10
 +CONFIG_SERIAL_AMBA_PL011=y
 +CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 +CONFIG_TTY_PRINTK=y
-+# CONFIG_HW_RANDOM is not set
++CONFIG_HW_RANDOM=y
++CONFIG_HW_RANDOM_BCM2708=y
 +CONFIG_RAW_DRIVER=y
-+# CONFIG_HWMON is not set
++CONFIG_THERMAL=y
++CONFIG_THERMAL_BCM2835=y
++CONFIG_WATCHDOG=y
++CONFIG_BCM2708_WDT=y
++CONFIG_REGULATOR=y
++CONFIG_REGULATOR_DEBUG=y
++CONFIG_REGULATOR_FIXED_VOLTAGE=y
++CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
++CONFIG_REGULATOR_USERSPACE_CONSUMER=y
 +CONFIG_FB=y
 +CONFIG_FB_BCM2708=y
-+CONFIG_BACKLIGHT_LCD_SUPPORT=y
 +CONFIG_FRAMEBUFFER_CONSOLE=y
 +CONFIG_LOGO=y
 +# CONFIG_LOGO_LINUX_MONO is not set
 +# CONFIG_LOGO_LINUX_VGA16 is not set
 +CONFIG_SOUND=y
-+# CONFIG_USB_HID is not set
++CONFIG_SND=y
++CONFIG_SND_BCM2835=y
++# CONFIG_SND_USB is not set
 +CONFIG_USB=y
 +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 +CONFIG_USB_DWCOTG=y
-+CONFIG_USB_ACM=m
-+CONFIG_USB_MDC800=m
-+CONFIG_USB_MICROTEK=m
 +CONFIG_MMC=y
 +CONFIG_MMC_SDHCI=y
 +CONFIG_MMC_SDHCI_PLTFM=y
 +CONFIG_MMC_SDHCI_BCM2708=y
 +CONFIG_MMC_SDHCI_BCM2708_DMA=y
 +CONFIG_NEW_LEDS=y
-+CONFIG_LEDS_CLASS=m
++CONFIG_LEDS_CLASS=y
 +CONFIG_LEDS_TRIGGERS=y
-+CONFIG_LEDS_TRIGGER_TIMER=m
-+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
-+CONFIG_UIO=m
-+CONFIG_UIO_PDRV=m
-+CONFIG_UIO_PDRV_GENIRQ=m
 +# CONFIG_IOMMU_SUPPORT is not set
 +CONFIG_EXT4_FS=y
 +CONFIG_EXT4_FS_POSIX_ACL=y
 +CONFIG_EXT4_FS_SECURITY=y
-+CONFIG_REISERFS_FS=m
-+CONFIG_REISERFS_FS_XATTR=y
-+CONFIG_REISERFS_FS_POSIX_ACL=y
-+CONFIG_REISERFS_FS_SECURITY=y
-+CONFIG_JFS_FS=m
-+CONFIG_JFS_POSIX_ACL=y
-+CONFIG_JFS_SECURITY=y
-+CONFIG_XFS_FS=m
-+CONFIG_XFS_QUOTA=y
-+CONFIG_XFS_POSIX_ACL=y
-+CONFIG_XFS_RT=y
-+CONFIG_GFS2_FS=m
-+CONFIG_OCFS2_FS=m
-+CONFIG_BTRFS_FS=m
-+CONFIG_BTRFS_FS_POSIX_ACL=y
-+CONFIG_NILFS2_FS=m
 +CONFIG_AUTOFS4_FS=y
-+CONFIG_FUSE_FS=m
-+CONFIG_CUSE=m
 +CONFIG_FSCACHE=y
 +CONFIG_CACHEFILES=y
-+CONFIG_ISO9660_FS=m
-+CONFIG_JOLIET=y
-+CONFIG_ZISOFS=y
-+CONFIG_UDF_FS=m
 +CONFIG_MSDOS_FS=y
 +CONFIG_VFAT_FS=y
 +CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
-+CONFIG_NTFS_FS=m
 +CONFIG_TMPFS=y
 +CONFIG_TMPFS_POSIX_ACL=y
 +CONFIG_CONFIGFS_FS=y
-+CONFIG_SQUASHFS=m
-+CONFIG_SQUASHFS_XATTR=y
-+CONFIG_SQUASHFS_LZO=y
-+CONFIG_SQUASHFS_XZ=y
++# CONFIG_MISC_FILESYSTEMS is not set
 +CONFIG_NFS_FS=y
 +CONFIG_NFS_V3_ACL=y
 +CONFIG_NFS_V4=y
 +CONFIG_ROOT_NFS=y
 +CONFIG_NFS_FSCACHE=y
-+CONFIG_NFSD=m
-+CONFIG_NFSD_V3_ACL=y
-+CONFIG_NFSD_V4=y
-+CONFIG_CIFS=m
-+CONFIG_CIFS_WEAK_PW_HASH=y
-+CONFIG_CIFS_XATTR=y
-+CONFIG_CIFS_POSIX=y
-+CONFIG_9P_FS=m
-+CONFIG_9P_FS_POSIX_ACL=y
 +CONFIG_NLS_DEFAULT="utf8"
 +CONFIG_NLS_CODEPAGE_437=y
-+CONFIG_NLS_CODEPAGE_737=m
-+CONFIG_NLS_CODEPAGE_775=m
-+CONFIG_NLS_CODEPAGE_850=m
-+CONFIG_NLS_CODEPAGE_852=m
-+CONFIG_NLS_CODEPAGE_855=m
-+CONFIG_NLS_CODEPAGE_857=m
-+CONFIG_NLS_CODEPAGE_860=m
-+CONFIG_NLS_CODEPAGE_861=m
-+CONFIG_NLS_CODEPAGE_862=m
-+CONFIG_NLS_CODEPAGE_863=m
-+CONFIG_NLS_CODEPAGE_864=m
-+CONFIG_NLS_CODEPAGE_865=m
-+CONFIG_NLS_CODEPAGE_866=m
-+CONFIG_NLS_CODEPAGE_869=m
-+CONFIG_NLS_CODEPAGE_936=m
-+CONFIG_NLS_CODEPAGE_950=m
-+CONFIG_NLS_CODEPAGE_932=m
-+CONFIG_NLS_CODEPAGE_949=m
-+CONFIG_NLS_CODEPAGE_874=m
-+CONFIG_NLS_ISO8859_8=m
-+CONFIG_NLS_CODEPAGE_1250=m
-+CONFIG_NLS_CODEPAGE_1251=m
++CONFIG_NLS_CODEPAGE_737=y
++CONFIG_NLS_CODEPAGE_775=y
++CONFIG_NLS_CODEPAGE_850=y
++CONFIG_NLS_CODEPAGE_852=y
++CONFIG_NLS_CODEPAGE_855=y
++CONFIG_NLS_CODEPAGE_857=y
++CONFIG_NLS_CODEPAGE_860=y
++CONFIG_NLS_CODEPAGE_861=y
++CONFIG_NLS_CODEPAGE_862=y
++CONFIG_NLS_CODEPAGE_863=y
++CONFIG_NLS_CODEPAGE_864=y
++CONFIG_NLS_CODEPAGE_865=y
++CONFIG_NLS_CODEPAGE_866=y
++CONFIG_NLS_CODEPAGE_869=y
++CONFIG_NLS_CODEPAGE_936=y
++CONFIG_NLS_CODEPAGE_950=y
++CONFIG_NLS_CODEPAGE_932=y
++CONFIG_NLS_CODEPAGE_949=y
++CONFIG_NLS_CODEPAGE_874=y
++CONFIG_NLS_ISO8859_8=y
++CONFIG_NLS_CODEPAGE_1250=y
++CONFIG_NLS_CODEPAGE_1251=y
 +CONFIG_NLS_ASCII=y
-+CONFIG_NLS_ISO8859_1=m
-+CONFIG_NLS_ISO8859_2=m
-+CONFIG_NLS_ISO8859_3=m
-+CONFIG_NLS_ISO8859_4=m
-+CONFIG_NLS_ISO8859_5=m
-+CONFIG_NLS_ISO8859_6=m
-+CONFIG_NLS_ISO8859_7=m
-+CONFIG_NLS_ISO8859_9=m
-+CONFIG_NLS_ISO8859_13=m
-+CONFIG_NLS_ISO8859_14=m
-+CONFIG_NLS_ISO8859_15=m
-+CONFIG_NLS_KOI8_R=m
-+CONFIG_NLS_KOI8_U=m
++CONFIG_NLS_ISO8859_1=y
++CONFIG_NLS_ISO8859_2=y
++CONFIG_NLS_ISO8859_3=y
++CONFIG_NLS_ISO8859_4=y
++CONFIG_NLS_ISO8859_5=y
++CONFIG_NLS_ISO8859_6=y
++CONFIG_NLS_ISO8859_7=y
++CONFIG_NLS_ISO8859_9=y
++CONFIG_NLS_ISO8859_13=y
++CONFIG_NLS_ISO8859_14=y
++CONFIG_NLS_ISO8859_15=y
++CONFIG_NLS_UTF8=y
 +CONFIG_PRINTK_TIME=y
 +CONFIG_DEBUG_FS=y
 +CONFIG_DETECT_HUNG_TASK=y
-+CONFIG_TIMER_STATS=y
 +# CONFIG_DEBUG_PREEMPT is not set
-+CONFIG_DEBUG_MEMORY_INIT=y
-+CONFIG_BOOT_PRINTK_DELAY=y
-+CONFIG_LATENCYTOP=y
-+# CONFIG_KPROBE_EVENT is not set
++# CONFIG_DEBUG_BUGVERBOSE is not set
++# CONFIG_FTRACE is not set
 +CONFIG_KGDB=y
 +CONFIG_KGDB_KDB=y
-+CONFIG_KDB_KEYBOARD=y
-+CONFIG_STRICT_DEVMEM=y
-+CONFIG_DEBUG_LL=y
-+CONFIG_DEBUG_BCM2708_UART0=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_CRYPTO_SEQIV=m
++# CONFIG_ARM_UNWIND is not set
 +CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_XTS=m
 +CONFIG_CRYPTO_HMAC=y
-+CONFIG_CRYPTO_XCBC=m
 +CONFIG_CRYPTO_MD5=y
-+CONFIG_CRYPTO_MICHAEL_MIC=m
 +CONFIG_CRYPTO_SHA1=y
-+CONFIG_CRYPTO_SHA256=m
-+CONFIG_CRYPTO_SHA512=m
-+CONFIG_CRYPTO_TGR192=m
-+CONFIG_CRYPTO_WP512=m
-+CONFIG_CRYPTO_AES=m
-+CONFIG_CRYPTO_CAST5=m
 +CONFIG_CRYPTO_DES=y
 +# CONFIG_CRYPTO_ANSI_CPRNG is not set
 +# CONFIG_CRYPTO_HW is not set
-+CONFIG_CRC_CCITT=m
 +CONFIG_CRC_ITU_T=y
-+CONFIG_CRC7=m
 +CONFIG_LIBCRC32C=y
-+CONFIG_AVERAGE=y
-diff -Nur linux-3.8.10.orig/arch/arm/include/asm/fiq.h linux-3.8.10/arch/arm/include/asm/fiq.h
---- linux-3.8.10.orig/arch/arm/include/asm/fiq.h	2013-04-26 21:18:32.000000000 +0200
-+++ linux-3.8.10/arch/arm/include/asm/fiq.h	2013-05-06 12:49:35.000000000 +0200
+diff -Nur linux-3.9.9/arch/arm/include/asm/fiq.h linux-rpi/arch/arm/include/asm/fiq.h
+--- linux-3.9.9/arch/arm/include/asm/fiq.h	2013-07-03 19:56:36.000000000 +0200
++++ linux-rpi/arch/arm/include/asm/fiq.h	2013-07-08 13:33:14.000000000 +0200
 @@ -42,6 +42,7 @@
  /* helpers defined in fiqasm.S: */
  extern void __set_fiq_regs(unsigned long const *regs);
@@ -1884,12 +1785,12 @@ diff -Nur linux-3.8.10.orig/arch/arm/include/asm/fiq.h linux-3.8.10/arch/arm/inc
  
  static inline void set_fiq_regs(struct pt_regs const *regs)
  {
-diff -Nur linux-3.8.10.orig/arch/arm/Kconfig linux-3.8.10/arch/arm/Kconfig
---- linux-3.8.10.orig/arch/arm/Kconfig	2013-04-26 21:18:32.000000000 +0200
-+++ linux-3.8.10/arch/arm/Kconfig	2013-05-06 12:49:35.000000000 +0200
-@@ -949,6 +949,23 @@
- 	help
- 	  Support for TI's OMAP platform (OMAP1/2/3/4).
+diff -Nur linux-3.9.9/arch/arm/Kconfig linux-rpi/arch/arm/Kconfig
+--- linux-3.9.9/arch/arm/Kconfig	2013-07-03 19:56:36.000000000 +0200
++++ linux-rpi/arch/arm/Kconfig	2013-07-08 13:33:14.000000000 +0200
+@@ -361,6 +361,23 @@
+ 	  This enables support for systems based on Atmel
+ 	  AT91RM9200 and AT91SAM9* processors.
  
 +config ARCH_BCM2708
 +	bool "Broadcom BCM2708 family"
@@ -1908,10 +1809,10 @@ diff -Nur linux-3.8.10.orig/arch/arm/Kconfig linux-3.8.10/arch/arm/Kconfig
 +	help
 +	  This enables support for Broadcom BCM2708 boards.
 +
- config ARCH_VT8500_SINGLE
- 	bool "VIA/WonderMedia 85xx"
- 	select ARCH_HAS_CPUFREQ
-@@ -1130,6 +1147,7 @@
+ config ARCH_BCM2835
+ 	bool "Broadcom BCM2835 family"
+ 	select ARCH_REQUIRE_GPIOLIB
+@@ -1142,6 +1159,7 @@
  source "arch/arm/mach-vt8500/Kconfig"
  
  source "arch/arm/mach-w90x900/Kconfig"
@@ -1919,10 +1820,10 @@ diff -Nur linux-3.8.10.orig/arch/arm/Kconfig linux-3.8.10/arch/arm/Kconfig
  
  source "arch/arm/mach-zynq/Kconfig"
  
-diff -Nur linux-3.8.10.orig/arch/arm/Kconfig.debug linux-3.8.10/arch/arm/Kconfig.debug
---- linux-3.8.10.orig/arch/arm/Kconfig.debug	2013-04-26 21:18:32.000000000 +0200
-+++ linux-3.8.10/arch/arm/Kconfig.debug	2013-05-06 12:49:35.000000000 +0200
-@@ -448,6 +448,14 @@
+diff -Nur linux-3.9.9/arch/arm/Kconfig.debug linux-rpi/arch/arm/Kconfig.debug
+--- linux-3.9.9/arch/arm/Kconfig.debug	2013-07-03 19:56:36.000000000 +0200
++++ linux-rpi/arch/arm/Kconfig.debug	2013-07-08 13:33:14.000000000 +0200
+@@ -483,6 +483,14 @@
  		  For more details about semihosting, please see
  		  chapter 8 of DUI0203I_rvct_developer_guide.pdf from ARM Ltd.
  
@@ -1936,10 +1837,10 @@ diff -Nur linux-3.8.10.orig/arch/arm/Kconfig.debug linux-3.8.10/arch/arm/Kconfig
 +
  endchoice
  
- config DEBUG_IMX6Q_UART_PORT
-diff -Nur linux-3.8.10.orig/arch/arm/kernel/armksyms.c linux-3.8.10/arch/arm/kernel/armksyms.c
---- linux-3.8.10.orig/arch/arm/kernel/armksyms.c	2013-04-26 21:18:32.000000000 +0200
-+++ linux-3.8.10/arch/arm/kernel/armksyms.c	2013-05-06 12:49:35.000000000 +0200
+ config DEBUG_IMX_UART_PORT
+diff -Nur linux-3.9.9/arch/arm/kernel/armksyms.c linux-rpi/arch/arm/kernel/armksyms.c
+--- linux-3.9.9/arch/arm/kernel/armksyms.c	2013-07-03 19:56:36.000000000 +0200
++++ linux-rpi/arch/arm/kernel/armksyms.c	2013-07-08 13:33:14.000000000 +0200
 @@ -156,3 +156,7 @@
  #ifdef CONFIG_ARM_PATCH_PHYS_VIRT
  EXPORT_SYMBOL(__pv_phys_offset);
@@ -1948,10 +1849,20 @@ diff -Nur linux-3.8.10.orig/arch/arm/kernel/armksyms.c linux-3.8.10/arch/arm/ker
 +extern void v6wbi_flush_kern_tlb_range(void);
 +EXPORT_SYMBOL(v6wbi_flush_kern_tlb_range);
 +
-diff -Nur linux-3.8.10.orig/arch/arm/kernel/fiqasm.S linux-3.8.10/arch/arm/kernel/fiqasm.S
---- linux-3.8.10.orig/arch/arm/kernel/fiqasm.S	2013-04-26 21:18:32.000000000 +0200
-+++ linux-3.8.10/arch/arm/kernel/fiqasm.S	2013-05-06 12:49:35.000000000 +0200
-@@ -47,3 +47,7 @@
+diff -Nur linux-3.9.9/arch/arm/kernel/fiqasm.S linux-rpi/arch/arm/kernel/fiqasm.S
+--- linux-3.9.9/arch/arm/kernel/fiqasm.S	2013-07-03 19:56:36.000000000 +0200
++++ linux-rpi/arch/arm/kernel/fiqasm.S	2013-07-08 13:33:14.000000000 +0200
+@@ -25,6 +25,9 @@
+ ENTRY(__set_fiq_regs)
+ 	mov	r2, #PSR_I_BIT | PSR_F_BIT | FIQ_MODE
+ 	mrs	r1, cpsr
++@@@@@@@@@@@@@@@ hack: enable the fiq here to keep usb driver happy
++	and	r1, #~PSR_F_BIT
++@@@@@@@@@@@@@@@ endhack: (need to find better place for this to happen)
+ 	msr	cpsr_c, r2	@ select FIQ mode
+ 	mov	r0, r0		@ avoid hazard prior to ARMv4
+ 	ldmia	r0!, {r8 - r12}
+@@ -47,3 +50,7 @@
  	mov	r0, r0		@ avoid hazard prior to ARMv4
  	mov	pc, lr
  ENDPROC(__get_fiq_regs)
@@ -1959,9 +1870,9 @@ diff -Nur linux-3.8.10.orig/arch/arm/kernel/fiqasm.S linux-3.8.10/arch/arm/kerne
 +ENTRY(__FIQ_Branch)
 +	mov pc, r8
 +ENDPROC(__FIQ_Branch)
-diff -Nur linux-3.8.10.orig/arch/arm/kernel/fiq.c linux-3.8.10/arch/arm/kernel/fiq.c
---- linux-3.8.10.orig/arch/arm/kernel/fiq.c	2013-04-26 21:18:32.000000000 +0200
-+++ linux-3.8.10/arch/arm/kernel/fiq.c	2013-05-06 12:49:35.000000000 +0200
+diff -Nur linux-3.9.9/arch/arm/kernel/fiq.c linux-rpi/arch/arm/kernel/fiq.c
+--- linux-3.9.9/arch/arm/kernel/fiq.c	2013-07-03 19:56:36.000000000 +0200
++++ linux-rpi/arch/arm/kernel/fiq.c	2013-07-08 13:33:14.000000000 +0200
 @@ -137,6 +137,7 @@
  EXPORT_SYMBOL(set_fiq_handler);
  EXPORT_SYMBOL(__set_fiq_regs);	/* defined in fiqasm.S */
@@ -1970,9 +1881,9 @@ diff -Nur linux-3.8.10.orig/arch/arm/kernel/fiq.c linux-3.8.10/arch/arm/kernel/f
  EXPORT_SYMBOL(claim_fiq);
  EXPORT_SYMBOL(release_fiq);
  EXPORT_SYMBOL(enable_fiq);
-diff -Nur linux-3.8.10.orig/arch/arm/mach-bcm2708/armctrl.c linux-3.8.10/arch/arm/mach-bcm2708/armctrl.c
---- linux-3.8.10.orig/arch/arm/mach-bcm2708/armctrl.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.8.10/arch/arm/mach-bcm2708/armctrl.c	2013-05-06 12:49:35.000000000 +0200
+diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/armctrl.c linux-rpi/arch/arm/mach-bcm2708/armctrl.c
+--- linux-3.9.9/arch/arm/mach-bcm2708/armctrl.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/armctrl.c	2013-07-08 13:33:14.000000000 +0200
 @@ -0,0 +1,219 @@
 +/*
 + *  linux/arch/arm/mach-bcm2708/armctrl.c
@@ -2022,9 +1933,9 @@ diff -Nur linux-3.8.10.orig/arch/arm/mach-bcm2708/armctrl.c linux-3.8.10/arch/ar
 +static void armctrl_mask_irq(struct irq_data *d)
 +{
 +	static const unsigned int disables[4] = {
-+		IO_ADDRESS(ARM_IRQ_DIBL1),
-+		IO_ADDRESS(ARM_IRQ_DIBL2),
-+		IO_ADDRESS(ARM_IRQ_DIBL3),
++		ARM_IRQ_DIBL1,
++		ARM_IRQ_DIBL2,
++		ARM_IRQ_DIBL3,
 +		0
 +	};
 +
@@ -2032,16 +1943,16 @@ diff -Nur linux-3.8.10.orig/arch/arm/mach-bcm2708/armctrl.c linux-3.8.10/arch/ar
 +		writel(0, __io_address(ARM_IRQ_FAST));
 +	} else {
 +		unsigned int data = (unsigned int)irq_get_chip_data(d->irq);
-+		writel(1 << (data & 0x1f), __io(disables[(data >> 5) & 0x3]));
++		writel(1 << (data & 0x1f), __io_address(disables[(data >> 5) & 0x3]));
 +	}
 +}
 +
 +static void armctrl_unmask_irq(struct irq_data *d)
 +{
 +	static const unsigned int enables[4] = {
-+		IO_ADDRESS(ARM_IRQ_ENBL1),
-+		IO_ADDRESS(ARM_IRQ_ENBL2),
-+		IO_ADDRESS(ARM_IRQ_ENBL3),
++		ARM_IRQ_ENBL1,
++		ARM_IRQ_ENBL2,
++		ARM_IRQ_ENBL3,
 +		0
 +	};
 +
@@ -2051,7 +1962,7 @@ diff -Nur linux-3.8.10.orig/arch/arm/mach-bcm2708/armctrl.c linux-3.8.10/arch/ar
 +		writel(0x80 | data, __io_address(ARM_IRQ_FAST));
 +	} else {
 +		unsigned int data = (unsigned int)irq_get_chip_data(d->irq);
-+		writel(1 << (data & 0x1f), __io(enables[(data >> 5) & 0x3]));
++		writel(1 << (data & 0x1f), __io_address(enables[(data >> 5) & 0x3]));
 +	}
 +}
 +
@@ -2193,9 +2104,9 @@ diff -Nur linux-3.8.10.orig/arch/arm/mach-bcm2708/armctrl.c linux-3.8.10/arch/ar
 +	init_FIQ(FIQ_START);
 +	return 0;
 +}
-diff -Nur linux-3.8.10.orig/arch/arm/mach-bcm2708/armctrl.h linux-3.8.10/arch/arm/mach-bcm2708/armctrl.h
---- linux-3.8.10.orig/arch/arm/mach-bcm2708/armctrl.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.8.10/arch/arm/mach-bcm2708/armctrl.h	2013-05-06 12:49:35.000000000 +0200
+diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/armctrl.h linux-rpi/arch/arm/mach-bcm2708/armctrl.h
+--- linux-3.9.9/arch/arm/mach-bcm2708/armctrl.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/armctrl.h	2013-07-08 13:33:14.000000000 +0200
 @@ -0,0 +1,27 @@
 +/*
 + *  linux/arch/arm/mach-bcm2708/armctrl.h
@@ -2224,10 +2135,10 @@ diff -Nur linux-3.8.10.orig/arch/arm/mach-bcm2708/armctrl.h linux-3.8.10/arch/ar
 +			       u32 armctrl_sources, u32 resume_sources);
 +
 +#endif
-diff -Nur linux-3.8.10.orig/arch/arm/mach-bcm2708/bcm2708.c linux-3.8.10/arch/arm/mach-bcm2708/bcm2708.c
---- linux-3.8.10.orig/arch/arm/mach-bcm2708/bcm2708.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.8.10/arch/arm/mach-bcm2708/bcm2708.c	2013-05-06 12:49:35.000000000 +0200
-@@ -0,0 +1,921 @@
+diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/bcm2708.c linux-rpi/arch/arm/mach-bcm2708/bcm2708.c
+--- linux-3.9.9/arch/arm/mach-bcm2708/bcm2708.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/bcm2708.c	2013-07-08 13:33:14.000000000 +0200
+@@ -0,0 +1,885 @@
 +/*
 + *  linux/arch/arm/mach-bcm2708/bcm2708.c
 + *
@@ -2337,13 +2248,6 @@ diff -Nur linux-3.8.10.orig/arch/arm/mach-bcm2708/bcm2708.c linux-3.8.10/arch/ar
 +	 .pfn = __phys_to_pfn(UART1_BASE),
 +	 .length = SZ_4K,
 +	 .type = MT_DEVICE},
-+#ifdef CONFIG_MMC_BCM2708	/* broadcom legacy SD */
-+	{
-+	 .virtual = IO_ADDRESS(MMCI0_BASE),
-+	 .pfn = __phys_to_pfn(MMCI0_BASE),
-+	 .length = SZ_4K,
-+	 .type = MT_DEVICE},
-+#endif
 +	{
 +	 .virtual = IO_ADDRESS(DMA_BASE),
 +	 .pfn = __phys_to_pfn(DMA_BASE),
@@ -2460,12 +2364,6 @@ diff -Nur linux-3.8.10.orig/arch/arm/mach-bcm2708/bcm2708.c linux-3.8.10/arch/ar
 +	{			/* USB */
 +	 .dev_id = "bcm2708_usb",
 +	 .clk = &osc_clk,
-+#ifdef CONFIG_MMC_BCM2708
-+	 },
-+	{			/* MCI */
-+	 .dev_id = "bcm2708_mci.0",
-+	 .clk = &sdhost_clk,
-+#endif
 +	 }, {	/* SPI */
 +		 .dev_id = "bcm2708_spi.0",
 +		 .clk = &sdhost_clk,
@@ -2502,31 +2400,6 @@ diff -Nur linux-3.8.10.orig/arch/arm/mach-bcm2708/bcm2708.c linux-3.8.10/arch/ar
 +	.num_resources = ARRAY_SIZE(bcm2708_dmaman_resources),
 +};
 +
-+#ifdef CONFIG_MMC_BCM2708
-+static struct resource bcm2708_mci_resources[] = {
-+	{
-+	 .start = MMCI0_BASE,
-+	 .end = MMCI0_BASE + SZ_4K - 1,
-+	 .flags = IORESOURCE_MEM,
-+	 },
-+	{
-+	 .start = IRQ_SDIO,
-+	 .end = IRQ_SDIO,
-+	 .flags = IORESOURCE_IRQ,
-+	 }
-+};
-+
-+static struct platform_device bcm2708_mci_device = {
-+	.name = "bcm2708_mci",
-+	.id = 0,		/* first bcm2708_mci */
-+	.resource = bcm2708_mci_resources,
-+	.num_resources = ARRAY_SIZE(bcm2708_mci_resources),
-+	.dev = {
-+		.coherent_dma_mask = DMA_BIT_MASK(DMA_MASK_BITS_COMMON),
-+		},
-+};
-+#endif /* CONFIG_MMC_BCM2708 */
-+
 +#if defined(CONFIG_W1_MASTER_GPIO) || defined(CONFIG_W1_MASTER_GPIO_MODULE)
 +static struct w1_gpio_platform_data w1_gpio_pdata = {
 +	.pin = W1_GPIO,
@@ -2592,7 +2465,7 @@ diff -Nur linux-3.8.10.orig/arch/arm/mach-bcm2708/bcm2708.c linux-3.8.10/arch/ar
 +	       },
 +};
 +
-+bool fiq_fix_enable = false;
++bool fiq_fix_enable = true;
 +
 +static struct resource bcm2708_usb_resources_no_fiq_fix[] = {
 +	[0] = {
@@ -2813,7 +2686,7 @@ diff -Nur linux-3.8.10.orig/arch/arm/mach-bcm2708/bcm2708.c linux-3.8.10/arch/ar
 +	.resource = bcm2708_spi_resources,
 +};
 +
-+#ifdef CONFIG_SPI
++#ifdef CONFIG_BCM2708_SPIDEV
 +static struct spi_board_info bcm2708_spi_devices[] = {
 +#ifdef CONFIG_SPI_SPIDEV
 +	{
@@ -2897,14 +2770,23 @@ diff -Nur linux-3.8.10.orig/arch/arm/mach-bcm2708/bcm2708.c linux-3.8.10/arch/ar
 +	uint32_t pm_rstc, pm_wdog;
 +	uint32_t timeout = 10;
 +
++	/* For quick reset notification add reboot=q to cmdline
++	 */
++	if(mode == 'q')
++	{
++		uint32_t pm_rsts = readl(__io_address(PM_RSTS));
++		pm_rsts = PM_PASSWORD | pm_rsts | PM_RSTS_HADWRQ_SET;
++		writel(pm_rsts, __io_address(PM_RSTS));
++	}
++
 +	/* Setup watchdog for reset */
-+	pm_rstc = readl(IO_ADDRESS(PM_RSTC));
++	pm_rstc = readl(__io_address(PM_RSTC));
 +
 +	pm_wdog = PM_PASSWORD | (timeout & PM_WDOG_TIME_SET); // watchdog timer = timer clock / 16; need password (31:16) + value (11:0)
 +	pm_rstc = PM_PASSWORD | (pm_rstc & PM_RSTC_WRCFG_CLR) | PM_RSTC_WRCFG_FULL_RESET;
 +
-+	writel(pm_wdog, IO_ADDRESS(PM_WDOG));
-+	writel(pm_rstc, IO_ADDRESS(PM_RSTC));
++	writel(pm_wdog, __io_address(PM_WDOG));
++	writel(pm_rstc, __io_address(PM_RSTC));
 +}
 +
 +/* We can't really power off, but if we do the normal reset scheme, and indicate to bootcode.bin not to reboot, then most of the chip will be powered off */
@@ -2943,9 +2825,6 @@ diff -Nur linux-3.8.10.orig/arch/arm/mach-bcm2708/bcm2708.c linux-3.8.10/arch/ar
 +	platform_device_register(&w1_device);
 +#endif
 +	bcm_register_device(&bcm2708_systemtimer_device);
-+#ifdef CONFIG_MMC_BCM2708
-+	bcm_register_device(&bcm2708_mci_device);
-+#endif
 +	bcm_register_device(&bcm2708_fb_device);
 +	if (!fiq_fix_enable)
 +	{
@@ -2977,7 +2856,7 @@ diff -Nur linux-3.8.10.orig/arch/arm/mach-bcm2708/bcm2708.c linux-3.8.10/arch/ar
 +	system_rev = boardrev;
 +	system_serial_low = serial;
 +
-+#ifdef CONFIG_SPI
++#ifdef CONFIG_BCM2708_SPIDEV
 +	spi_register_board_info(bcm2708_spi_devices,
 +			ARRAY_SIZE(bcm2708_spi_devices));
 +#endif
@@ -3079,10 +2958,6 @@ diff -Nur linux-3.8.10.orig/arch/arm/mach-bcm2708/bcm2708.c linux-3.8.10/arch/ar
 +	register_current_timer_delay(&bcm2708_delay_timer);
 +}
 +
-+struct sys_timer bcm2708_timer = {
-+	.init = bcm2708_timer_init,
-+};
-+
 +#if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE)
 +#include <linux/leds.h>
 +
@@ -3139,7 +3014,7 @@ diff -Nur linux-3.8.10.orig/arch/arm/mach-bcm2708/bcm2708.c linux-3.8.10/arch/ar
 +    /* Maintainer: Broadcom Europe Ltd. */
 +	.map_io = bcm2708_map_io,
 +	.init_irq = bcm2708_init_irq,
-+	.timer =&bcm2708_timer,
++	.init_time = bcm2708_timer_init,
 +	.init_machine = bcm2708_init,
 +	.init_early = bcm2708_init_early,
 +	.reserve = board_reserve,
@@ -3149,9 +3024,9 @@ diff -Nur linux-3.8.10.orig/arch/arm/mach-bcm2708/bcm2708.c linux-3.8.10/arch/ar
 +module_param(boardrev, uint, 0644);
 +module_param(serial, uint, 0644);
 +module_param(uart_clock, uint, 0644);
-diff -Nur linux-3.8.10.orig/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-3.8.10/arch/arm/mach-bcm2708/bcm2708_gpio.c
---- linux-3.8.10.orig/arch/arm/mach-bcm2708/bcm2708_gpio.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.8.10/arch/arm/mach-bcm2708/bcm2708_gpio.c	2013-05-06 12:49:35.000000000 +0200
+diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-rpi/arch/arm/mach-bcm2708/bcm2708_gpio.c
+--- linux-3.9.9/arch/arm/mach-bcm2708/bcm2708_gpio.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/bcm2708_gpio.c	2013-07-08 13:33:14.000000000 +0200
 @@ -0,0 +1,339 @@
 +/*
 + *  linux/arch/arm/mach-bcm2708/bcm2708_gpio.c
@@ -3492,9 +3367,9 @@ diff -Nur linux-3.8.10.orig/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-3.8.10/ar
 +
 +MODULE_DESCRIPTION("Broadcom BCM2708 GPIO driver");
 +MODULE_LICENSE("GPL");
-diff -Nur linux-3.8.10.orig/arch/arm/mach-bcm2708/bcm2708.h linux-3.8.10/arch/arm/mach-bcm2708/bcm2708.h
---- linux-3.8.10.orig/arch/arm/mach-bcm2708/bcm2708.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.8.10/arch/arm/mach-bcm2708/bcm2708.h	2013-05-06 12:49:35.000000000 +0200
+diff -Nur linux-3