From 940066ed3eeff7e3d4007a306cc95f339331bbfb Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Sun, 25 Aug 2019 17:33:51 -0500
Subject: [PATCH] GSOC: add greybus patch
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
patch.sh | 1 +
patches/WireGuard/0001-merge-WireGuard.patch | 26 +++++++++----------
...-https-github.com-hartkopp-can-isotp.patch | 6 ++---
patches/defconfig | 6 ++---
.../0001-change-MAX_NUM_UDC-from-2-to-4.patch | 26 +++++++++++++++++++
patches/ref_omap2plus_defconfig | 2 +-
...0001-Add-BeagleBoard.org-DTBS-v5.3.x.patch | 6 ++---
version.sh | 4 +--
8 files changed, 52 insertions(+), 25 deletions(-)
create mode 100644 patches/greybus/0001-change-MAX_NUM_UDC-from-2-to-4.patch
diff --git a/patch.sh b/patch.sh
index 7f779bdcc..cae53e2e2 100644
--- a/patch.sh
+++ b/patch.sh
@@ -474,6 +474,7 @@ drivers () {
dir 'drivers/ti/serial'
dir 'drivers/ti/tsc'
dir 'drivers/ti/gpio'
+ dir 'drivers/greybus'
}
soc () {
diff --git a/patches/WireGuard/0001-merge-WireGuard.patch b/patches/WireGuard/0001-merge-WireGuard.patch
index ed64f7aac..3bcd1cfc5 100644
--- a/patches/WireGuard/0001-merge-WireGuard.patch
+++ b/patches/WireGuard/0001-merge-WireGuard.patch
@@ -1,6 +1,6 @@
-From cb4466fbee7a81abe564661c41c3ace5c234ddf1 Mon Sep 17 00:00:00 2001
+From a12cb7152c9278daad27b8cf0ec6e08ebfd90750 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Mon, 19 Aug 2019 10:16:44 -0500
+Date: Sun, 25 Aug 2019 17:28:08 -0500
Subject: [PATCH] merge: WireGuard
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
@@ -11,10 +11,10 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
net/wireguard/Makefile | 14 +
net/wireguard/allowedips.c | 377 +
net/wireguard/allowedips.h | 59 +
- net/wireguard/compat/Makefile.include | 94 +
+ net/wireguard/compat/Makefile.include | 98 +
.../compat/checksum/checksum_partial_compat.h | 208 +
net/wireguard/compat/compat-asm.h | 43 +
- net/wireguard/compat/compat.h | 915 ++
+ net/wireguard/compat/compat.h | 911 ++
net/wireguard/compat/dst_cache/dst_cache.c | 175 +
.../compat/dst_cache/include/net/dst_cache.h | 97 +
.../compat/fpu-x86/include/asm/fpu/api.h | 1 +
@@ -735,10 +735,10 @@ index 000000000000..e5c83cafcef4
+#endif /* _WG_ALLOWEDIPS_H */
diff --git a/net/wireguard/compat/Makefile.include b/net/wireguard/compat/Makefile.include
new file mode 100644
-index 000000000000..45a2173f0de1
+index 000000000000..7bf345b5db52
--- /dev/null
+++ b/net/wireguard/compat/Makefile.include
-@@ -0,0 +1,94 @@
+@@ -0,0 +1,98 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+# Copyright (C) 2015-2019 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
@@ -788,6 +788,10 @@ index 000000000000..45a2173f0de1
+wireguard-y += compat/memneq/memneq.o
+endif
+
++ifeq ($(shell grep -s -F "addr_gen_mode" "$(srctree)/include/linux/ipv6.h"),)
++ccflags-y += -DCOMPAT_CANNOT_USE_DEV_CNF
++endif
++
+ifdef CONFIG_HZ
+ifeq ($(wildcard $(srctree)/include/generated/timeconst.h),)
+ccflags-y += $(shell echo 'define gcd(a,b){auto t;while(b){t=b;b=a%b;a=t;};return a;};hz=$(CONFIG_HZ);cd=gcd(hz,1000000);print "-DHZ_TO_USEC_NUM=",1000000/cd," -DHZ_TO_USEC_DEN=",hz/cd;halt;' | bc -q)
@@ -1098,10 +1102,10 @@ index 000000000000..f5c5bc29db26
+#endif /* _WG_COMPATASM_H */
diff --git a/net/wireguard/compat/compat.h b/net/wireguard/compat/compat.h
new file mode 100644
-index 000000000000..c98d623ab695
+index 000000000000..fb09037e8d6b
--- /dev/null
+++ b/net/wireguard/compat/compat.h
-@@ -0,0 +1,915 @@
+@@ -0,0 +1,911 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (C) 2015-2019 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
@@ -1704,10 +1708,6 @@ index 000000000000..c98d623ab695
+#define COMPAT_CANNOT_USE_IN6_DEV_GET
+#endif
+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
-+#define COMPAT_CANNOT_USE_DEV_CNF
-+#endif
-+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0)
+#define COMPAT_CANNOT_USE_IFF_NO_QUEUE
+#endif
@@ -51897,5 +51897,5 @@ index 000000000000..ae368725d068
@@ -0,0 +1 @@
+#define WIREGUARD_VERSION "0.0.20190702"
--
-2.20.1
+2.23.0.rc1
diff --git a/patches/can_isotp/0001-merge-can-isotp-https-github.com-hartkopp-can-isotp.patch b/patches/can_isotp/0001-merge-can-isotp-https-github.com-hartkopp-can-isotp.patch
index 9745581fe..70579c6d5 100644
--- a/patches/can_isotp/0001-merge-can-isotp-https-github.com-hartkopp-can-isotp.patch
+++ b/patches/can_isotp/0001-merge-can-isotp-https-github.com-hartkopp-can-isotp.patch
@@ -1,6 +1,6 @@
-From 7527c7fe4d16ac3966c79958b3d0f53c32f6ba64 Mon Sep 17 00:00:00 2001
+From fcb835a39ee3291b3d73c8517ebb127fac86f7ba Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Mon, 19 Aug 2019 10:16:17 -0500
+Date: Sun, 25 Aug 2019 17:27:51 -0500
Subject: [PATCH] merge: can-isotp: https://github.com/hartkopp/can-isotp
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
@@ -1692,5 +1692,5 @@ index 000000000000..02462b959f33
+module_init(isotp_module_init);
+module_exit(isotp_module_exit);
--
-2.20.1
+2.23.0.rc1
diff --git a/patches/defconfig b/patches/defconfig
index 036e35116..e045dc879 100644
--- a/patches/defconfig
+++ b/patches/defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.3.0-rc5 Kernel Configuration
+# Linux/arm 5.3.0-rc6 Kernel Configuration
#
#
@@ -24,7 +24,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
# CONFIG_HEADER_TEST is not set
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_BUILD_SALT="5.3-rc5-bone4"
+CONFIG_BUILD_SALT="5.3-rc6-bone4.1"
CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_LZMA=y
CONFIG_HAVE_KERNEL_XZ=y
@@ -5167,7 +5167,7 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
# CONFIG_USB_BDC_UDC is not set
# CONFIG_USB_NET2272 is not set
# CONFIG_USB_GADGET_XILINX is not set
-# CONFIG_USB_DUMMY_HCD is not set
+CONFIG_USB_DUMMY_HCD=m
# end of USB Peripheral Controller
CONFIG_USB_LIBCOMPOSITE=m
diff --git a/patches/greybus/0001-change-MAX_NUM_UDC-from-2-to-4.patch b/patches/greybus/0001-change-MAX_NUM_UDC-from-2-to-4.patch
new file mode 100644
index 000000000..9db9efb9c
--- /dev/null
+++ b/patches/greybus/0001-change-MAX_NUM_UDC-from-2-to-4.patch
@@ -0,0 +1,26 @@
+From eff9413c00851c3941899f3dd509023a13c566ac Mon Sep 17 00:00:00 2001
+From: Vaishnav M A <mavaishnav007@gmail.com>
+Date: Mon, 26 Aug 2019 02:06:27 +0530
+Subject: [PATCH] change MAX_NUM_UDC from 2 to 4
+
+The project clickboard support through greybus(https://github.com/vaishnav98/gbsim/wiki/Beagleboard-GSoC-'19:--Clickboard-Support-Under-Greybus) uses dummy_hcd emulated UDC for running the greybus simulator and requires an instance of emulated UDC for each mikrobus port, since the Beaglebone Black Mikrobus Cape has 4 Mikrobus Slots for serving all of the ports through greybus simulator at a time requires 4 emulated dummy_hcd UDC.
+---
+ drivers/usb/gadget/udc/dummy_hcd.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/usb/gadget/udc/dummy_hcd.c b/drivers/usb/gadget/udc/dummy_hcd.c
+index c0780e414534..4bebbdbdb626 100644
+--- a/drivers/usb/gadget/udc/dummy_hcd.c
++++ b/drivers/usb/gadget/udc/dummy_hcd.c
+@@ -2719,7 +2719,7 @@ static struct platform_driver dummy_hcd_driver = {
+ };
+
+ /*-------------------------------------------------------------------------*/
+-#define MAX_NUM_UDC 2
++#define MAX_NUM_UDC 4
+ static struct platform_device *the_udc_pdev[MAX_NUM_UDC];
+ static struct platform_device *the_hcd_pdev[MAX_NUM_UDC];
+
+--
+2.23.0.rc1
+
diff --git a/patches/ref_omap2plus_defconfig b/patches/ref_omap2plus_defconfig
index dbfe1081c..19017fe49 100644
--- a/patches/ref_omap2plus_defconfig
+++ b/patches/ref_omap2plus_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.3.0-rc5 Kernel Configuration
+# Linux/arm 5.3.0-rc6 Kernel Configuration
#
#
diff --git a/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-DTBS-v5.3.x.patch b/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-DTBS-v5.3.x.patch
index 09dcea387..10198e9e5 100644
--- a/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-DTBS-v5.3.x.patch
+++ b/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-DTBS-v5.3.x.patch
@@ -1,6 +1,6 @@
-From 57e0c0118b426e6aedb937c19c72febd607b054d Mon Sep 17 00:00:00 2001
+From b44014ce7df2ed6f42bd684a87fe1d7e37471adf Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Mon, 19 Aug 2019 10:17:15 -0500
+Date: Sun, 25 Aug 2019 17:28:23 -0500
Subject: [PATCH] Add BeagleBoard.org DTBS: v5.3.x
https://github.com/beagleboard/BeagleBoard-DeviceTrees/tree/v5.3.x
@@ -10318,5 +10318,5 @@ index 000000000000..35f6d57ef492
+
+#endif
--
-2.20.1
+2.23.0.rc1
diff --git a/version.sh b/version.sh
index 81072911a..25088e3fe 100644
--- a/version.sh
+++ b/version.sh
@@ -32,10 +32,10 @@ toolchain="gcc_arm_gnueabihf_8"
#Kernel
KERNEL_REL=5.3
-KERNEL_TAG=${KERNEL_REL}-rc5
+KERNEL_TAG=${KERNEL_REL}-rc6
kernel_rt=".X-rtY"
#Kernel Build
-BUILD=${build_prefix}4
+BUILD=${build_prefix}4.1
#v5.X-rcX + upto SHA
#prev_KERNEL_SHA=""
--
GitLab