summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--TODO3
-rw-r--r--mk/modules.mk5
-rw-r--r--package/base-files/Makefile2
-rw-r--r--package/base-files/src/lib/mdev/init15
-rw-r--r--package/busybox/Makefile2
-rw-r--r--package/busybox/config/networking/Config.in2
-rw-r--r--package/busybox/config/util-linux/Config.in1
-rw-r--r--package/realtek-firmware/Makefile27
-rw-r--r--target/linux/config/Config.in.graphics9
-rw-r--r--target/linux/config/Config.in.netdevice8
-rw-r--r--target/linux/patches/3.12.6/raspberry.patch173618
11 files changed, 794 insertions, 172898 deletions
diff --git a/TODO b/TODO
index a902a948b..84994bc0a 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,7 @@
+- restart network (kill wpa_supplicant)
+- essid with spaces
- add grsec kernel patch
- microblaze: add cfgfs partition to dts, add partition to spartan dts
-- use host-tools infrastructure for openjdk7
- evaluate libguestfs for image creation
- check for gcc and SSP again
- port w3m
diff --git a/mk/modules.mk b/mk/modules.mk
index d959d7453..f5660ba97 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -136,7 +136,10 @@ $(eval $(call KMOD_template,RT61PCI,rt61pci,\
,20, kmod-leds-class kmod-rt2x00 rt2x00pci))
$(eval $(call KMOD_template,RTL8192CU,rtl8192cu,\
- $(MODULES_DIR)/kernel/drivers/net/wireless/rtl8192cu/8192cu \
+ $(MODULES_DIR)/kernel/drivers/net/wireless/rtlwifi/rtlwifi \
+ $(MODULES_DIR)/kernel/drivers/net/wireless/rtlwifi/rtl_usb \
+ $(MODULES_DIR)/kernel/drivers/net/wireless/rtlwifi/rtl8192c/rtl8192c-common \
+ $(MODULES_DIR)/kernel/drivers/net/wireless/rtlwifi/rtl8192cu/rtl8192cu \
,20))
#
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index f1e0d0666..10e914178 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
PKG_NAME:= base-files
PKG_VERSION:= 1.0
-PKG_RELEASE:= 63
+PKG_RELEASE:= 64
PKG_SECTION:= base
PKG_DESCR:= basic files and scripts
PKG_BUILDDEP:= pkgconf-host file-host
diff --git a/package/base-files/src/lib/mdev/init b/package/base-files/src/lib/mdev/init
index f2b7125b8..a478abecd 100644
--- a/package/base-files/src/lib/mdev/init
+++ b/package/base-files/src/lib/mdev/init
@@ -1,19 +1,4 @@
#!/bin/sh
-if [ "$SUBSYSTEM" == "firmware" ];then
- logger "Firmware load for $FIRMWARE requested"
- if [ "$ACTION" == "add" ];then
- if [ -e "/lib/firmware/$FIRMWARE" ];then
- logger "Firmware loading ..."
- echo 1 > /sys$DEVPATH/loading
- cat "/lib/firmware/$FIRMWARE" > /sys$DEVPATH/data
- echo 0 > /sys$DEVPATH/loading
- logger "finished."
- else
- logger "Firmware file $FIRMWARE not found"
- echo -1 > /sys$DEVPATH/loading
- fi
- fi
-fi
if [ "$SUBSYSTEM" == "pcmcia_socket" ];then
logger "Setting up PCMCIA socket resource database"
if [ "$ACTION" == "add" ];then
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 0cde4bca5..1d50365e3 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= busybox
PKG_VERSION:= 1.21.1
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= 795394f83903b5eec6567d51eebb417e
PKG_DESCR:= core utilities for embedded systems
PKG_SECTION:= base
diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in
index 74069af13..e350a1b16 100644
--- a/package/busybox/config/networking/Config.in
+++ b/package/busybox/config/networking/Config.in
@@ -1017,7 +1017,7 @@ source package/busybox/config/networking/udhcp/Config.in
config BUSYBOX_IFUPDOWN_UDHCPC_CMD_OPTIONS
string "ifup udhcpc command line options"
- default "-R -n"
+ default "-R -b"
depends on BUSYBOX_IFUPDOWN && BUSYBOX_UDHCPC
help
Command line options to pass to udhcpc from ifup.
diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in
index baf6beb26..aafc795b1 100644
--- a/package/busybox/config/util-linux/Config.in
+++ b/package/busybox/config/util-linux/Config.in
@@ -69,6 +69,7 @@ config BUSYBOX_FEATURE_MDEV_LOAD_FIRMWARE
These devices will request userspace look up the files in
/lib/firmware/ and if it exists, send it to the kernel for
loading into the hardware.
+
config BUSYBOX_REV
bool "rev"
default n
diff --git a/package/realtek-firmware/Makefile b/package/realtek-firmware/Makefile
new file mode 100644
index 000000000..368a4cf89
--- /dev/null
+++ b/package/realtek-firmware/Makefile
@@ -0,0 +1,27 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include ${TOPDIR}/rules.mk
+
+PKG_NAME:= realtek-firmware
+PKG_VERSION:= 1.0
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 85a7d1d1386143fad312a5a82c422380
+PKG_DESCR:= firmware for realtek wireless cards
+PKG_SECTION:= wifi
+PKG_SITES:= http://www.openadk.org/distfiles/
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,REALTEK_FIRMWARE,realtek-firmware,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIG_STYLE:= manual
+BUILD_STYLE:= manual
+INSTALL_STYLE:= manual
+
+do-install:
+ ${INSTALL_DIR} ${IDIR_REALTEK_FIRMWARE}/lib/firmware/rtlwifi
+ ${CP} ${WRKBUILD}/*.bin \
+ ${IDIR_REALTEK_FIRMWARE}/lib/firmware/rtlwifi
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics
index af28b91d7..f6f3962cf 100644
--- a/target/linux/config/Config.in.graphics
+++ b/target/linux/config/Config.in.graphics
@@ -50,10 +50,19 @@ config ADK_KERNEL_AGP
config ADK_KERNEL_AGP_INTEL
boolean
+
+config ADK_KERNEL_LOGO
+ boolean
menu "Graphic devices support"
depends on ADK_TARGET_WITH_VGA
+config ADK_KERNEL_LOGO_LINUX_CLUT224
+ prompt "Enable Linux penguin boot logo"
+ boolean
+ select ADK_KERNEL_LOGO
+ default n
+
config ADK_KERNEL_FB_VESA
prompt "................................ Framebuffer support for VirtualBox Emulator (VESA)"
boolean
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice
index 9ee0511fc..cdd602cd7 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/target/linux/config/Config.in.netdevice
@@ -323,6 +323,9 @@ config ADK_KPACKAGE_KMOD_RT2X00_LIB_USB
config ADK_KPACKAGE_KMOD_RT2X00_LIB_PCI
tristate
+config ADK_KERNEL_RTL_CARDS
+ boolean
+
config ADK_KERNEL_RT2X00
boolean
select ADK_KPACKAGE_KMOD_RT2X00
@@ -504,9 +507,10 @@ config ADK_KPACKAGE_KMOD_RT2800USB
config ADK_KPACKAGE_KMOD_RTL8192CU
prompt "kmod-rtl8192cu............... Realtek RTL8192CU USB"
tristate
+ select ADK_KERNEL_RTL_CARDS
select ADK_KPACKAGE_KMOD_MAC80211
- select ADK_KERNEL_CFG80211_WEXT
- select ADK_KERNEL_WIRELESS_EXT
+ select ADK_KPACKAGE_KMOD_FW_LOADER
+ select ADK_PACKAGE_REALTEK_FIRMWARE
depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
default n
help
diff --git a/target/linux/patches/3.12.6/raspberry.patch b/target/linux/patches/3.12.6/raspberry.patch
index 3f34b3e41..6f1970d0a 100644
--- a/target/linux/patches/3.12.6/raspberry.patch
+++ b/target/linux/patches/3.12.6/raspberry.patch
@@ -1,6 +1,6 @@
-diff -Nur linux-3.12.6/arch/arm/configs/bcmrpi_cutdown_defconfig linux-raspberry-pi/arch/arm/configs/bcmrpi_cutdown_defconfig
---- linux-3.12.6/arch/arm/configs/bcmrpi_cutdown_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/configs/bcmrpi_cutdown_defconfig 2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.12.6/arch/arm/configs/bcmrpi_cutdown_defconfig
+--- linux-3.12.6.orig/arch/arm/configs/bcmrpi_cutdown_defconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/configs/bcmrpi_cutdown_defconfig 2014-02-04 14:59:24.901989778 +0100
@@ -0,0 +1,503 @@
+CONFIG_EXPERIMENTAL=y
+# CONFIG_LOCALVERSION_AUTO is not set
@@ -505,9 +505,9 @@ diff -Nur linux-3.12.6/arch/arm/configs/bcmrpi_cutdown_defconfig linux-raspberry
+CONFIG_SPI=y
+CONFIG_SPI_MASTER=y
+CONFIG_SPI_BCM2708=m
-diff -Nur linux-3.12.6/arch/arm/configs/bcmrpi_defconfig linux-raspberry-pi/arch/arm/configs/bcmrpi_defconfig
---- linux-3.12.6/arch/arm/configs/bcmrpi_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/configs/bcmrpi_defconfig 2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/configs/bcmrpi_defconfig linux-3.12.6/arch/arm/configs/bcmrpi_defconfig
+--- linux-3.12.6.orig/arch/arm/configs/bcmrpi_defconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/configs/bcmrpi_defconfig 2014-02-04 14:59:24.901989778 +0100
@@ -0,0 +1,1092 @@
+# CONFIG_ARM_PATCH_PHYS_VIRT is not set
+# CONFIG_LOCALVERSION_AUTO is not set
@@ -1601,9 +1601,9 @@ diff -Nur linux-3.12.6/arch/arm/configs/bcmrpi_defconfig linux-raspberry-pi/arch
+# CONFIG_CRYPTO_HW is not set
+CONFIG_CRC_ITU_T=y
+CONFIG_LIBCRC32C=y
-diff -Nur linux-3.12.6/arch/arm/configs/bcmrpi_emergency_defconfig linux-raspberry-pi/arch/arm/configs/bcmrpi_emergency_defconfig
---- linux-3.12.6/arch/arm/configs/bcmrpi_emergency_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/configs/bcmrpi_emergency_defconfig 2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/configs/bcmrpi_emergency_defconfig linux-3.12.6/arch/arm/configs/bcmrpi_emergency_defconfig
+--- linux-3.12.6.orig/arch/arm/configs/bcmrpi_emergency_defconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/configs/bcmrpi_emergency_defconfig 2014-02-04 14:59:24.901989778 +0100
@@ -0,0 +1,532 @@
+CONFIG_EXPERIMENTAL=y
+# CONFIG_LOCALVERSION_AUTO is not set
@@ -2137,9 +2137,9 @@ diff -Nur linux-3.12.6/arch/arm/configs/bcmrpi_emergency_defconfig linux-raspber
+# CONFIG_CRYPTO_HW is not set
+CONFIG_CRC_ITU_T=y
+CONFIG_LIBCRC32C=y
-diff -Nur linux-3.12.6/arch/arm/configs/bcmrpi_quick_defconfig linux-raspberry-pi/arch/arm/configs/bcmrpi_quick_defconfig
---- linux-3.12.6/arch/arm/configs/bcmrpi_quick_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/configs/bcmrpi_quick_defconfig 2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/configs/bcmrpi_quick_defconfig linux-3.12.6/arch/arm/configs/bcmrpi_quick_defconfig
+--- linux-3.12.6.orig/arch/arm/configs/bcmrpi_quick_defconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/configs/bcmrpi_quick_defconfig 2014-02-04 14:59:24.901989778 +0100
@@ -0,0 +1,197 @@
+# CONFIG_ARM_PATCH_PHYS_VIRT is not set
+CONFIG_LOCALVERSION="-quick"
@@ -2338,9 +2338,9 @@ diff -Nur linux-3.12.6/arch/arm/configs/bcmrpi_quick_defconfig linux-raspberry-p
+# CONFIG_CRYPTO_HW is not set
+CONFIG_CRC_ITU_T=y
+CONFIG_LIBCRC32C=y
-diff -Nur linux-3.12.6/arch/arm/include/asm/fiq.h linux-raspberry-pi/arch/arm/include/asm/fiq.h
---- linux-3.12.6/arch/arm/include/asm/fiq.h 2013-12-20 16:51:33.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/include/asm/fiq.h 2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/include/asm/fiq.h linux-3.12.6/arch/arm/include/asm/fiq.h
+--- linux-3.12.6.orig/arch/arm/include/asm/fiq.h 2013-12-20 16:51:33.000000000 +0100
++++ linux-3.12.6/arch/arm/include/asm/fiq.h 2014-02-04 14:59:24.905989786 +0100
@@ -42,6 +42,7 @@
/* helpers defined in fiqasm.S: */
extern void __set_fiq_regs(unsigned long const *regs);
@@ -2349,9 +2349,9 @@ diff -Nur linux-3.12.6/arch/arm/include/asm/fiq.h linux-raspberry-pi/arch/arm/in
static inline void set_fiq_regs(struct pt_regs const *regs)
{
-diff -Nur linux-3.12.6/arch/arm/Kconfig linux-raspberry-pi/arch/arm/Kconfig
---- linux-3.12.6/arch/arm/Kconfig 2013-12-20 16:51:33.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/Kconfig 2013-12-29 10:40:20.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/Kconfig linux-3.12.6/arch/arm/Kconfig
+--- linux-3.12.6.orig/arch/arm/Kconfig 2013-12-20 16:51:33.000000000 +0100
++++ linux-3.12.6/arch/arm/Kconfig 2014-02-04 14:59:24.905989786 +0100
@@ -368,6 +368,24 @@
This enables support for systems based on Atmel
AT91RM9200 and AT91SAM9* processors.
@@ -2385,9 +2385,9 @@ diff -Nur linux-3.12.6/arch/arm/Kconfig linux-raspberry-pi/arch/arm/Kconfig
source "arch/arm/mach-zynq/Kconfig"
-diff -Nur linux-3.12.6/arch/arm/Kconfig.debug linux-raspberry-pi/arch/arm/Kconfig.debug
---- linux-3.12.6/arch/arm/Kconfig.debug 2013-12-20 16:51:33.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/Kconfig.debug 2013-12-29 10:40:20.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/Kconfig.debug linux-3.12.6/arch/arm/Kconfig.debug
+--- linux-3.12.6.orig/arch/arm/Kconfig.debug 2013-12-20 16:51:33.000000000 +0100
++++ linux-3.12.6/arch/arm/Kconfig.debug 2014-02-04 14:59:24.905989786 +0100
@@ -847,6 +847,14 @@
options; the platform specific options are deprecated
and will be soon removed.
@@ -2403,9 +2403,9 @@ diff -Nur linux-3.12.6/arch/arm/Kconfig.debug linux-raspberry-pi/arch/arm/Kconfi
endchoice
config DEBUG_EXYNOS_UART
-diff -Nur linux-3.12.6/arch/arm/kernel/fiqasm.S linux-raspberry-pi/arch/arm/kernel/fiqasm.S
---- linux-3.12.6/arch/arm/kernel/fiqasm.S 2013-12-20 16:51:33.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/kernel/fiqasm.S 2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/kernel/fiqasm.S linux-3.12.6/arch/arm/kernel/fiqasm.S
+--- linux-3.12.6.orig/arch/arm/kernel/fiqasm.S 2013-12-20 16:51:33.000000000 +0100
++++ linux-3.12.6/arch/arm/kernel/fiqasm.S 2014-02-04 14:59:24.905989786 +0100
@@ -25,6 +25,9 @@
ENTRY(__set_fiq_regs)
mov r2, #PSR_I_BIT | PSR_F_BIT | FIQ_MODE
@@ -2424,9 +2424,9 @@ diff -Nur linux-3.12.6/arch/arm/kernel/fiqasm.S linux-raspberry-pi/arch/arm/kern
+ENTRY(__FIQ_Branch)
+ mov pc, r8
+ENDPROC(__FIQ_Branch)
-diff -Nur linux-3.12.6/arch/arm/kernel/fiq.c linux-raspberry-pi/arch/arm/kernel/fiq.c
---- linux-3.12.6/arch/arm/kernel/fiq.c 2013-12-20 16:51:33.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/kernel/fiq.c 2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/kernel/fiq.c linux-3.12.6/arch/arm/kernel/fiq.c
+--- linux-3.12.6.orig/arch/arm/kernel/fiq.c 2013-12-20 16:51:33.000000000 +0100
++++ linux-3.12.6/arch/arm/kernel/fiq.c 2014-02-04 14:59:24.905989786 +0100
@@ -142,6 +142,7 @@
EXPORT_SYMBOL(set_fiq_handler);
EXPORT_SYMBOL(__set_fiq_regs); /* defined in fiqasm.S */
@@ -2435,9 +2435,9 @@ diff -Nur linux-3.12.6/arch/arm/kernel/fiq.c linux-raspberry-pi/arch/arm/kernel/
EXPORT_SYMBOL(claim_fiq);
EXPORT_SYMBOL(release_fiq);
EXPORT_SYMBOL(enable_fiq);
-diff -Nur linux-3.12.6/arch/arm/kernel/process.c linux-raspberry-pi/arch/arm/kernel/process.c
---- linux-3.12.6/arch/arm/kernel/process.c 2013-12-20 16:51:33.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/kernel/process.c 2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/kernel/process.c linux-3.12.6/arch/arm/kernel/process.c
+--- linux-3.12.6.orig/arch/arm/kernel/process.c 2013-12-20 16:51:33.000000000 +0100
++++ linux-3.12.6/arch/arm/kernel/process.c 2014-02-04 14:59:24.905989786 +0100
@@ -176,6 +176,16 @@
default_idle();
}
@@ -2455,9 +2455,9 @@ diff -Nur linux-3.12.6/arch/arm/kernel/process.c linux-raspberry-pi/arch/arm/ker
/*
* Called by kexec, immediately prior to machine_kexec().
*
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/armctrl.c linux-raspberry-pi/arch/arm/mach-bcm2708/armctrl.c
---- linux-3.12.6/arch/arm/mach-bcm2708/armctrl.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/armctrl.c 2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/armctrl.c linux-3.12.6/arch/arm/mach-bcm2708/armctrl.c
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/armctrl.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/armctrl.c 2014-02-04 14:59:24.905989786 +0100
@@ -0,0 +1,219 @@
+/*
+ * linux/arch/arm/mach-bcm2708/armctrl.c
@@ -2678,9 +2678,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/armctrl.c linux-raspberry-pi/arch/a
+ init_FIQ(FIQ_START);
+ return 0;
+}
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/armctrl.h linux-raspberry-pi/arch/arm/mach-bcm2708/armctrl.h
---- linux-3.12.6/arch/arm/mach-bcm2708/armctrl.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/armctrl.h 2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/armctrl.h linux-3.12.6/arch/arm/mach-bcm2708/armctrl.h
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/armctrl.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/armctrl.h 2014-02-04 14:59:24.905989786 +0100
@@ -0,0 +1,27 @@
+/*
+ * linux/arch/arm/mach-bcm2708/armctrl.h
@@ -2709,9 +2709,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/armctrl.h linux-raspberry-pi/arch/a
+ u32 armctrl_sources, u32 resume_sources);
+
+#endif
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/bcm2708.c linux-raspberry-pi/arch/arm/mach-bcm2708/bcm2708.c
---- linux-3.12.6/arch/arm/mach-bcm2708/bcm2708.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/bcm2708.c 2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/bcm2708.c linux-3.12.6/arch/arm/mach-bcm2708/bcm2708.c
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/bcm2708.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/bcm2708.c 2014-02-04 14:59:24.905989786 +0100
@@ -0,0 +1,985 @@
+/*
+ * linux/arch/arm/mach-bcm2708/bcm2708.c
@@ -3698,9 +3698,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/bcm2708.c linux-raspberry-pi/arch/a
+module_param(serial, uint, 0644);
+module_param(uart_clock, uint, 0644);
+module_param(reboot_part, uint, 0644);
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-raspberry-pi/arch/arm/mach-bcm2708/bcm2708_gpio.c
---- linux-3.12.6/arch/arm/mach-bcm2708/bcm2708_gpio.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/bcm2708_gpio.c 2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-3.12.6/arch/arm/mach-bcm2708/bcm2708_gpio.c
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/bcm2708_gpio.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/bcm2708_gpio.c 2014-02-04 14:59:24.905989786 +0100
@@ -0,0 +1,339 @@
+/*
+ * linux/arch/arm/mach-bcm2708/bcm2708_gpio.c
@@ -4041,9 +4041,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-raspberry-pi/a
+
+MODULE_DESCRIPTION("Broadcom BCM2708 GPIO driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/bcm2708.h linux-raspberry-pi/arch/arm/mach-bcm2708/bcm2708.h
---- linux-3.12.6/arch/arm/mach-bcm2708/bcm2708.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/bcm2708.h 2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/bcm2708.h linux-3.12.6/arch/arm/mach-bcm2708/bcm2708.h
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/bcm2708.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/bcm2708.h 2014-02-04 14:59:24.905989786 +0100
@@ -0,0 +1,51 @@
+/*
+ * linux/arch/arm/mach-bcm2708/bcm2708.h
@@ -4096,9 +4096,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/bcm2708.h linux-raspberry-pi/arch/a
+}
+
+#endif
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/clock.c linux-raspberry-pi/arch/arm/mach-bcm2708/clock.c
---- linux-3.12.6/arch/arm/mach-bcm2708/clock.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/clock.c 2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/clock.c linux-3.12.6/arch/arm/mach-bcm2708/clock.c
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/clock.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/clock.c 2014-02-04 14:59:24.905989786 +0100
@@ -0,0 +1,61 @@
+/*
+ * linux/arch/arm/mach-bcm2708/clock.c
@@ -4161,9 +4161,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/clock.c linux-raspberry-pi/arch/arm
+ return -EIO;
+}
+EXPORT_SYMBOL(clk_set_rate);
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/clock.h linux-raspberry-pi/arch/arm/mach-bcm2708/clock.h
---- linux-3.12.6/arch/arm/mach-bcm2708/clock.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/clock.h 2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/clock.h linux-3.12.6/arch/arm/mach-bcm2708/clock.h
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/clock.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/clock.h 2014-02-04 14:59:24.905989786 +0100
@@ -0,0 +1,24 @@
+/*
+ * linux/arch/arm/mach-bcm2708/clock.h
@@ -4189,9 +4189,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/clock.h linux-raspberry-pi/arch/arm
+struct clk {
+ unsigned long rate;
+};
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/dma.c linux-raspberry-pi/arch/arm/mach-bcm2708/dma.c
---- linux-3.12.6/arch/arm/mach-bcm2708/dma.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/dma.c 2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/dma.c linux-3.12.6/arch/arm/mach-bcm2708/dma.c
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/dma.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/dma.c 2014-02-04 14:59:24.905989786 +0100
@@ -0,0 +1,399 @@
+/*
+ * linux/arch/arm/mach-bcm2708/dma.c
@@ -4592,9 +4592,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/dma.c linux-raspberry-pi/arch/arm/m
+MODULE_LICENSE("GPL");
+
+MODULE_PARM_DESC(dmachans, "Bitmap of DMA channels available to the ARM");
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/dmaer.c linux-raspberry-pi/arch/arm/mach-bcm2708/dmaer.c
---- linux-3.12.6/arch/arm/mach-bcm2708/dmaer.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/dmaer.c 2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/dmaer.c linux-3.12.6/arch/arm/mach-bcm2708/dmaer.c
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/dmaer.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/dmaer.c 2014-02-04 14:59:24.905989786 +0100
@@ -0,0 +1,886 @@
+#include <linux/init.h>
+#include <linux/sched.h>
@@ -5482,9 +5482,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/dmaer.c linux-raspberry-pi/arch/arm
+MODULE_AUTHOR("Simon Hall");
+module_init(dmaer_init);
+module_exit(dmaer_exit);
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/arm_control.h
---- linux-3.12.6/arch/arm/mach-bcm2708/include/mach/arm_control.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/arm_control.h 2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-3.12.6/arch/arm/mach-bcm2708/include/mach/arm_control.h
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/arm_control.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/include/mach/arm_control.h 2014-02-04 14:59:24.905989786 +0100
@@ -0,0 +1,419 @@
+/*
+ * linux/arch/arm/mach-bcm2708/arm_control.h
@@ -5905,9 +5905,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-ra
+#define AJBTDO HW_REGISTER_RW(AJB_BASE+0x0c)
+
+#endif
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/arm_power.h
---- linux-3.12.6/arch/arm/mach-bcm2708/include/mach/arm_power.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/arm_power.h 2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-3.12.6/arch/arm/mach-bcm2708/include/mach/arm_power.h
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/arm_power.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/include/mach/arm_power.h 2014-02-04 14:59:24.905989786 +0100
@@ -0,0 +1,60 @@
+/*
+ * linux/arch/arm/mach-bcm2708/include/mach/arm_power.h
@@ -5969,9 +5969,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-rasp
+};
+
+#endif
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/clkdev.h
---- linux-3.12.6/arch/arm/mach-bcm2708/include/mach/clkdev.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/clkdev.h 2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-3.12.6/arch/arm/mach-bcm2708/include/mach/clkdev.h
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/clkdev.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/include/mach/clkdev.h 2014-02-04 14:59:24.905989786 +0100
@@ -0,0 +1,7 @@
+#ifndef __ASM_MACH_CLKDEV_H
+#define __ASM_MACH_CLKDEV_H
@@ -5980,9 +5980,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-raspber
+#define __clk_put(clk) do { } while (0)
+
+#endif
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/debug-macro.S
---- linux-3.12.6/arch/arm/mach-bcm2708/include/mach/debug-macro.S 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-3.12.6/arch/arm/mach-bcm2708/include/mach/debug-macro.S
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/debug-macro.S 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2014-02-04 14:59:24.905989786 +0100
@@ -0,0 +1,22 @@
+/* arch/arm/mach-bcm2708/include/mach/debug-macro.S
+ *
@@ -6006,9 +6006,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-ra
+ .endm
+
+#include <debug/pl01x.S>
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/dma.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/dma.h
---- linux-3.12.6/arch/arm/mach-bcm2708/include/mach/dma.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/dma.h 2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/dma.h linux-3.12.6/arch/arm/mach-bcm2708/include/mach/dma.h
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/dma.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/include/mach/dma.h 2014-02-04 14:59:24.905989786 +0100
@@ -0,0 +1,88 @@
+/*
+ * linux/arch/arm/mach-bcm2708/include/mach/dma.h
@@ -6098,9 +6098,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/dma.h linux-raspberry-
+
+
+#endif /* _MACH_BCM2708_DMA_H */
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/entry-macro.S
---- linux-3.12.6/arch/arm/mach-bcm2708/include/mach/entry-macro.S 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-3.12.6/arch/arm/mach-bcm2708/include/mach/entry-macro.S
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/entry-macro.S 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2014-02-04 14:59:24.905989786 +0100
@@ -0,0 +1,69 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/entry-macro.S
@@ -6171,9 +6171,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-ra
+1020: @ EQ will be set if no irqs pending
+
+ .endm
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/frc.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/frc.h
---- linux-3.12.6/arch/arm/mach-bcm2708/include/mach/frc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/frc.h 2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/frc.h linux-3.12.6/arch/arm/mach-bcm2708/include/mach/frc.h
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/frc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/include/mach/frc.h 2014-02-04 14:59:24.905989786 +0100
@@ -0,0 +1,38 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/timex.h
@@ -6213,9 +6213,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/frc.h linux-raspberry-
+extern unsigned long long frc_clock_ticks63(void);
+
+#endif
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/gpio.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/gpio.h
---- linux-3.12.6/arch/arm/mach-bcm2708/include/mach/gpio.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/gpio.h 2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/gpio.h linux-3.12.6/arch/arm/mach-bcm2708/include/mach/gpio.h
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/gpio.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/include/mach/gpio.h 2014-02-04 14:59:24.905989786 +0100
@@ -0,0 +1,17 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/gpio.h
@@ -6234,9 +6234,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/gpio.h linux-raspberry
+#define irq_to_gpio(x) ((x) - GPIO_IRQ_START)
+
+#endif
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/hardware.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/hardware.h
---- linux-3.12.6/arch/arm/mach-bcm2708/include/mach/hardware.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/hardware.h 2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/hardware.h linux-3.12.6/arch/arm/mach-bcm2708/include/mach/hardware.h
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/hardware.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/include/mach/hardware.h 2014-02-04 14:59:24.905989786 +0100
@@ -0,0 +1,28 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/hardware.h
@@ -6266,9 +6266,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/hardware.h linux-raspb
+#include <mach/platform.h>
+
+#endif
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/io.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/io.h
---- linux-3.12.6/arch/arm/mach-bcm2708/include/mach/io.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/io.h 2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/io.h linux-3.12.6/arch/arm/mach-bcm2708/include/mach/io.h
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/io.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/include/mach/io.h 2014-02-04 14:59:24.905989786 +0100
@@ -0,0 +1,27 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/io.h
@@ -6297,9 +6297,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/io.h linux-raspberry-p
+#define __io(a) __typesafe_io(a)
+
+#endif
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/irqs.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/irqs.h
---- linux-3.12.6/arch/arm/mach-bcm2708/include/mach/irqs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/irqs.h 2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/irqs.h linux-3.12.6/arch/arm/mach-bcm2708/include/mach/irqs.h
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/irqs.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/include/mach/irqs.h 2014-02-04 14:59:24.909989794 +0100
@@ -0,0 +1,199 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/irqs.h
@@ -6500,9 +6500,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/irqs.h linux-raspberry
+
+
+#endif /* _BCM2708_IRQS_H_ */
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/memory.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/memory.h
---- linux-3.12.6/arch/arm/mach-bcm2708/include/mach/memory.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/memory.h 2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/memory.h linux-3.12.6/arch/arm/mach-bcm2708/include/mach/memory.h
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/memory.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/include/mach/memory.h 2014-02-04 14:59:24.909989794 +0100
@@ -0,0 +1,57 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/memory.h
@@ -6561,9 +6561,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/memory.h linux-raspber
+#define __bus_to_pfn(x) __phys_to_pfn((x) - (BUS_OFFSET - PLAT_PHYS_OFFSET))
+
+#endif
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/platform.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/platform.h
---- linux-3.12.6/arch/arm/mach-bcm2708/include/mach/platform.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/platform.h 2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/platform.h linux-3.12.6/arch/arm/mach-bcm2708/include/mach/platform.h
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/platform.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/include/mach/platform.h 2014-02-04 14:59:24.909989794 +0100
@@ -0,0 +1,228 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/platform.h
@@ -6793,9 +6793,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/platform.h linux-raspb
+#endif
+
+/* END */
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/power.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/power.h
---- linux-3.12.6/arch/arm/mach-bcm2708/include/mach/power.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/power.h 2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/power.h linux-3.12.6/arch/arm/mach-bcm2708/include/mach/power.h
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/power.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/include/mach/power.h 2014-02-04 14:59:24.909989794 +0100
@@ -0,0 +1,26 @@
+/*
+ * linux/arch/arm/mach-bcm2708/power.h
@@ -6823,9 +6823,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/power.h linux-raspberr
+extern int bcm_power_close(BCM_POWER_HANDLE_T handle);
+
+#endif
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/system.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/system.h
---- linux-3.12.6/arch/arm/mach-bcm2708/include/mach/system.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/system.h 2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/system.h linux-3.12.6/arch/arm/mach-bcm2708/include/mach/system.h
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/system.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/include/mach/system.h 2014-02-04 14:59:24.909989794 +0100
@@ -0,0 +1,38 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/system.h
@@ -6865,9 +6865,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/system.h linux-raspber
+}
+
+#endif
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/timex.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/timex.h
---- linux-3.12.6/arch/arm/mach-bcm2708/include/mach/timex.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/timex.h 2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/timex.h linux-3.12.6/arch/arm/mach-bcm2708/include/mach/timex.h
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/timex.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/include/mach/timex.h 2014-02-04 14:59:24.909989794 +0100
@@ -0,0 +1,23 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/timex.h
@@ -6892,9 +6892,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/timex.h linux-raspberr
+ */
+
+#define CLOCK_TICK_RATE (1000000)
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/uncompress.h
---- linux-3.12.6/arch/arm/mach-bcm2708/include/mach/uncompress.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/uncompress.h 2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-3.12.6/arch/arm/mach-bcm2708/include/mach/uncompress.h
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/uncompress.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/include/mach/uncompress.h 2014-02-04 14:59:24.909989794 +0100
@@ -0,0 +1,84 @@
+/*
+ * arch/arm/mach-bcn2708/include/mach/uncompress.h
@@ -6980,9 +6980,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-ras
+ * nothing to do
+ */
+#define arch_decomp_wdog()
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/vcio.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/vcio.h
---- linux-3.12.6/arch/arm/mach-bcm2708/include/mach/vcio.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/vcio.h 2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/vcio.h linux-3.12.6/arch/arm/mach-bcm2708/include/mach/vcio.h
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/vcio.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/include/mach/vcio.h 2014-02-04 14:59:24.909989794 +0100
@@ -0,0 +1,141 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/vcio.h
@@ -7125,9 +7125,9 @@ diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/vcio.h linux-raspberry
+#define DEVICE_FILE_NAME "char_dev"
+
+#endif
-diff -Nur linux-3.12.6/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/vc_mem.h
---- linux-3.12.6/arch/arm/mach-bcm2708/include/mach/vc_mem.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/vc_mem.h 2013-12-29 10:40:21.000000000 +0100
+diff -Nur linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-3.12.6/arch/arm/mach-bcm2708/include/mach/vc_mem.h
+--- linux-3.12.6.orig/arch/arm/mach-bcm2708/include/mach/vc_mem.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.12.6/arch/arm/mach-bcm2708/include/mach/vc_mem.h 2014-02