diff --git a/patches/WireGuard/0001-merge-WireGuard.patch b/patches/WireGuard/0001-merge-WireGuard.patch index 18edab8b6f15effb7c717b0df8d43347f699b453..eabe86f814e32e1888280a2fadcd66101c64cf77 100644 --- a/patches/WireGuard/0001-merge-WireGuard.patch +++ b/patches/WireGuard/0001-merge-WireGuard.patch @@ -1,6 +1,6 @@ -From 6485b48ee77ed334135a26e74830f68a43f91390 Mon Sep 17 00:00:00 2001 +From 251dc46133f7c94b26b8f4dac8b61f63dd2338d9 Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Sun, 11 Mar 2018 20:01:07 -0500 +Date: Sun, 18 Mar 2018 21:28:46 -0500 Subject: [PATCH] merge: WireGuard Signed-off-by: Robert Nelson <robertcnelson@gmail.com> @@ -32977,5 +32977,5 @@ index 000000000000..2915e9a0eddc @@ -0,0 +1 @@ +#define WIREGUARD_VERSION "0.0.20180304" -- -2.16.1 +2.16.2 diff --git a/patches/drivers/ti/uio/0006-uio_pruss-add-names-to-memory-regions.patch b/patches/drivers/ti/uio/0006-uio_pruss-add-names-to-memory-regions.patch new file mode 100644 index 0000000000000000000000000000000000000000..7a756d562acb1febec5517a644e371a2ed5da5bb --- /dev/null +++ b/patches/drivers/ti/uio/0006-uio_pruss-add-names-to-memory-regions.patch @@ -0,0 +1,46 @@ +From 95cc71e0c6e15fe8cb01b1a3e292e249a42d6248 Mon Sep 17 00:00:00 2001 +From: Matthijs van Duin <matthijsvanduin@gmail.com> +Date: Thu, 29 Jun 2017 02:05:17 +0200 +Subject: [PATCH] uio_pruss: add names to memory regions + +Signed-off-by: Matthijs van Duin <matthijsvanduin@gmail.com> +--- + drivers/uio/uio_pruss.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/drivers/uio/uio_pruss.c b/drivers/uio/uio_pruss.c +index 73794c701881..61cc7c1c2a2c 100644 +--- a/drivers/uio/uio_pruss.c ++++ b/drivers/uio/uio_pruss.c +@@ -299,23 +299,24 @@ static int pruss_probe(struct platform_device *pdev) + gdev->hostirq_start = platform_get_irq(pdev, 0); + + for (cnt = 0, p = gdev->info; cnt < MAX_PRUSS_EVT; cnt++, p++) { ++ p->mem[0].name = "pruss"; + p->mem[0].addr = regs_prussio->start; + p->mem[0].size = resource_size(regs_prussio); + p->mem[0].memtype = UIO_MEM_PHYS; + +- /* oh this is nicely done... *barf* +- * and of course the userspace libs now hardcode these indices +- * - Matthijs van Duin +- */ ++ /* note: some userspace code uses hardcoded indices... */ + #ifdef CONFIG_ARCH_DAVINCI_DA850 ++ p->mem[1].name = "sram"; + p->mem[1].addr = gdev->sram_paddr; + p->mem[1].size = sram_pool_sz; + p->mem[1].memtype = UIO_MEM_PHYS; + ++ p->mem[2].name = "ddr"; + p->mem[2].addr = gdev->ddr_paddr; + p->mem[2].size = extram_pool_sz; + p->mem[2].memtype = UIO_MEM_PHYS; + #else ++ p->mem[1].name = "ddr"; + p->mem[1].addr = gdev->ddr_paddr; + p->mem[1].size = extram_pool_sz; + p->mem[1].memtype = UIO_MEM_PHYS; +-- +2.11.0 + diff --git a/patches/ref_omap2plus_defconfig b/patches/ref_omap2plus_defconfig index 7a44322142d91cb5f33112c4a95c703bba766ac1..abe7354aa9ed77ca2878614c920948c9386fde26 100644 --- a/patches/ref_omap2plus_defconfig +++ b/patches/ref_omap2plus_defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.16.0-rc5 Kernel Configuration +# Linux/arm 4.16.0-rc6 Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y diff --git a/version.sh b/version.sh index 656bf87cef5eab1c56d3517ba64c24a8c9b77a59..6258467fe5b8de9458012c16aca7df8548830dbb 100644 --- a/version.sh +++ b/version.sh @@ -30,7 +30,7 @@ toolchain="gcc_linaro_gnueabihf_7" #Kernel KERNEL_REL=4.16 -KERNEL_TAG=${KERNEL_REL}-rc5 +KERNEL_TAG=${KERNEL_REL}-rc6 kernel_rt=".X-rtY" #Kernel Build BUILD=${build_prefix}7