From 2f88b39ecde17bafb38d19638e6b037701cabc5f Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Mon, 12 Apr 2021 14:44:49 -0500
Subject: [PATCH] kernel v5.12-rc7 rebase with: device-tree/etc BBDTBS:
https://github.com/beagleboard/BeagleBoard-DeviceTrees/commit/7b9841c45abc1740a7c55a7b4b0e3a7081107144
TI_AMX3_CM3:
http://git.ti.com/gitweb/?p=processor-firmware/ti-amx3-cm3-pm-firmware.git;a=commit;h=fb484c5e54f2e31cf0a338d2927a06a2870bcc2c
WPANUSB:
https://github.com/statropy/wpanusb/commit/251f0167545bf2dcaa3cad991a59dbf5ab05490a
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
patch.sh | 1 +
patches/defconfig | 2 +-
patches/git/BBDTBS | 2 +-
patches/ref_omap2plus_defconfig | 2 +-
.../0001-Add-BeagleBoard.org-DTBS-v5.12.x.patch | 6 +++---
...01-merge-wpanusb-https-github.com-statropy-wpanusb.patch | 4 ++--
version.sh | 4 ++--
7 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/patch.sh b/patch.sh
index 4ec16ccbf..f395d08b9 100644
--- a/patch.sh
+++ b/patch.sh
@@ -109,6 +109,7 @@ aufs_fail () {
}
aufs () {
+ #https://github.com/sfjro/aufs5-standalone/tree/aufs5.11
aufs_prefix="aufs5-"
#regenerate="enable"
if [ "x${regenerate}" = "xenable" ] ; then
diff --git a/patches/defconfig b/patches/defconfig
index ddac22be5..e24ae607c 100644
--- a/patches/defconfig
+++ b/patches/defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.12.0-rc6 Kernel Configuration
+# Linux/arm 5.12.0-rc7 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="arm-none-linux-gnueabihf-gcc (GNU Toolchain for the A-profile Architecture 10.2-2020.11 (arm-10.16)) 10.2.1 20201103"
CONFIG_CC_IS_GCC=y
diff --git a/patches/git/BBDTBS b/patches/git/BBDTBS
index bc1c85e0c..68847899a 100644
--- a/patches/git/BBDTBS
+++ b/patches/git/BBDTBS
@@ -1 +1 @@
-BBDTBS: https://github.com/beagleboard/BeagleBoard-DeviceTrees/commit/294da012a37d88ce7845d09ceaa5ea4f6772cb65
+BBDTBS: https://github.com/beagleboard/BeagleBoard-DeviceTrees/commit/7b9841c45abc1740a7c55a7b4b0e3a7081107144
diff --git a/patches/ref_omap2plus_defconfig b/patches/ref_omap2plus_defconfig
index adcf245bd..5b2c4d31e 100644
--- a/patches/ref_omap2plus_defconfig
+++ b/patches/ref_omap2plus_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.12.0-rc6 Kernel Configuration
+# Linux/arm 5.12.0-rc7 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="arm-none-linux-gnueabihf-gcc (GNU Toolchain for the A-profile Architecture 10.2-2020.11 (arm-10.16)) 10.2.1 20201103"
CONFIG_CC_IS_GCC=y
diff --git a/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-DTBS-v5.12.x.patch b/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-DTBS-v5.12.x.patch
index b230bba99..dcc964510 100644
--- a/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-DTBS-v5.12.x.patch
+++ b/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-DTBS-v5.12.x.patch
@@ -1,11 +1,11 @@
-From 577270b076a2a9d5ff32ce8f4b31f506db039c74 Mon Sep 17 00:00:00 2001
+From 395a0021a3d24cca6fc1987ad42b3dd89388d7c1 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Tue, 6 Apr 2021 15:02:00 -0500
+Date: Mon, 12 Apr 2021 14:10:44 -0500
Subject: [PATCH] Add BeagleBoard.org DTBS: v5.12.x
https://github.com/beagleboard/BeagleBoard-DeviceTrees/tree/v5.12.x
-https://github.com/beagleboard/BeagleBoard-DeviceTrees/commit/294da012a37d88ce7845d09ceaa5ea4f6772cb65
+https://github.com/beagleboard/BeagleBoard-DeviceTrees/commit/7b9841c45abc1740a7c55a7b4b0e3a7081107144
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
arch/arm/boot/dts/Makefile | 1 +
diff --git a/patches/wpanusb/0001-merge-wpanusb-https-github.com-statropy-wpanusb.patch b/patches/wpanusb/0001-merge-wpanusb-https-github.com-statropy-wpanusb.patch
index 3ef355e64..f1b593582 100644
--- a/patches/wpanusb/0001-merge-wpanusb-https-github.com-statropy-wpanusb.patch
+++ b/patches/wpanusb/0001-merge-wpanusb-https-github.com-statropy-wpanusb.patch
@@ -1,6 +1,6 @@
-From 57dfabe3b48f22dd7782ce027d0e04519b35acff Mon Sep 17 00:00:00 2001
+From b8f762222f45406a93e44590ad5c3b5f81071162 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Tue, 6 Apr 2021 14:55:46 -0500
+Date: Mon, 12 Apr 2021 14:08:10 -0500
Subject: [PATCH] merge: wpanusb: https://github.com/statropy/wpanusb
https://github.com/statropy/wpanusb/commit/251f0167545bf2dcaa3cad991a59dbf5ab05490a
diff --git a/version.sh b/version.sh
index 25c1c052e..5c462577c 100644
--- a/version.sh
+++ b/version.sh
@@ -42,10 +42,10 @@ toolchain="gcc_arm_gnueabihf_10"
#Kernel
KERNEL_REL=5.12
-KERNEL_TAG=${KERNEL_REL}-rc6
+KERNEL_TAG=${KERNEL_REL}-rc7
kernel_rt=".x-rty"
#Kernel Build
-BUILD=${build_prefix}7
+BUILD=${build_prefix}7.1
#v5.X-rcX + upto SHA
#prev_KERNEL_SHA=""
--
GitLab