From 8f5e5b3a1e814c031b0828d3f7459061455fbe27 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Sun, 26 Mar 2017 20:30:42 -0500
Subject: [PATCH] 4.11-rc4-bone0 release
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
patch.sh | 17 +++++++++-----
patches/defconfig | 11 +++++-----
patches/defconfig-bone | 11 +++++-----
...-Update-to-upstream-version-overlays.patch | 4 ++--
patches/ref_omap2plus_defconfig | 22 +++++++------------
version.sh | 2 +-
6 files changed, 35 insertions(+), 32 deletions(-)
diff --git a/patch.sh b/patch.sh
index 37b430c6c..915858f0e 100644
--- a/patch.sh
+++ b/patch.sh
@@ -256,7 +256,8 @@ backports () {
if [ "x${regenerate}" = "xenable" ] ; then
pre_backports
- cp -v ~/linux-src/x/ ./x/
+ mkdir -p ./x/
+ cp -v ~/linux-src/x/* ./x/
post_backports
exit 2
@@ -500,17 +501,23 @@ soc
beaglebone
dir 'build/gcc'
+git_clone_dtc () {
+ ${git_bin} clone -b master https://git.kernel.org/pub/scm/utils/dtc/dtc.git --depth=10
+ #dtc: Bump version to v1.4.4
+ cd ./dtc
+ ${git_bin} checkout 558cd81bdd432769b59bff01240c44f82cfb1a9d -b tmp
+ cd ../
+}
+
sync_mainline_dtc () {
echo "dir: dtc"
#regenerate="enable"
if [ "x${regenerate}" = "xenable" ] ; then
cd ../
- if [ ! -d ./dtc ] ; then
- ${git_bin} clone -b master https://git.kernel.org/pub/scm/utils/dtc/dtc.git --depth=1
- else
+ if [ -d ./dtc ] ; then
rm -rf ./dtc || true
- ${git_bin} clone -b master https://git.kernel.org/pub/scm/utils/dtc/dtc.git --depth=1
fi
+ git_clone_dtc
cd ./KERNEL/
sed -i -e 's:git commit:#git commit:g' ./scripts/dtc/update-dtc-source.sh
diff --git a/patches/defconfig b/patches/defconfig
index 0355d5b09..c1918432f 100644
--- a/patches/defconfig
+++ b/patches/defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.11.0-rc3 Kernel Configuration
+# Linux/arm 4.11.0-rc4 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -502,10 +502,10 @@ CONFIG_ARM_DMA_MEM_BUFFERABLE=y
CONFIG_ARM_HEAVY_MB=y
CONFIG_DEBUG_ALIGN_RODATA=y
CONFIG_MULTI_IRQ_HANDLER=y
-CONFIG_ARM_ERRATA_430973=y
-CONFIG_ARM_ERRATA_720789=y
-CONFIG_ARM_ERRATA_754322=y
-CONFIG_ARM_ERRATA_775420=y
+# CONFIG_ARM_ERRATA_430973 is not set
+# CONFIG_ARM_ERRATA_720789 is not set
+# CONFIG_ARM_ERRATA_754322 is not set
+# CONFIG_ARM_ERRATA_775420 is not set
# CONFIG_ARM_ERRATA_773022 is not set
# CONFIG_ARM_ERRATA_818325_852422 is not set
# CONFIG_ARM_ERRATA_821420 is not set
@@ -2137,6 +2137,7 @@ CONFIG_TI_CPSW_PHY_SEL=y
CONFIG_TI_CPSW_ALE=y
CONFIG_TI_CPSW=y
CONFIG_TI_CPTS=y
+CONFIG_TI_CPTS_MOD=y
# CONFIG_NET_VENDOR_VIA is not set
CONFIG_NET_VENDOR_WIZNET=y
# CONFIG_WIZNET_W5100 is not set
diff --git a/patches/defconfig-bone b/patches/defconfig-bone
index 05412cc6d..e349b5a15 100644
--- a/patches/defconfig-bone
+++ b/patches/defconfig-bone
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.11.0-rc3 Kernel Configuration
+# Linux/arm 4.11.0-rc4 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -502,10 +502,10 @@ CONFIG_ARM_DMA_MEM_BUFFERABLE=y
CONFIG_ARM_HEAVY_MB=y
CONFIG_DEBUG_ALIGN_RODATA=y
CONFIG_MULTI_IRQ_HANDLER=y
-CONFIG_ARM_ERRATA_430973=y
-CONFIG_ARM_ERRATA_720789=y
-CONFIG_ARM_ERRATA_754322=y
-CONFIG_ARM_ERRATA_775420=y
+# CONFIG_ARM_ERRATA_430973 is not set
+# CONFIG_ARM_ERRATA_720789 is not set
+# CONFIG_ARM_ERRATA_754322 is not set
+# CONFIG_ARM_ERRATA_775420 is not set
# CONFIG_ARM_ERRATA_773022 is not set
# CONFIG_ARM_ERRATA_818325_852422 is not set
# CONFIG_ARM_ERRATA_821420 is not set
@@ -2137,6 +2137,7 @@ CONFIG_TI_CPSW_PHY_SEL=y
CONFIG_TI_CPSW_ALE=y
CONFIG_TI_CPSW=y
CONFIG_TI_CPTS=y
+CONFIG_TI_CPTS_MOD=y
# CONFIG_NET_VENDOR_VIA is not set
CONFIG_NET_VENDOR_WIZNET=y
# CONFIG_WIZNET_W5100 is not set
diff --git a/patches/dtc/0001-scripts-dtc-Update-to-upstream-version-overlays.patch b/patches/dtc/0001-scripts-dtc-Update-to-upstream-version-overlays.patch
index c93793e69..acd74f73b 100644
--- a/patches/dtc/0001-scripts-dtc-Update-to-upstream-version-overlays.patch
+++ b/patches/dtc/0001-scripts-dtc-Update-to-upstream-version-overlays.patch
@@ -1,6 +1,6 @@
-From 2d6ce4ae6a01166674d7406234d3dbc64b5899bc Mon Sep 17 00:00:00 2001
+From 598fd85a12c0aa2b2e3b18e6a28b52b07b87c056 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Sun, 19 Mar 2017 21:42:28 -0500
+Date: Sun, 26 Mar 2017 20:17:30 -0500
Subject: [PATCH] scripts/dtc: Update to upstream version overlays
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
diff --git a/patches/ref_omap2plus_defconfig b/patches/ref_omap2plus_defconfig
index 45e11a58a..4061f6706 100644
--- a/patches/ref_omap2plus_defconfig
+++ b/patches/ref_omap2plus_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.11.0-rc3 Kernel Configuration
+# Linux/arm 4.11.0-rc4 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -844,7 +844,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y
# CONFIG_IPV6_SEG6_HMAC is not set
# CONFIG_NETLABEL is not set
# CONFIG_NETWORK_SECMARK is not set
-CONFIG_NET_PTP_CLASSIFY=y
+# CONFIG_NET_PTP_CLASSIFY is not set
# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
CONFIG_NETFILTER=y
# CONFIG_NETFILTER_DEBUG is not set
@@ -1510,7 +1510,6 @@ CONFIG_TI_DAVINCI_CPDMA=y
CONFIG_TI_CPSW_PHY_SEL=y
CONFIG_TI_CPSW_ALE=y
CONFIG_TI_CPSW=y
-CONFIG_TI_CPTS=y
# CONFIG_NET_VENDOR_VIA is not set
# CONFIG_NET_VENDOR_WIZNET is not set
CONFIG_PHYLIB=y
@@ -1688,7 +1687,10 @@ CONFIG_INPUT_MATRIXKMAP=m
#
# Userland interfaces
#
-# CONFIG_INPUT_MOUSEDEV is not set
+CONFIG_INPUT_MOUSEDEV=m
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
CONFIG_INPUT_JOYDEV=m
CONFIG_INPUT_EVDEV=m
# CONFIG_INPUT_EVBUG is not set
@@ -2007,15 +2009,7 @@ CONFIG_SSI_PROTOCOL=m
#
# PPS support
#
-CONFIG_PPS=y
-# CONFIG_PPS_DEBUG is not set
-
-#
-# PPS clients support
-#
-# CONFIG_PPS_CLIENT_KTIMER is not set
-# CONFIG_PPS_CLIENT_LDISC is not set
-# CONFIG_PPS_CLIENT_GPIO is not set
+# CONFIG_PPS is not set
#
# PPS generators support
@@ -2024,7 +2018,7 @@ CONFIG_PPS=y
#
# PTP clock support
#
-CONFIG_PTP_1588_CLOCK=y
+# CONFIG_PTP_1588_CLOCK is not set
#
# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
diff --git a/version.sh b/version.sh
index 2486def9b..0b29d60d8 100644
--- a/version.sh
+++ b/version.sh
@@ -27,7 +27,7 @@ toolchain="gcc_linaro_gnueabihf_6"
#Kernel/Build
KERNEL_REL=4.11
-KERNEL_TAG=${KERNEL_REL}-rc3
+KERNEL_TAG=${KERNEL_REL}-rc4
BUILD=${build_prefix}0
kernel_rt=".X-rtY"
--
GitLab