summaryrefslogtreecommitdiff
path: root/target/linux
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/config/Config.in.graphics5
-rw-r--r--target/linux/config/Config.in.serial2
-rw-r--r--target/linux/patches/4.1.20/realtime.patch5
-rw-r--r--target/linux/patches/4.1.20/use-gawk.patch24
4 files changed, 31 insertions, 5 deletions
diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics
index f467bd165..969134a2c 100644
--- a/target/linux/config/Config.in.graphics
+++ b/target/linux/config/Config.in.graphics
@@ -127,6 +127,9 @@ config ADK_KERNEL_FB_SM501
config ADK_KERNEL_DRM
bool
+config ADK_KERNEL_DRM_VC4
+ bool
+
config ADK_KERNEL_DRM_I915
bool
@@ -240,6 +243,8 @@ config ADK_KERNEL_FB_SM7XX
config ADK_KERNEL_FB_BCM2708
bool "Framebuffer support for BCM2835 boards"
+ select ADK_KERNEL_DRM if ADK_TARGET_KERNEL_VERSION_4_4
+ select ADK_KERNEL_DRM_VC4 if ADK_TARGET_KERNEL_VERSION_4_4
select ADK_KERNEL_FB
select ADK_KERNEL_FRAMEBUFFER_CONSOLE
select ADK_KERNEL_FONT_8x16
diff --git a/target/linux/config/Config.in.serial b/target/linux/config/Config.in.serial
index d274a2d6d..7e74e3bc8 100644
--- a/target/linux/config/Config.in.serial
+++ b/target/linux/config/Config.in.serial
@@ -163,6 +163,8 @@ config ADK_KERNEL_SERIAL_AMBA_PL011
bool "AMBA PL011 serial driver"
select ADK_KERNEL_SERIAL_AMBA_PL011_CONSOLE
select ADK_KERNEL_SERIAL_OF_PLATFORM
+ select ADK_KERNEL_SERIAL_8250
+ select ADK_KERNEL_SERIAL_8250_CONSOLE
depends on ADK_TARGET_BOARD_BCM28XX \
|| ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE \
|| ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB \
diff --git a/target/linux/patches/4.1.20/realtime.patch b/target/linux/patches/4.1.20/realtime.patch
index 9ea8309aa..6d8c2ac68 100644
--- a/target/linux/patches/4.1.20/realtime.patch
+++ b/target/linux/patches/4.1.20/realtime.patch
@@ -26274,11 +26274,6 @@ diff -Nur linux-4.1.20.orig/lib/strnlen_user.c linux-4.1.20/lib/strnlen_user.c
*
* Get the size of a NUL-terminated string in user space.
*
-diff -Nur linux-4.1.20.orig/localversion-rt linux-4.1.20/localversion-rt
---- linux-4.1.20.orig/localversion-rt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.1.20/localversion-rt 2016-03-21 20:18:34.000000000 +0100
-@@ -0,0 +1 @@
-+-rt22
diff -Nur linux-4.1.20.orig/mm/Kconfig linux-4.1.20/mm/Kconfig
--- linux-4.1.20.orig/mm/Kconfig 2016-03-17 19:11:03.000000000 +0100
+++ linux-4.1.20/mm/Kconfig 2016-03-21 20:18:34.000000000 +0100
diff --git a/target/linux/patches/4.1.20/use-gawk.patch b/target/linux/patches/4.1.20/use-gawk.patch
new file mode 100644
index 000000000..5b312589d
--- /dev/null
+++ b/target/linux/patches/4.1.20/use-gawk.patch
@@ -0,0 +1,24 @@
+diff -Nur linux-4.1.20.orig/Makefile linux-4.1.20/Makefile
+--- linux-4.1.20.orig/Makefile 2016-03-17 19:11:03.000000000 +0100
++++ linux-4.1.20/Makefile 2016-04-02 13:24:23.000000000 +0200
+@@ -359,7 +359,7 @@
+ STRIP = $(CROSS_COMPILE)strip
+ OBJCOPY = $(CROSS_COMPILE)objcopy
+ OBJDUMP = $(CROSS_COMPILE)objdump
+-AWK = awk
++AWK = gawk
+ GENKSYMS = scripts/genksyms/genksyms
+ INSTALLKERNEL := installkernel
+ DEPMOD = /sbin/depmod
+diff -Nur linux-4.1.20.orig/lib/raid6/test/Makefile linux-4.1.20/lib/raid6/test/Makefile
+--- linux-4.1.20.orig/lib/raid6/test/Makefile 2016-03-17 19:11:03.000000000 +0100
++++ linux-4.1.20/lib/raid6/test/Makefile 2016-04-02 09:45:15.000000000 +0200
+@@ -7,7 +7,7 @@
+ OPTFLAGS = -O2 # Adjust as desired
+ CFLAGS = -I.. -I ../../../include -g $(OPTFLAGS)
+ LD = ld
+-AWK = awk -f
++AWK = gawk -f
+ AR = ar
+ RANLIB = ranlib
+ OBJS = int1.o int2.o int4.o int8.o int16.o int32.o recov.o algos.o tables.o