diff --git a/patch.sh b/patch.sh index ba5d7e412b2b4ca9ed7f9bf939767d3ea4180281..ef55f245372f147840dbff1d24106e3d85ff6b3d 100644 --- a/patch.sh +++ b/patch.sh @@ -193,7 +193,7 @@ wpanusb () { rm -rf ./wpanusb || true fi - ${git_bin} clone https://github.com/statropy/wpanusb --depth=1 + ${git_bin} clone https://git.beagleboard.org/beagleconnect/linux/wpanusb --depth=1 cd ./wpanusb wpanusb_hash=$(git rev-parse HEAD) cd - @@ -204,9 +204,9 @@ wpanusb () { cp -v ../wpanusb/wpanusb.c drivers/net/ieee802154/ ${git_bin} add . - ${git_bin} commit -a -m 'merge: wpanusb: https://github.com/statropy/wpanusb' -m "https://github.com/statropy/wpanusb/commit/${wpanusb_hash}" -s + ${git_bin} commit -a -m 'merge: wpanusb: https://git.beagleboard.org/beagleconnect/linux/wpanusb' -m "https://git.beagleboard.org/beagleconnect/linux/wpanusb/-/commit/${wpanusb_hash}" -s ${git_bin} format-patch -1 -o ../patches/wpanusb/ - echo "WPANUSB: https://github.com/statropy/wpanusb/commit/${wpanusb_hash}" > ../patches/git/WPANUSB + echo "WPANUSB: https://git.beagleboard.org/beagleconnect/linux/wpanusb/-/commit/${wpanusb_hash}" > ../patches/git/WPANUSB rm -rf ../wpanusb/ || true @@ -214,7 +214,7 @@ wpanusb () { start_cleanup - ${git} "${DIR}/patches/wpanusb/0001-merge-wpanusb-https-github.com-statropy-wpanusb.patch" + ${git} "${DIR}/patches/wpanusb/0001-merge-wpanusb-https-git.beagleboard.org-beagleconnec.patch" wdir="wpanusb" number=1 @@ -233,7 +233,7 @@ bcfserial () { rm -rf ./bcfserial || true fi - ${git_bin} clone https://github.com/statropy/bcfserial --depth=1 + ${git_bin} clone https://git.beagleboard.org/beagleconnect/linux/bcfserial.git --depth=1 cd ./bcfserial bcfserial_hash=$(git rev-parse HEAD) cd - @@ -243,9 +243,9 @@ bcfserial () { cp -v ../bcfserial/bcfserial.c drivers/net/ieee802154/ ${git_bin} add . - ${git_bin} commit -a -m 'merge: bcfserial: https://github.com/statropy/bcfserial' -m "https://github.com/statropy/bcfserial/commit/${bcfserial_hash}" -s + ${git_bin} commit -a -m 'merge: bcfserial: https://git.beagleboard.org/beagleconnect/linux/bcfserial.git' -m "https://git.beagleboard.org/beagleconnect/linux/bcfserial/-/commit/${bcfserial_hash}" -s ${git_bin} format-patch -1 -o ../patches/bcfserial/ - echo "BCFSERIAL: https://github.com/statropy/bcfserial/commit/${bcfserial_hash}" > ../patches/git/BCFSERIAL + echo "BCFSERIAL: https://git.beagleboard.org/beagleconnect/linux/bcfserial/-/commit/${bcfserial_hash}" > ../patches/git/BCFSERIAL rm -rf ../bcfserial/ || true @@ -253,7 +253,7 @@ bcfserial () { start_cleanup - ${git} "${DIR}/patches/bcfserial/0001-merge-bcfserial-https-github.com-statropy-bcfserial.patch" + ${git} "${DIR}/patches/bcfserial/0001-merge-bcfserial-https-git.beagleboard.org-beagleconn.patch" wdir="bcfserial" number=1 @@ -492,7 +492,7 @@ patch_backports (){ } backports () { - backport_tag="v5.10.161" + backport_tag="v5.10.162" subsystem="uio" #regenerate="enable" @@ -533,7 +533,7 @@ soc packaging () { #do_backport="enable" if [ "x${do_backport}" = "xenable" ] ; then - backport_tag="v6.1.2" + backport_tag="v6.1.4" 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 0f288bebca6a3ff3da5d9200263425e1066f185f..2634ee33f08bc205bc0fc3fd7973cb47db834dd2 100644 --- a/patches/backports/uio/0001-backports-uio-from-linux.git.patch +++ b/patches/backports/uio/0001-backports-uio-from-linux.git.patch @@ -1,9 +1,9 @@ -From f318ac831fa844bfaee324cca0c3d1336b344987 Mon Sep 17 00:00:00 2001 +From d5fa253ebb88e649beddb72eb47761b95b7be437 Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Fri, 23 Dec 2022 16:37:44 -0600 +Date: Wed, 11 Jan 2023 11:20:11 -0600 Subject: [PATCH] backports: uio: from: linux.git -Reference: v5.10.161 +Reference: v5.10.162 Signed-off-by: Robert Nelson <robertcnelson@gmail.com> --- drivers/uio/uio_pruss.c | 44 +++++++++++++++++++++++++++++++---------- diff --git a/patches/bcfserial/0001-merge-bcfserial-https-github.com-statropy-bcfserial.patch b/patches/bcfserial/0001-merge-bcfserial-https-git.beagleboard.org-beagleconn.patch similarity index 97% rename from patches/bcfserial/0001-merge-bcfserial-https-github.com-statropy-bcfserial.patch rename to patches/bcfserial/0001-merge-bcfserial-https-git.beagleboard.org-beagleconn.patch index 276b508d17bafa07331c1faec7752f63095a8a38..6f4ef51e18446508413aaff29a783076557cc523 100644 --- a/patches/bcfserial/0001-merge-bcfserial-https-github.com-statropy-bcfserial.patch +++ b/patches/bcfserial/0001-merge-bcfserial-https-git.beagleboard.org-beagleconn.patch @@ -1,9 +1,10 @@ -From 39e33703422487b808d03992c6a04048d5e5ff33 Mon Sep 17 00:00:00 2001 +From 2d22b627c101296fd9daedb1c51b572fe6893618 Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Fri, 23 Dec 2022 16:36:15 -0600 -Subject: [PATCH] merge: bcfserial: https://github.com/statropy/bcfserial +Date: Wed, 11 Jan 2023 11:18:14 -0600 +Subject: [PATCH] merge: bcfserial: + https://git.beagleboard.org/beagleconnect/linux/bcfserial.git -https://github.com/statropy/bcfserial/commit/aded88429a8a00143596b41f4c1f50d9ae3d4069 +https://git.beagleboard.org/beagleconnect/linux/bcfserial/-/commit/db467023bd136c97c2e13c3a8b9e41dbdfafbc66 Signed-off-by: Robert Nelson <robertcnelson@gmail.com> --- drivers/net/ieee802154/bcfserial.c | 680 +++++++++++++++++++++++++++++ @@ -12,7 +13,7 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com> diff --git a/drivers/net/ieee802154/bcfserial.c b/drivers/net/ieee802154/bcfserial.c new file mode 100644 -index 000000000000..d8d85d801422 +index 000000000000..11a456e56887 --- /dev/null +++ b/drivers/net/ieee802154/bcfserial.c @@ -0,0 +1,680 @@ @@ -250,7 +251,7 @@ index 000000000000..d8d85d801422 + +static int bcfserial_hdlc_receive(struct bcfserial *bcfserial, u8 cmd, void *buffer, size_t count) +{ -+ int retries = 5; ++ int retries = 80; + bcfserial->response_size = count; + bcfserial->response_buffer = (u8*)buffer; + bcfserial_hdlc_send_cmd(bcfserial, cmd); @@ -491,7 +492,7 @@ index 000000000000..d8d85d801422 + } + else if (bcfserial->rx_address == ADDRESS_CDC) { + bcfserial->rx_buffer[bcfserial->rx_offset-2] = 0; -+ printk("> %s", bcfserial->rx_buffer+1); ++ dev_dbg(&bcfserial->serdev->dev, "> %s", bcfserial->rx_buffer+1); + } + } + else { @@ -666,7 +667,7 @@ index 000000000000..d8d85d801422 + dev_err(&bcfserial->serdev->dev, "Closing serial device on failure\n"); + serdev_device_close(serdev); +fail_hw: -+ printk(KERN_ERR "Failed to open bcfserial\n"); ++ dev_err(&bcfserial->serdev->dev, "Failed to open bcfserial\n"); + ieee802154_free_hw(hw); + return ret; +} @@ -692,9 +693,9 @@ index 000000000000..d8d85d801422 + +module_serdev_device_driver(bcfserial_driver); + -+MODULE_DESCRIPTION("WPAN serial driver for BeagleConnect Freedom"); ++MODULE_DESCRIPTION("WPAN serial driver for BeagleConnect"); +MODULE_AUTHOR("Erik Larson <erik@statropy.com>"); -+MODULE_VERSION("0.1.0"); ++MODULE_VERSION("0.1.1"); +MODULE_LICENSE("GPL v2"); -- 2.30.2 diff --git a/patches/defconfig b/patches/defconfig index daf45ebe7694b8f5d1fc87621b4f07376aab9b5f..2ebae079daade5d2c768b9fd20a3b2e71d2d8779 100644 --- a/patches/defconfig +++ b/patches/defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 6.2.0-rc2 Kernel Configuration +# Linux/arm 6.2.0-rc3 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-linux-gnueabi-gcc (GCC) 12.2.0" CONFIG_CC_IS_GCC=y @@ -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=122 +CONFIG_PAHOLE_VERSION=0 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y @@ -2062,6 +2062,7 @@ CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=16384 +# CONFIG_CDROM_PKTCDVD is not set CONFIG_ATA_OVER_ETH=m CONFIG_VIRTIO_BLK=m CONFIG_BLK_DEV_RBD=m diff --git a/patches/git/AUFS b/patches/git/AUFS deleted file mode 100644 index a1aaebaa65e9d013344cabce49ba93d13835abfb..0000000000000000000000000000000000000000 --- a/patches/git/AUFS +++ /dev/null @@ -1 +0,0 @@ -AUFS: https://github.com/sfjro/aufs-standalone/commit/49fd12e224a83f2617af83645460cddd587b8661 diff --git a/patches/git/BCFSERIAL b/patches/git/BCFSERIAL deleted file mode 100644 index d5a792cbdf109689749199a0f422cdade29172ea..0000000000000000000000000000000000000000 --- a/patches/git/BCFSERIAL +++ /dev/null @@ -1 +0,0 @@ -BCFSERIAL: https://github.com/statropy/bcfserial/commit/aded88429a8a00143596b41f4c1f50d9ae3d4069 diff --git a/patches/git/WPANUSB b/patches/git/WPANUSB deleted file mode 100644 index 689d32b9206024ffc3bd953ecd9e3b30076c535c..0000000000000000000000000000000000000000 --- a/patches/git/WPANUSB +++ /dev/null @@ -1 +0,0 @@ -WPANUSB: https://github.com/statropy/wpanusb/commit/251f0167545bf2dcaa3cad991a59dbf5ab05490a diff --git a/patches/ref_omap2plus_defconfig b/patches/ref_omap2plus_defconfig index 9cdac5a993531d653a5860c7bf72b869a2a30a32..56f58183d5b1a6c901b3f17e0e96c7f78982dfa6 100644 --- a/patches/ref_omap2plus_defconfig +++ b/patches/ref_omap2plus_defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 6.2.0-rc2 Kernel Configuration +# Linux/arm 6.2.0-rc3 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-linux-gnueabi-gcc (GCC) 12.2.0" CONFIG_CC_IS_GCC=y @@ -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=122 +CONFIG_PAHOLE_VERSION=0 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y @@ -1823,6 +1823,7 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=16384 +# CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set # CONFIG_VIRTIO_BLK is not set # CONFIG_BLK_DEV_RBD is not set @@ -7389,7 +7390,6 @@ CONFIG_DEBUG_INFO_DWARF4=y CONFIG_DEBUG_INFO_COMPRESSED_NONE=y # CONFIG_DEBUG_INFO_COMPRESSED_ZLIB 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/wireless_regdb/0001-Add-wireless-regdb-regulatory-database-file.patch b/patches/wireless_regdb/0001-Add-wireless-regdb-regulatory-database-file.patch index efd6035ec89790a5264ed40d3dc54dad4606394c..e18c0f92bb2bc689b0f1e4017b893eb0a3a4b6de 100644 --- a/patches/wireless_regdb/0001-Add-wireless-regdb-regulatory-database-file.patch +++ b/patches/wireless_regdb/0001-Add-wireless-regdb-regulatory-database-file.patch @@ -1,6 +1,6 @@ -From 63f2c078487670f0bd3b4f32ae57029bf7a73f42 Mon Sep 17 00:00:00 2001 +From 87319f03e49164d7eb38516b471fdd3ae5bc0619 Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Fri, 23 Dec 2022 16:36:54 -0600 +Date: Wed, 11 Jan 2023 11:19:07 -0600 Subject: [PATCH] Add wireless-regdb regulatory database file https://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git/commit/?id=fe05cc94e070c71486047002fc2edf68f5f2a07a diff --git a/patches/wpanusb/0001-merge-wpanusb-https-github.com-statropy-wpanusb.patch b/patches/wpanusb/0001-merge-wpanusb-https-git.beagleboard.org-beagleconnec.patch similarity index 97% rename from patches/wpanusb/0001-merge-wpanusb-https-github.com-statropy-wpanusb.patch rename to patches/wpanusb/0001-merge-wpanusb-https-git.beagleboard.org-beagleconnec.patch index 715a987ed92dfd9cee481682484fbfbc960878e0..da9b864f7909045810ad7c6946e42908e0a25369 100644 --- a/patches/wpanusb/0001-merge-wpanusb-https-github.com-statropy-wpanusb.patch +++ b/patches/wpanusb/0001-merge-wpanusb-https-git.beagleboard.org-beagleconnec.patch @@ -1,23 +1,24 @@ -From 45c42889e4e5155c466fd28e3728592950a5760f Mon Sep 17 00:00:00 2001 +From b2a8690076e0901ccea4f76f7819b4ad90ef2fec Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Fri, 23 Dec 2022 16:35:57 -0600 -Subject: [PATCH] merge: wpanusb: https://github.com/statropy/wpanusb +Date: Wed, 11 Jan 2023 11:18:00 -0600 +Subject: [PATCH] merge: wpanusb: + https://git.beagleboard.org/beagleconnect/linux/wpanusb -https://github.com/statropy/wpanusb/commit/251f0167545bf2dcaa3cad991a59dbf5ab05490a +https://git.beagleboard.org/beagleconnect/linux/wpanusb/-/commit/6aa9bf65b9d88a2c9a111e7b4aed03de2be9413d Signed-off-by: Robert Nelson <robertcnelson@gmail.com> --- - drivers/net/ieee802154/wpanusb.c | 783 +++++++++++++++++++++++++++++++ + drivers/net/ieee802154/wpanusb.c | 778 +++++++++++++++++++++++++++++++ drivers/net/ieee802154/wpanusb.h | 53 +++ - 2 files changed, 836 insertions(+) + 2 files changed, 831 insertions(+) create mode 100644 drivers/net/ieee802154/wpanusb.c create mode 100644 drivers/net/ieee802154/wpanusb.h diff --git a/drivers/net/ieee802154/wpanusb.c b/drivers/net/ieee802154/wpanusb.c new file mode 100644 -index 000000000000..ab933c08b800 +index 000000000000..51eb0d32b291 --- /dev/null +++ b/drivers/net/ieee802154/wpanusb.c -@@ -0,0 +1,783 @@ +@@ -0,0 +1,778 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Driver for the WPANUSB IEEE 802.15.4 dongle @@ -82,7 +83,7 @@ index 000000000000..ab933c08b800 + struct usb_device *udev = wpanusb->udev; + + usb_control_msg(udev, usb_sndctrlpipe(udev, 0), request, VENDOR_OUT, -+ 0, 0, NULL, 0, 1000); ++ 0, 0, data, size, 1000); + + return usb_control_msg(udev, usb_rcvbulkpipe(udev, 1), request, VENDOR_IN, + 0, 0, data, size, 1000); @@ -500,13 +501,8 @@ index 000000000000..ab933c08b800 + if (!buffer) + return -ENOMEM; + ret = wpanusb_control_recv(wpanusb, GET_SUPPORTED_CHANNELS, buffer, sizeof(valid_channels)); -+ if (ret != sizeof(uint32_t)) { -+ dev_err(&udev->dev, "failed to fetch supported channels\n"); -+ kfree(buffer); -+ return ret; -+ } + valid_channels = *(uint32_t *)buffer; -+ if (!valid_channels) { ++ if (ret < 0 || !valid_channels) { + dev_err(&udev->dev, "failed to fetch valid channels, setting default valid channels\n"); + valid_channels = WPANUSB_VALID_CHANNELS; + } diff --git a/repo_maintenance/push-kernel-n-test.sh b/repo_maintenance/push-kernel-n-test.sh new file mode 100755 index 0000000000000000000000000000000000000000..48a1784ea50e1061fa29a8afc5364ef66b49c415 --- /dev/null +++ b/repo_maintenance/push-kernel-n-test.sh @@ -0,0 +1,72 @@ +#!/bin/sh -e + +#yeah, i'm getting lazy.. + +wfile=$(mktemp /tmp/builder.XXXXXXXXX) +echo "Working on temp $wfile ..." + +cat_files () { + if [ -f ./patches/git/AUFS ] ; then + cat ./patches/git/AUFS >> ${wfile} + fi + + if [ -f ./patches/git/BBDTBS ] ; then + cat ./patches/git/BBDTBS >> ${wfile} + fi + + if [ -f ./patches/git/RT ] ; then + cat ./patches/git/RT >> ${wfile} + fi + + if [ -f ./patches/git/TI_AMX3_CM3 ] ; then + cat ./patches/git/TI_AMX3_CM3 >> ${wfile} + fi + + if [ -f ./patches/git/WPANUSB ] ; then + cat ./patches/git/WPANUSB >> ${wfile} + fi + + if [ -f ./patches/git/BCFSERIAL ] ; then + cat ./patches/git/BCFSERIAL >> ${wfile} + fi + + if [ -f ./patches/git/WIRELESS_REGDB ] ; then + cat ./patches/git/WIRELESS_REGDB >> ${wfile} + fi + + if [ -f ./patches/git/KSMBD ] ; then + cat ./patches/git/KSMBD >> ${wfile} + fi +} + +DIR=$PWD +git_bin=$(which git) + +if [ -e ${DIR}/version.sh ]; then + unset BRANCH + unset KERNEL_TAG + . ${DIR}/version.sh + + if [ ! "${BRANCH}" ] ; then + BRANCH="master" + fi + + if [ ! "${KERNEL_TAG}" ] ; then + echo 'KERNEL_TAG undefined' + exit + fi + + if [ -f ./patches/git/RT ] ; then + echo "kernel v${KERNEL_TAG} rebase with rt: v${KERNEL_REL}${kernel_rt} device-tree/etc" > ${wfile} + else + echo "kernel v${KERNEL_TAG} rebase with: device-tree/etc" > ${wfile} + fi + cat_files + + ${git_bin} commit -a -F ${wfile} -s + echo "log: git push origin ${BRANCH}" + ${git_bin} push origin ${BRANCH} +fi + +echo "Deleting $wfile ..." +rm -f "$wfile" diff --git a/version.sh b/version.sh index ce560273c5aa41095ab544102c025c257ecb7d23..fa9f89606c602b10ca5bc97242268ab4973af862 100644 --- a/version.sh +++ b/version.sh @@ -41,10 +41,10 @@ toolchain="gcc_12_arm" #Kernel KERNEL_REL=6.2 -KERNEL_TAG=${KERNEL_REL}-rc2 +KERNEL_TAG=${KERNEL_REL}-rc3 kernel_rt="-rc7-rt5" #Kernel Build -BUILD=${build_prefix}2 +BUILD=${build_prefix}2.1 #v6.X-rcX + upto SHA #prev_KERNEL_SHA=""