From 3216294057850622855d9968d16d1906c5e7b9f6 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Sun, 2 Feb 2020 13:59:09 -0600
Subject: [PATCH] kernel v5.5.1 rebase with:
wireguard/can_isotp/device-tree/etc BBDTBS:
https://github.com/beagleboard/BeagleBoard-DeviceTrees/commit/4e97cde7485d449aed24454528d6d81f9a9ba06f
CAN-ISOTP:
https://github.com/hartkopp/can-isotp/commit/ced84cab120a1ddde2bd4561a18514707c8a6184
TI_AMX3_CM3:
http://git.ti.com/gitweb/?p=processor-firmware/ti-amx3-cm3-pm-firmware.git;a=commit;h=6a849767df85ce9399494f53fb5c753665396653
WIREGUARD:
https://git.zx2c4.com/WireGuard/commit/edad0d6e99e5133b1e8e865d727a25fff6399cb4
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
patch.sh | 33 ++++++++++---------
patches/WireGuard/0001-merge-WireGuard.patch | 4 +--
...-https-github.com-hartkopp-can-isotp.patch | 4 +--
patches/defconfig | 2 +-
patches/ref_omap2plus_defconfig | 2 +-
...0001-Add-BeagleBoard.org-DTBS-v5.5.x.patch | 4 +--
tools/host_det.sh | 10 +++---
version.sh | 4 +--
8 files changed, 33 insertions(+), 30 deletions(-)
diff --git a/patch.sh b/patch.sh
index b6d555457..ea048ad95 100644
--- a/patch.sh
+++ b/patch.sh
@@ -268,6 +268,7 @@ ti_pm_firmware () {
dir 'drivers/ti/firmware'
}
+
dtb_makefile_append_omap4 () {
sed -i -e 's:omap4-panda.dtb \\:omap4-panda.dtb \\\n\t'$device' \\:g' arch/arm/boot/dts/Makefile
}
@@ -277,26 +278,28 @@ dtb_makefile_append () {
}
beagleboard_dtbs () {
- bbdtbs="v5.5.x"
+ branch="v5.5.x"
+ https_repo="https://github.com/beagleboard/BeagleBoard-DeviceTrees"
+ work_dir="BeagleBoard-DeviceTrees"
#regenerate="enable"
if [ "x${regenerate}" = "xenable" ] ; then
cd ../
- if [ ! -d ./BeagleBoard-DeviceTrees ] ; then
- ${git_bin} clone -b ${bbdtbs} https://github.com/beagleboard/BeagleBoard-DeviceTrees --depth=1
- cd ./BeagleBoard-DeviceTrees
- bbdtbs_hash=$(git rev-parse HEAD)
+ if [ ! -d ./${work_dir} ] ; then
+ ${git_bin} clone -b ${branch} ${https_repo} --depth=1
+ cd ./${work_dir}
+ git_hash=$(git rev-parse HEAD)
cd -
else
- rm -rf ./BeagleBoard-DeviceTrees || true
- ${git_bin} clone -b ${bbdtbs} https://github.com/beagleboard/BeagleBoard-DeviceTrees --depth=1
- cd ./BeagleBoard-DeviceTrees
- bbdtbs_hash=$(git rev-parse HEAD)
+ rm -rf ./${work_dir} || true
+ ${git_bin} clone -b ${branch} ${https_repo} --depth=1
+ cd ./${work_dir}
+ git_hash=$(git rev-parse HEAD)
cd -
fi
cd ./KERNEL/
- cp -vr ../BeagleBoard-DeviceTrees/src/arm/* arch/arm/boot/dts/
- cp -vr ../BeagleBoard-DeviceTrees/include/dt-bindings/* ./include/dt-bindings/
+ cp -vr ../${work_dir}/src/arm/* arch/arm/boot/dts/
+ cp -vr ../${work_dir}/include/dt-bindings/* ./include/dt-bindings/
device="omap4-panda-es-b3.dtb" ; dtb_makefile_append_omap4
@@ -311,17 +314,17 @@ beagleboard_dtbs () {
${git_bin} add -f arch/arm/boot/dts/
${git_bin} add -f include/dt-bindings/
- ${git_bin} commit -a -m "Add BeagleBoard.org DTBS: $bbdtbs" -m "https://github.com/beagleboard/BeagleBoard-DeviceTrees/tree/${bbdtbs}" -m "https://github.com/beagleboard/BeagleBoard-DeviceTrees/commit/${bbdtbs_hash}" -s
+ ${git_bin} commit -a -m "Add BeagleBoard.org DTBS: $branch" -m "${https_repo}/tree/${branch}" -m "${https_repo}/commit/${git_hash}" -s
${git_bin} format-patch -1 -o ../patches/soc/ti/beagleboard_dtbs/
- echo "BBDTBS: https://github.com/beagleboard/BeagleBoard-DeviceTrees/commit/${bbdtbs_hash}" > ../patches/git/BBDTBS
+ echo "BBDTBS: ${https_repo}/commit/${git_hash}" > ../patches/git/BBDTBS
- rm -rf ../BeagleBoard-DeviceTrees/ || true
+ rm -rf ../${work_dir}/ || true
${git_bin} reset --hard HEAD^
start_cleanup
- ${git} "${DIR}/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-DTBS-$bbdtbs.patch"
+ ${git} "${DIR}/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-DTBS-$branch.patch"
wdir="soc/ti/beagleboard_dtbs"
number=1
diff --git a/patches/WireGuard/0001-merge-WireGuard.patch b/patches/WireGuard/0001-merge-WireGuard.patch
index 007e46e03..48777340c 100644
--- a/patches/WireGuard/0001-merge-WireGuard.patch
+++ b/patches/WireGuard/0001-merge-WireGuard.patch
@@ -1,6 +1,6 @@
-From 9a1f5690558537e8798e3853d88e90fe2c6b20b2 Mon Sep 17 00:00:00 2001
+From f237e8bbf2404c53f96f7e56f14f8fa81497dc89 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Mon, 27 Jan 2020 09:34:57 -0600
+Date: Sun, 2 Feb 2020 13:56:27 -0600
Subject: [PATCH] merge: WireGuard
https://git.zx2c4.com/WireGuard/commit/edad0d6e99e5133b1e8e865d727a25fff6399cb4
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 4d90ddf58..bdb3784e2 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 fb291034e752e18d6149ec32f4da0578cc83b604 Mon Sep 17 00:00:00 2001
+From a6d64639bcd2dc188885bf3d5ee66d2e7ec16dab Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Mon, 27 Jan 2020 09:34:37 -0600
+Date: Sun, 2 Feb 2020 13:55:59 -0600
Subject: [PATCH] merge: can-isotp: https://github.com/hartkopp/can-isotp
https://github.com/hartkopp/can-isotp/commit/ced84cab120a1ddde2bd4561a18514707c8a6184
diff --git a/patches/defconfig b/patches/defconfig
index c06b2b887..eed3b49b0 100644
--- a/patches/defconfig
+++ b/patches/defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.5.0 Kernel Configuration
+# Linux/arm 5.5.1 Kernel Configuration
#
#
diff --git a/patches/ref_omap2plus_defconfig b/patches/ref_omap2plus_defconfig
index 8611fa8a5..3a3b9a8c5 100644
--- a/patches/ref_omap2plus_defconfig
+++ b/patches/ref_omap2plus_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.5.0 Kernel Configuration
+# Linux/arm 5.5.1 Kernel Configuration
#
#
diff --git a/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-DTBS-v5.5.x.patch b/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-DTBS-v5.5.x.patch
index e28adf585..5ac4ae801 100644
--- a/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-DTBS-v5.5.x.patch
+++ b/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-DTBS-v5.5.x.patch
@@ -1,6 +1,6 @@
-From e4bcfacf9e570c633ecb1bddfe14467cee38eb32 Mon Sep 17 00:00:00 2001
+From 698c358b052c1ea7e3d090855766191260918af8 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Mon, 27 Jan 2020 09:38:58 -0600
+Date: Sun, 2 Feb 2020 13:56:50 -0600
Subject: [PATCH] Add BeagleBoard.org DTBS: v5.5.x
https://github.com/beagleboard/BeagleBoard-DeviceTrees/tree/v5.5.x
diff --git a/tools/host_det.sh b/tools/host_det.sh
index da216f34e..010fd9a58 100755
--- a/tools/host_det.sh
+++ b/tools/host_det.sh
@@ -442,15 +442,15 @@ debian_regs () {
warn_eol_distro=1
stop_pkg_search=1
;;
- bionic|disco|eoan|focal)
+ bionic|eoan|focal)
#18.04 bionic: (EOL: April 2023) lts: bionic -> focal
- #19.04 disco: (EOL: July, 2020)
- #19.10 eoan: (EOL: January, 2020)
- #20.04 focal: (EOL: ) lts: focal -> xyz
+ #19.10 eoan: (EOL: July, 2020)
+ #20.04 focal: (EOL: 2030) lts: focal -> xyz
unset warn_eol_distro
;;
- cosmic)
+ cosmic|disco)
#18.10 cosmic: (EOL: July 18, 2019)
+ #19.04 disco: (EOL: January 23, 2020)
warn_eol_distro=1
stop_pkg_search=1
;;
diff --git a/version.sh b/version.sh
index 8a140808d..918a15418 100644
--- a/version.sh
+++ b/version.sh
@@ -35,10 +35,10 @@ toolchain="gcc_arm_gnueabihf_8"
#Kernel
KERNEL_REL=5.5
-KERNEL_TAG=${KERNEL_REL}
+KERNEL_TAG=${KERNEL_REL}.1
kernel_rt=".X-rtY"
#Kernel Build
-BUILD=${build_prefix}5
+BUILD=${build_prefix}5.1
#v5.X-rcX + upto SHA
#prev_KERNEL_SHA=""
--
GitLab