aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-3.14/0005-bcm2708-framebuffer-driver.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-12-08 12:04:25 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-12-08 12:04:25 +0000
commit9a495f6bbbcb294b9926f4ec32e5bbb339395d00 (patch)
treec76b5e53fffd1d6238ba09da9d8bb7a6bde9e474 /target/linux/brcm2708/patches-3.14/0005-bcm2708-framebuffer-driver.patch
parent3951f9492f31b59602a9a7c46fbb041be0929be0 (diff)
downloadupstream-9a495f6bbbcb294b9926f4ec32e5bbb339395d00.tar.gz
upstream-9a495f6bbbcb294b9926f4ec32e5bbb339395d00.tar.bz2
upstream-9a495f6bbbcb294b9926f4ec32e5bbb339395d00.zip
kernel: refresh patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 43564
Diffstat (limited to 'target/linux/brcm2708/patches-3.14/0005-bcm2708-framebuffer-driver.patch')
-rw-r--r--target/linux/brcm2708/patches-3.14/0005-bcm2708-framebuffer-driver.patch14
1 files changed, 1 insertions, 13 deletions
diff --git a/target/linux/brcm2708/patches-3.14/0005-bcm2708-framebuffer-driver.patch b/target/linux/brcm2708/patches-3.14/0005-bcm2708-framebuffer-driver.patch
index 437b4a0d24..9fb4276e32 100644
--- a/target/linux/brcm2708/patches-3.14/0005-bcm2708-framebuffer-driver.patch
+++ b/target/linux/brcm2708/patches-3.14/0005-bcm2708-framebuffer-driver.patch
@@ -12,8 +12,6 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
4 files changed, 1395 insertions(+), 1602 deletions(-)
create mode 100644 drivers/video/bcm2708_fb.c
-diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
-index dade5b7..4afc29b 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -310,6 +310,20 @@ config FB_PM2_FIFO_DISCONNECT
@@ -37,11 +35,9 @@ index dade5b7..4afc29b 100644
config FB_ARMCLCD
tristate "ARM PrimeCell PL110 support"
depends on ARM || ARM64 || COMPILE_TEST
-diff --git a/drivers/video/Makefile b/drivers/video/Makefile
-index ae17ddf..35654ba 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
-@@ -100,6 +100,7 @@ obj-$(CONFIG_FB_PVR2) += pvr2fb.o
+@@ -100,6 +100,7 @@ obj-$(CONFIG_FB_PVR2) += pvr
obj-$(CONFIG_FB_VOODOO1) += sstfb.o
obj-$(CONFIG_FB_ARMCLCD) += amba-clcd.o
obj-$(CONFIG_FB_GOLDFISH) += goldfishfb.o
@@ -49,9 +45,6 @@ index ae17ddf..35654ba 100644
obj-$(CONFIG_FB_68328) += 68328fb.o
obj-$(CONFIG_FB_GBE) += gbefb.o
obj-$(CONFIG_FB_CIRRUS) += cirrusfb.o
-diff --git a/drivers/video/bcm2708_fb.c b/drivers/video/bcm2708_fb.c
-new file mode 100644
-index 0000000..54cd760
--- /dev/null
+++ b/drivers/video/bcm2708_fb.c
@@ -0,0 +1,499 @@
@@ -554,8 +547,6 @@ index 0000000..54cd760
+MODULE_PARM_DESC(fbheight, "Height of ARM Framebuffer");
+MODULE_PARM_DESC(fbdepth, "Bit depth of ARM Framebuffer");
+MODULE_PARM_DESC(fbswap, "Swap order of red and blue in 24 and 32 bit modes");
-diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
-index 3c14e43..7626beb 100644
--- a/drivers/video/logo/logo_linux_clut224.ppm
+++ b/drivers/video/logo/logo_linux_clut224.ppm
@@ -1,1604 +1,883 @@
@@ -3044,6 +3035,3 @@ index 3c14e43..7626beb 100644
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0
---
-1.9.1
-