From 47e189104c40402cf9ce4501a6c33264790cd76e Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> Date: Thu, 11 May 2023 17:17:59 -0500 Subject: [PATCH] kernel v6.1.26-bone16.1 rebase external git projects BBDTBS: https://git.beagleboard.org/beagleboard/BeagleBoard-DeviceTrees/-/commit/2fcd9f69d6bbff2f6079adfa0a5ff26181e408cf AUFS: https://github.com/sfjro/aufs-standalone/commit/2049a4559234e81aa4f112396cab2304d3522bda WIRELESS_REGDB: https://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git/commit/?id=43f81b4d0819ae1f9f6e31af7f563e9135aec9b6 TI_AMX3_CM3: http://git.ti.com/gitweb/?p=processor-firmware/ti-amx3-cm3-pm-firmware.git;a=commit;h=fb484c5e54f2e31cf0a338d2927a06a2870bcc2c WPANUSB: https://git.beagleboard.org/beagleconnect/linux/wpanusb/-/commit/6aa9bf65b9d88a2c9a111e7b4aed03de2be9413d BCFSERIAL: https://git.beagleboard.org/beagleconnect/linux/bcfserial/-/commit/db467023bd136c97c2e13c3a8b9e41dbdfafbc66 Signed-off-by: Robert Nelson <robertcnelson@gmail.com> --- .gitlab-ci.yml | 8 +- patch.sh | 2 +- .../0001-backports-uio-from-linux.git.patch | 4 +- patches/defconfig | 6 +- .../aufs/0001-merge-aufs-kbuild.patch | 4 +- .../external/aufs/0002-merge-aufs-base.patch | 4 +- .../external/aufs/0003-merge-aufs-mmap.patch | 4 +- .../aufs/0004-merge-aufs-standalone.patch | 4 +- patches/external/aufs/0005-merge-aufs.patch | 4 +- ...https-git.beagleboard.org-beagleconn.patch | 4 +- patches/external/git/BBDTBS | 2 +- patches/external/git/WIRELESS_REGDB | 2 +- ...01-merge-CONFIG_PREEMPT_RT-Patch-Set.patch | 8 +- ...eless-regdb-regulatory-database-file.patch | 113 +++++++++--------- ...tps-git.beagleboard.org-beagleconnec.patch | 4 +- patches/ref_omap2plus_defconfig | 3 +- ...-BeagleBoard.org-Device-Tree-Changes.patch | 21 +++- tools/host_det.sh | 6 +- version.sh | 2 +- 19 files changed, 110 insertions(+), 95 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b9ac2d74e..838b00c23 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,10 +1,10 @@ image: robertcnelson/debian-bullseye-slim-ti-linux-kernel-dev:latest cache: - key: "am33x-v6.1" + key: "$CI_PROJECT_NAME-$CI_COMMIT_BRANCH" paths: - dl - - ccache-am33x-v6.1.tar.gz + - ccache-$CI_PROJECT_NAME-$CI_COMMIT_BRANCH.tar.gz build: tags: @@ -14,7 +14,7 @@ build: - . version.sh && echo $BRANCH - mkdir -p /root/.cache/ccache/ || true - ccache -s - - tar -xf ccache-$BRANCH.tar.gz -C / || true + - tar -xf ccache-$CI_PROJECT_NAME-$CI_COMMIT_BRANCH.tar.gz -C / || true - ccache -s - cp -v system.sh.sample system.sh - echo "AUTO_BUILD=1" >> system.sh @@ -23,7 +23,7 @@ build: - ./build_deb.sh - du -sh deploy/linux-image-*.deb || true - ccache -s - - tar -cf ccache-$BRANCH.tar.gz /root/.cache/ccache/ + - tar -cf ccache-$CI_PROJECT_NAME-$CI_COMMIT_BRANCH.tar.gz /root/.cache/ccache/ artifacts: expire_in: 5 days name: "$CI_PROJECT_NAME-$CI_COMMIT_BRANCH-$CI_JOB_ID" diff --git a/patch.sh b/patch.sh index ccb9c0327..e10c61d0e 100644 --- a/patch.sh +++ b/patch.sh @@ -530,7 +530,7 @@ soc packaging () { #do_backport="enable" if [ "x${do_backport}" = "xenable" ] ; then - backport_tag="v6.3.1" + backport_tag="v6.3.2" subsystem="bindeb-pkg" #regenerate="enable" diff --git a/patches/backports/uio/0001-backports-uio-from-linux.git.patch b/patches/backports/uio/0001-backports-uio-from-linux.git.patch index d38f0bd71..a2cfcfcab 100644 --- a/patches/backports/uio/0001-backports-uio-from-linux.git.patch +++ b/patches/backports/uio/0001-backports-uio-from-linux.git.patch @@ -1,6 +1,6 @@ -From 254baeb213e9236d4977bfd1a21fc21e24417670 Mon Sep 17 00:00:00 2001 +From 096b36bf54d0ddaa0abe6563548c29810f3f3563 Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Tue, 2 May 2023 15:56:44 -0500 +Date: Thu, 11 May 2023 17:13:59 -0500 Subject: [PATCH] backports: uio: from: linux.git Reference: v5.10.179 diff --git a/patches/defconfig b/patches/defconfig index 4b1b1e739..7f72baec0 100644 --- a/patches/defconfig +++ b/patches/defconfig @@ -15,7 +15,7 @@ CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y -CONFIG_PAHOLE_VERSION=0 +CONFIG_PAHOLE_VERSION=124 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y @@ -38,8 +38,8 @@ CONFIG_HAVE_KERNEL_LZ4=y # CONFIG_KERNEL_GZIP is not set # CONFIG_KERNEL_LZMA is not set # CONFIG_KERNEL_XZ is not set -CONFIG_KERNEL_LZO=y -# CONFIG_KERNEL_LZ4 is not set +# CONFIG_KERNEL_LZO is not set +CONFIG_KERNEL_LZ4=y CONFIG_DEFAULT_INIT="" CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_SYSVIPC=y diff --git a/patches/external/aufs/0001-merge-aufs-kbuild.patch b/patches/external/aufs/0001-merge-aufs-kbuild.patch index 5effb0479..826949209 100644 --- a/patches/external/aufs/0001-merge-aufs-kbuild.patch +++ b/patches/external/aufs/0001-merge-aufs-kbuild.patch @@ -1,6 +1,6 @@ -From b8d712389c4a1e6d740a4f42b0238246bd8395df Mon Sep 17 00:00:00 2001 +From 26b5d998054b44993967e40ac0489a5cfcefd4d0 Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Tue, 2 May 2023 15:50:53 -0500 +Date: Thu, 11 May 2023 17:15:30 -0500 Subject: [PATCH 1/5] merge: aufs-kbuild Signed-off-by: Robert Nelson <robertcnelson@gmail.com> diff --git a/patches/external/aufs/0002-merge-aufs-base.patch b/patches/external/aufs/0002-merge-aufs-base.patch index 067e28bd9..9d4b8fcb3 100644 --- a/patches/external/aufs/0002-merge-aufs-base.patch +++ b/patches/external/aufs/0002-merge-aufs-base.patch @@ -1,6 +1,6 @@ -From fc57e98f4fb8f3aa374e92003b709bae41569437 Mon Sep 17 00:00:00 2001 +From 8e0f6428d4d807824fa45ad70d554995d48176c5 Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Tue, 2 May 2023 15:50:54 -0500 +Date: Thu, 11 May 2023 17:15:31 -0500 Subject: [PATCH 2/5] merge: aufs-base Signed-off-by: Robert Nelson <robertcnelson@gmail.com> diff --git a/patches/external/aufs/0003-merge-aufs-mmap.patch b/patches/external/aufs/0003-merge-aufs-mmap.patch index 9eadc31f5..377ab4d3d 100644 --- a/patches/external/aufs/0003-merge-aufs-mmap.patch +++ b/patches/external/aufs/0003-merge-aufs-mmap.patch @@ -1,6 +1,6 @@ -From 32443e276fbd5a916d056dabd3d675df736172b9 Mon Sep 17 00:00:00 2001 +From b00066f2e1fa4e8b8f69cad420202189627038d0 Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Tue, 2 May 2023 15:50:55 -0500 +Date: Thu, 11 May 2023 17:15:31 -0500 Subject: [PATCH 3/5] merge: aufs-mmap Signed-off-by: Robert Nelson <robertcnelson@gmail.com> diff --git a/patches/external/aufs/0004-merge-aufs-standalone.patch b/patches/external/aufs/0004-merge-aufs-standalone.patch index 87e18292d..297509ead 100644 --- a/patches/external/aufs/0004-merge-aufs-standalone.patch +++ b/patches/external/aufs/0004-merge-aufs-standalone.patch @@ -1,6 +1,6 @@ -From 83f0dddedede41710f84812a7eecaa383d92cf1b Mon Sep 17 00:00:00 2001 +From db3b7cc2176608302a22d2133ec4164196be20d1 Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Tue, 2 May 2023 15:50:55 -0500 +Date: Thu, 11 May 2023 17:15:32 -0500 Subject: [PATCH 4/5] merge: aufs-standalone Signed-off-by: Robert Nelson <robertcnelson@gmail.com> diff --git a/patches/external/aufs/0005-merge-aufs.patch b/patches/external/aufs/0005-merge-aufs.patch index e58985c86..096753b64 100644 --- a/patches/external/aufs/0005-merge-aufs.patch +++ b/patches/external/aufs/0005-merge-aufs.patch @@ -1,6 +1,6 @@ -From d22c0b7c39261855bcac4c02cd148a98595e566a Mon Sep 17 00:00:00 2001 +From 93a0414753af3ead13aff27f295d21235f292864 Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Tue, 2 May 2023 15:50:57 -0500 +Date: Thu, 11 May 2023 17:15:33 -0500 Subject: [PATCH 5/5] merge: aufs https://github.com/sfjro/aufs-standalone/commit/2049a4559234e81aa4f112396cab2304d3522bda diff --git a/patches/external/bcfserial/0001-merge-bcfserial-https-git.beagleboard.org-beagleconn.patch b/patches/external/bcfserial/0001-merge-bcfserial-https-git.beagleboard.org-beagleconn.patch index 99381e562..cda87733f 100644 --- a/patches/external/bcfserial/0001-merge-bcfserial-https-git.beagleboard.org-beagleconn.patch +++ b/patches/external/bcfserial/0001-merge-bcfserial-https-git.beagleboard.org-beagleconn.patch @@ -1,6 +1,6 @@ -From edcdd572ce134e6c3f5cea9da2b15462e8bb40f3 Mon Sep 17 00:00:00 2001 +From df131cccc7d9331bbe3a8fe3484c5d262964d880 Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Tue, 2 May 2023 15:52:58 -0500 +Date: Thu, 11 May 2023 17:10:45 -0500 Subject: [PATCH] merge: bcfserial: https://git.beagleboard.org/beagleconnect/linux/bcfserial.git diff --git a/patches/external/git/BBDTBS b/patches/external/git/BBDTBS index 59e9d0efa..99f49fb31 100644 --- a/patches/external/git/BBDTBS +++ b/patches/external/git/BBDTBS @@ -1 +1 @@ -BBDTBS: https://git.beagleboard.org/beagleboard/BeagleBoard-DeviceTrees/-/commit/b34b474f0fcbf18ef3c75debc55f9b07494b11c8 +BBDTBS: https://git.beagleboard.org/beagleboard/BeagleBoard-DeviceTrees/-/commit/2fcd9f69d6bbff2f6079adfa0a5ff26181e408cf diff --git a/patches/external/git/WIRELESS_REGDB b/patches/external/git/WIRELESS_REGDB index c8a58722d..973f70812 100644 --- a/patches/external/git/WIRELESS_REGDB +++ b/patches/external/git/WIRELESS_REGDB @@ -1 +1 @@ -WIRELESS_REGDB: https://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git/commit/?id=7f7a9f7bc6011b072b5427eced1ff19261764e95 +WIRELESS_REGDB: https://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git/commit/?id=43f81b4d0819ae1f9f6e31af7f563e9135aec9b6 diff --git a/patches/external/rt/0001-merge-CONFIG_PREEMPT_RT-Patch-Set.patch b/patches/external/rt/0001-merge-CONFIG_PREEMPT_RT-Patch-Set.patch index 1be6111cb..24fe82989 100644 --- a/patches/external/rt/0001-merge-CONFIG_PREEMPT_RT-Patch-Set.patch +++ b/patches/external/rt/0001-merge-CONFIG_PREEMPT_RT-Patch-Set.patch @@ -1,6 +1,6 @@ -From bc9084969273a6537aa3327667e5615187ce7bb1 Mon Sep 17 00:00:00 2001 +From 5a050fb698ad04abfa5f9dc63831cbf391e1655c Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Tue, 2 May 2023 16:03:28 -0500 +Date: Thu, 11 May 2023 17:12:28 -0500 Subject: [PATCH] merge: CONFIG_PREEMPT_RT Patch Set patch-6.1.26-rt8.patch.xz @@ -4377,10 +4377,10 @@ index a92bce40b04b..bf82980f569d 100644 static inline struct task_struct *this_cpu_ksoftirqd(void) diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h -index 81d10b8e9dc0..8de40ae43082 100644 +index 1f1099dac3f0..1023f349af71 100644 --- a/include/linux/lockdep.h +++ b/include/linux/lockdep.h -@@ -437,7 +437,6 @@ enum xhlock_context_t { +@@ -435,7 +435,6 @@ enum xhlock_context_t { XHLOCK_CTX_NR, }; diff --git a/patches/external/wireless_regdb/0001-Add-wireless-regdb-regulatory-database-file.patch b/patches/external/wireless_regdb/0001-Add-wireless-regdb-regulatory-database-file.patch index 4d7039554..c74b62896 100644 --- a/patches/external/wireless_regdb/0001-Add-wireless-regdb-regulatory-database-file.patch +++ b/patches/external/wireless_regdb/0001-Add-wireless-regdb-regulatory-database-file.patch @@ -1,12 +1,12 @@ -From ecf4eaaf671b632a07ef34dca66b8593a81e9ee5 Mon Sep 17 00:00:00 2001 +From dbe5327744865ee5a22d55075159eeccaeaff615 Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Tue, 2 May 2023 15:54:26 -0500 +Date: Thu, 11 May 2023 17:13:00 -0500 Subject: [PATCH] Add wireless-regdb regulatory database file -https://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git/commit/?id=7f7a9f7bc6011b072b5427eced1ff19261764e95 +https://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git/commit/?id=43f81b4d0819ae1f9f6e31af7f563e9135aec9b6 Signed-off-by: Robert Nelson <robertcnelson@gmail.com> --- - firmware/regulatory.db | Bin 0 -> 4676 bytes + firmware/regulatory.db | Bin 0 -> 4728 bytes firmware/regulatory.db.p7s | Bin 0 -> 1182 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 firmware/regulatory.db @@ -14,58 +14,59 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com> diff --git a/firmware/regulatory.db b/firmware/regulatory.db new file mode 100644 -index 0000000000000000000000000000000000000000..bd3212ece43415396ec6993af4d79633f1c09bf7 +index 0000000000000000000000000000000000000000..4105433c98fbc45dcb44bc18695995d69187580f GIT binary patch -literal 4676 -zcmZvee{5S<702(r=hSi1HoQe%wT*35SzEEHVi84E#K5cVIJWcr<HbMX*i|WkRV?ZT -zokoFbRBF*G(Q1@|v<WH(EHG0v2?8ji8)Ae_1r1u1B6Xq_1v*w#hB8KxD`13j&VBdU -z_Zj}Md_VX6xZiWmea|ju#*#va*vJSRNsPflB8~CHIJ$`(PABp(mnh(!i6U{C_A3}k -zRH2oq!E&NbdreFx6R?m>;=Rc+d^nkgR&pHU$qapGaZ56fZnA)pWD#r05`H3ChAYVm -z?nzc@zd@fSKAK9vwbVG?mCC|=Du?k@9&4#0ypSr<x{MoBHMo$P#yzP9v{FrIjnNrn -zE`17ceXK;ECeEZ&@P{<*r!#mgU7>HvKc0iuIGsIShG#NKcrG)BDwD=^W*nz8S&V1$ -z^zG5746RHRu4iiSR;Gc6vo5|jTf}&_3{PgO7|GV4l^cVLIm(~Q<Bho@-kdAr!?_A9 -z<fs=D1&mLW@B<SbI&K<wxLI`FB2Ky<4!C7F>((*rHgJ#IgeUSzjOSB0na{yO-o=gi -z3c7j9k*72AQ_w0TFk48$Tw#npY5I`XLKY(h7ZwUd+*2swfr3XoN&97V3lv+Z(f$-1 -zFVH*+(-<!_@FT?xK2*$Mq?m_Ru>|u)4{OCH9x4^k^%8K^qZxaY+sn{5^}=)UHjjM0 -z0_~Mid6d_yW5grflL<IePUCdB1g$dFT&}^3<vPYI33MyelS&3&sZg&gG?NPTtwOpg -zQ#f2{;9xa{AFGa`Tg~9sDxFg;Vzyd_Q`IW1>+o8&iTi5_c)6CrJ+%sazSh8dYfa2f -zrO=&9<B=(<VXBDRrfL|kliqp-w>Hu^*r?)kGl9h>)l7F++@XYej}kZmA~Mk@B6mn) -zDRA7d6YX0Ps}GNg!8^&jZ^;p>Pl~lK?G<Z(xxLG@9_(KfB7RWYd9D55v0d|quL-g7 -zB>8`ZnDS}9yhXF>VG;dz$S$HQAyxxNL(F>Yd}7cEGv{wDb<byin*;mrJt2zgeSK_a -zX1%P(<{&<>2l1w!n}|0aIN`@rKFPf3h)shdI)8r;bN-3H%!~X6veS7Eaq;mHQ93iP -zITo4I?7e+S$kBtbA&O_aVH(Q!Ix%L?88SIKF<~|_D|VikLw)YeI~3lF^{~z}H1Mb$ -zr{`_uaU7b5&7B;xZ*o0O%+xbEw^y?=X9hgb!x770Jt!Oz`KBoT(bN6#=NIi^>X&V| -z{mp&s*qJRm>vMX!ubW@nS&zxj^Krtgd&GCb^3iw7W<B$64u5_YJN+ND<6}MS&y#fW -zo#B~tACPqNda~*nUJ5haiIAPn2r+5yF!cp(J8{g)AIvfE=RWXUE!G;>h4*4TtbJ|` -z`#3R6C!b^M(C1pZ^toZyIgy@OON+j9n&<pG*U{l~SC`K^M=Uzx=P)rHT_z?*_teVi -z*Bjn*M4&Cm(ZlQLS+a6CPN3WPYn}Am1kVQdqVmZRQF}<}X9p?XX7<;7+|l-E|4z;I -z9a-Ps*qQlR;%AHf4aa)e?<MuY^3gR}97B3PTg)-Bb^p8P1X_c$V@7+x{9d>6I7s(E -z^GBDo)}Z#f&)su<_O)`3Q=X`<Ecx{su3e#bEk7gNKeA74^ZcBA2J<6(eP&I>_4WR{ -zIPhoYe(4&FotQLq{fV^(T}Ri);ky{*)H#d>uEW-(**tgJpX_|!*YJ!upI@in7n`ko -zT2q)qeF<{#yT3+vgnJ)6W84$AYo@wv=6k{1NIj<e!0&91oxXHM`}1!+Gut_yf8%ZD -z-@GvU@g0AYFJSJW?a$AJ&0@`KVW!`lkbTuYpPwGpdRV`<8|M0L?wl9c`8?`HM-S(> -znd|w?w3xpAOa6Zb_Gf<nH+rTzpJDEY?hkPz`j3$P|1$q3v0mfP@%*36X5CNA&hMF! -z-RR-`9DfVVlWS@GeOl|~`8DtRtoTs>37%(6(R;#TeP<NqwDuge>bIKjKN<D!0M2(9 -zUlq<km}821)O_|ta0ch3JvukM=LqLC>|WdsOOFY$zD>P?E1LfrJE&Pjk|7pv`+A5~ -z4+r@=@g{%3CLZtJwdkKW@FvX8F2d1W+kF;7^XUo0l%MQf{~Jcw7dm!|r!_3!qw_&O -zRr;Lxvs@+D%A@j}dJ=Aj{giXH6ynF?r{a`&Sq>{l?Na}OcR>aYkS(HwI3qX7tMu3W -z7cc{;`7Zf}`Wf`;^;QKctzHKgX2^e)-g}?C#(TuRk747}yGO659zPFw&p$heow0mA -ztX_d_z7J_XBPZ3Xun!KwVWV%SdI5GDEl<ePs-(4XzO(W+(l$!9?9}<s%25@i+TI}l -zC<t**-YCC8)s3iM!96ew5z2o~4%1FaUEunO&&!6|qJ9lP{ugCUy~uUb{v~;{d`rDw -zU105+hvjv(L&x=LPN<lwsNYd<xxOgrxvYD;K|Qbj19!s%I_|Q}shd<?{RwKoam#WO -zO=Z1$7B)l5oV6@x<PX#rV2GGCEzAA#JlR<XuP>>mVROg#c$Z1@-{h=(M%@n)vXi@L -z(>K@Nmi_Vuc}Tvbo`QEnL-(((`!k`gaxV6jX|+Zr)HUKh9aB)Zs&}gIt82Q)tffub -zz6(QI3$Fv6K=roeZuu>WMIB2zV9@wIAb+GDhjnbzeh<nYs!ti)K6z1n*{?_2xV}$! -z>T6r|`ez)FKk4M5HO<Z6r`kIET<1Y^7O#((dU^dh80csuhFgr^Vfl0Qh|zvb-3LnF -zfwnvb!yW%G%Jb^udM0g2YcrF!<QeRRP2|Tj^0_;sw*0ERtiG*l^0mJ1uXUgNHI**f -rluz-V$@@<}Lw%>yn-!}UJg*gPe@feVHkwV275b*Lq?DT_{o?-@2*ygO +literal 4728 +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 +S%|>&PzA3kqa=oN~1^)xCqgwF* literal 0 HcmV?d00001 diff --git a/firmware/regulatory.db.p7s b/firmware/regulatory.db.p7s new file mode 100644 -index 0000000000000000000000000000000000000000..6d98f2519f5b7083ced9f1fc1140f541ab49369b +index 0000000000000000000000000000000000000000..7d35370d9e2f6807a235b52c6e4a4eb71e684055 GIT binary patch literal 1182 zcmXqLVwuIpsnzDu_MMlJooPW6OSeH2OFI)IqanWmFB@k<n+IbmGYb<VD}w<yLLuXV @@ -82,13 +83,13 @@ zwl_NPY%Twq^Pwf~#g`ddw{t6nsnpKrT*=oq&pdigF4N7P69HL|B0r0<z1rloHR9i{ zi;dw@?>AX=M0{IyM6Wwa{mIf7OHQT7tSL%AoG*M>*R=9_*YmGe6b-ztep`IAGVBw- z!1vk<fs^&!f7E(&wS)?B)%sb>YwQ2f*qmwdu%Ti1qxCzl8GMutX;+>(KaknSwU#Nh zc=g}&Q_k>OCH%D!(HApbsVILsU}Hb?y9H@0#VSP%n;5qNQ^_V^qBc;#nzqnVFjAsl -zkZB+RPtu&shRAuqKn5YhYRE6nYh-L-WN2(?Vq$J!7-gW3kYzDcVo~@YyRcx|+br$# -zTP2%J1eMbc?b7|WDk<`Xwj1w#)+zU2B1auCakDfrGR$3}n)<wGUtQt*j#A_E7kqBm -zOU@P&?b0|SInU16<;n~Oc4w~jdg3ivSLU9dZ@T-`{LWA&_cfv`Zod7QwCMe&`UgT0 -zP6zrqlO7#+zC6KQ==Oxy3YN{MV<&FrS*bYrLAm=wHK()ZV*``z?dQtI#adXe*bwdG -z$>Y;4>%O4uvhmyZAO9J2bXF|zam<TQ6)H`frqpy|)5#x?!aNJVD(#U9N}LqJ_`a<( -z^xE$Og5d)D|CBzw9QpQ={+jci4~6CL-Vfn;cWh($t0lJlvTVtl<D+dhzM568t^79f -wXLC}HGWSIhou3EpUkUnf@ZQWWJKI(F#9uko{QG-nWnbc)t?#SD56tHR0Jo0Y0RR91 +zkZB+RPtu&shRAuqKn5YhYRE6nYh-L-YG7<=ZVXJyQ3m=5Sr$Vj7KKY*9zE3}&kpF{ +zn6SEkKI_4X=i3)9JQuU3md}K}L+IQI<fsECZk8rS25YA$H~zO2HXN=CJtI2xzI|Ep +zi-mfJ?uD7HbJFcp*(;lRVXE=VV39ip@{9j8-QFVb^u_8(Tft}t*}FCGe=m^GvkYA7 +zIBS7F^TV&L-M>ssj4U37Z%k{KS;0N!q2Xn#6(<7^=eY3Y7zoWizhAw#%SXGsYOh56 +zf|K`@_C68I>3S@?`=NY7JwM-k_Egq;{7oIbuC1L+PR2}|zcsgC+j1{(+J-&1{^bN} +z?w{1IAb(Xt?%`?UMGZpr^(-6rR?J$Pd#2Y+%Vf`-NnsYX$=3}9?p4mHP1^0hVae%W +uJ=?<e94GCn!rsZ^TD)%$)Oo*4R%YDKwS#Z&8cE;!#_tlpu5A)h{09JxsMSOO literal 0 HcmV?d00001 diff --git a/patches/external/wpanusb/0001-merge-wpanusb-https-git.beagleboard.org-beagleconnec.patch b/patches/external/wpanusb/0001-merge-wpanusb-https-git.beagleboard.org-beagleconnec.patch index 31d1ba46d..f72c51a69 100644 --- a/patches/external/wpanusb/0001-merge-wpanusb-https-git.beagleboard.org-beagleconnec.patch +++ b/patches/external/wpanusb/0001-merge-wpanusb-https-git.beagleboard.org-beagleconnec.patch @@ -1,6 +1,6 @@ -From b2bb424c5bb58433cb195d3070132f806d048de3 Mon Sep 17 00:00:00 2001 +From ef7cee7cb9419f3ca4d913b848f0cd43eed88cba Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Tue, 2 May 2023 15:51:49 -0500 +Date: Thu, 11 May 2023 17:10:28 -0500 Subject: [PATCH] merge: wpanusb: https://git.beagleboard.org/beagleconnect/linux/wpanusb diff --git a/patches/ref_omap2plus_defconfig b/patches/ref_omap2plus_defconfig index 867b245a4..65c6a38d8 100644 --- a/patches/ref_omap2plus_defconfig +++ b/patches/ref_omap2plus_defconfig @@ -15,7 +15,7 @@ CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y -CONFIG_PAHOLE_VERSION=0 +CONFIG_PAHOLE_VERSION=124 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y @@ -7356,6 +7356,7 @@ CONFIG_DEBUG_INFO_DWARF4=y # CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_COMPRESSED is not set CONFIG_DEBUG_INFO_SPLIT=y +CONFIG_PAHOLE_HAS_SPLIT_BTF=y # CONFIG_GDB_SCRIPTS is not set CONFIG_FRAME_WARN=1024 # CONFIG_STRIP_ASM_SYMS is not set diff --git a/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-Device-Tree-Changes.patch b/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-Device-Tree-Changes.patch index 4ab258eed..c733c2605 100644 --- a/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-Device-Tree-Changes.patch +++ b/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-Device-Tree-Changes.patch @@ -1,11 +1,11 @@ -From b0a61e6ae3b4c906deb7a0e5fa693f0080481e16 Mon Sep 17 00:00:00 2001 +From 93054fe5f33308b927eb9e7da690e12d53b16c2a Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Tue, 2 May 2023 15:55:31 -0500 +Date: Thu, 11 May 2023 17:13:18 -0500 Subject: [PATCH] Add BeagleBoard.org Device Tree Changes https://git.beagleboard.org/beagleboard/BeagleBoard-DeviceTrees/-/tree/v6.1.x -https://git.beagleboard.org/beagleboard/BeagleBoard-DeviceTrees/-/commit/b34b474f0fcbf18ef3c75debc55f9b07494b11c8 +https://git.beagleboard.org/beagleboard/BeagleBoard-DeviceTrees/-/commit/2fcd9f69d6bbff2f6079adfa0a5ff26181e408cf Signed-off-by: Robert Nelson <robertcnelson@gmail.com> --- arch/arm/boot/dts/Makefile | 5 + @@ -71,9 +71,10 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com> arch/arm/boot/dts/overlays/PB-MIKROBUS-0.dts | 107 + arch/arm/boot/dts/overlays/PB-MIKROBUS-1.dts | 108 + include/dt-bindings/board/am335x-bone-pins.h | 253 ++ + include/dt-bindings/pinctrl/k3.h | 3 + include/dt-bindings/pinctrl/omap.h | 4 +- include/uapi/linux/input-event-codes.h | 3 + - 65 files changed, 10566 insertions(+), 328 deletions(-) + 66 files changed, 10569 insertions(+), 328 deletions(-) create mode 100644 arch/arm/boot/dts/am335x-bbb-bone-buses.dtsi create mode 100644 arch/arm/boot/dts/am335x-bone-common-univ.dtsi create mode 100644 arch/arm/boot/dts/am335x-boneblack-uboot-univ.dts @@ -11718,6 +11719,18 @@ index 000000000000..54e92664ba79 +#define P2_35(mode) AM33XX_IOPAD(0x08e0, mode) /* U5: lcd_vsync */ + +#endif +diff --git a/include/dt-bindings/pinctrl/k3.h b/include/dt-bindings/pinctrl/k3.h +index 54df633f9bfe..6bb9df1a264d 100644 +--- a/include/dt-bindings/pinctrl/k3.h ++++ b/include/dt-bindings/pinctrl/k3.h +@@ -47,4 +47,7 @@ + #define J721S2_IOPAD(pa, val, muxmode) (((pa) & 0x1fff)) ((val) | (muxmode)) + #define J721S2_WKUP_IOPAD(pa, val, muxmode) (((pa) & 0x1fff)) ((val) | (muxmode)) + ++#define J784S4_IOPAD(pa, val, muxmode) (((pa) & 0x1fff)) ((val) | (muxmode)) ++#define J784S4_WKUP_IOPAD(pa, val, muxmode) (((pa) & 0x1fff)) ((val) | (muxmode)) ++ + #endif diff --git a/include/dt-bindings/pinctrl/omap.h b/include/dt-bindings/pinctrl/omap.h index f48245ff87e5..625718042413 100644 --- a/include/dt-bindings/pinctrl/omap.h diff --git a/tools/host_det.sh b/tools/host_det.sh index 8787f082d..73e5571c1 100755 --- a/tools/host_det.sh +++ b/tools/host_det.sh @@ -47,7 +47,7 @@ redhat_reqs () { check_rpm pkg="gcc" check_rpm - pkg="lzop" + pkg="lz4" check_rpm pkg="ncurses-devel" check_rpm @@ -133,7 +133,7 @@ debian_regs () { check_dpkg pkg="lzma" check_dpkg - pkg="lzop" + pkg="lz4" check_dpkg pkg="man-db" check_dpkg @@ -649,7 +649,7 @@ check_for_command () { unset NEEDS_COMMAND check_for_command cpio --version -check_for_command lzop --version +check_for_command lz4 --version if [ "${NEEDS_COMMAND}" ] ; then echo "Please install missing commands" diff --git a/version.sh b/version.sh index b3023036d..38637f56a 100644 --- a/version.sh +++ b/version.sh @@ -44,7 +44,7 @@ KERNEL_REL=6.1 KERNEL_TAG=${KERNEL_REL}.26 kernel_rt=".26-rt8" #Kernel Build -BUILD=${build_prefix}16 +BUILD=${build_prefix}16.1 #v6.X-rcX + upto SHA #prev_KERNEL_SHA="" -- GitLab