Updated kernel configuration for Lemaker Guitar, upgraded to 3.10.101 and added Roseapple Pi (WIP) with the same kernel, while this board not booting yet

This commit is contained in:
Igor Pecovnik 2016-04-22 21:19:31 +02:00
parent 338e1c9e5f
commit cda49bd6c2
5 changed files with 319 additions and 200 deletions

View file

@ -0,0 +1,17 @@
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 878fc14..90329ab 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -222,7 +222,11 @@ dtb-$(CONFIG_ARCH_OWL) += lemaker_guitar_bba.dtb \
lemaker_guitar_bbb.dtb \
lemaker_guitar_bbb_plus.dtb \
lemaker_guitar_bbc.dtb \
- lemaker_guitar_bbd.dtb
+ lemaker_guitar_bbd.dtb \
+ actduino_bubble_gum.dtb \
+ actduino_bubble_gum_sdboot.dtb \
+ actduino_bubble_gum_linux.dtb \
+ actduino_bubble_gum_sdboot_linux.dtb
ifeq ($(CONFIG_ARCH_OWL),y)
DTC_FLAGS = -R -4 -p 0x1000

View file

@ -413,20 +413,6 @@ index ba6db78a02b1..69940a723abd 100644
if (!net_eq(net, &init_net))
return -EAFNOSUPPORT;
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index c9ae6b703c13..b586a3230247 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -456,6 +456,9 @@ static int sco_sock_bind(struct socket *sock, struct sockaddr *addr, int addr_le
if (!addr || addr->sa_family != AF_BLUETOOTH)
return -EINVAL;
+ if (addr_len < sizeof(struct sockaddr_sco))
+ return -EINVAL;
+
lock_sock(sk);
if (sk->sk_state != BT_OPEN) {
diff --git a/net/core/scm.c b/net/core/scm.c
index b4da80b1cc07..dbc6bfcdf446 100644
--- a/net/core/scm.c