From 7fd33a404fade333a4616879cf7ec782645b2786 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 18:51:05 +0000 Subject: [PATCH 01/15] build(deps): bump actions/upload-artifact from 4.3.6 to 4.4.0 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.6 to 4.4.0. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/834a144ee995460fba8ed112a2fc961b36a5ec5a...50769540e7f4bd5e21e526ee35c689e35e0d6874) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/scorecard.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index df90d2c86314..3e4ec0eaecf0 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -52,7 +52,7 @@ jobs: # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF # format to the repository Actions tab. - name: "Upload artifact" - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6 + uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0 with: name: SARIF file path: results.sarif From 6a08ca2a4e6ce6ea99095e5664e9c1c3140b28e6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 18:38:32 +0000 Subject: [PATCH 02/15] build(deps): bump setuptools from 73.0.1 to 74.1.0 Bumps [setuptools](https://github.com/pypa/setuptools) from 73.0.1 to 74.1.0. - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/main/NEWS.rst) - [Commits](https://github.com/pypa/setuptools/compare/v73.0.1...v74.1.0) --- updated-dependencies: - dependency-name: setuptools dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index db4d216af0d7..74e32c516f01 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ # Always use a fixed version, this is important for correct hashing. # Dependabot will keep these versions up to date. -setuptools == 73.0.1 # for building Python packages +setuptools == 74.1.0 # for building Python packages pyelftools == 0.31 # for building U-Boot unidiff == 0.7.5 # for parsing unified diff GitPython == 3.1.43 # for manipulating git repos From 06aa0e9c157eef1dec1b21b2d744b5b0267632e7 Mon Sep 17 00:00:00 2001 From: "Leonidas P. Papadakos" Date: Mon, 2 Sep 2024 23:12:01 +0300 Subject: [PATCH 03/15] Enable ksmbd consistently across configurations --- config/kernel/linux-arm64-sc8280xp.config | 4 ++-- config/kernel/linux-arm64-wdk2023.config | 5 ++++- config/kernel/linux-bcm2711-current.config | 1 + config/kernel/linux-bcm2711-edge.config | 1 + config/kernel/linux-bcm2711-legacy.config | 1 + config/kernel/linux-d1-edge.config | 5 ++++- config/kernel/linux-imx6-current.config | 1 + config/kernel/linux-imx6-edge.config | 1 + config/kernel/linux-imx6-legacy.config | 1 + config/kernel/linux-k3-current.config | 5 ++++- config/kernel/linux-k3-edge.config | 5 ++++- config/kernel/linux-meson-current.config | 1 + config/kernel/linux-meson-edge.config | 1 + config/kernel/linux-meson-s4t7-legacy.config | 1 + config/kernel/linux-meson64-current.config | 1 + config/kernel/linux-meson64-edge.config | 1 + config/kernel/linux-mt7623-current.config | 5 ++++- config/kernel/linux-mvebu-current.config | 1 + config/kernel/linux-mvebu-edge.config | 1 + config/kernel/linux-mvebu-legacy.config | 1 + config/kernel/linux-mvebu64-current.config | 1 + config/kernel/linux-mvebu64-edge.config | 1 + config/kernel/linux-odroidxu4-current.config | 5 ++++- config/kernel/linux-odroidxu4-edge.config | 3 ++- config/kernel/linux-phytium-embedded-current.config | 5 ++++- config/kernel/linux-rk322x-current.config | 3 ++- config/kernel/linux-rk322x-edge.config | 3 ++- config/kernel/linux-rk35xx-vendor.config | 5 ++++- config/kernel/linux-rockchip-current.config | 3 ++- config/kernel/linux-rockchip-edge.config | 3 ++- config/kernel/linux-rockchip-rk3588-6.10.config | 1 + config/kernel/linux-rockchip-rk3588-6.11.config | 1 + config/kernel/linux-rockchip-rk3588-collabora.config | 1 + config/kernel/linux-rockchip64-current.config | 1 + config/kernel/linux-rockchip64-edge.config | 1 + config/kernel/linux-sm8250-current.config | 5 ++++- config/kernel/linux-sm8250-edge.config | 5 ++++- config/kernel/linux-spacemit-6.1.config | 5 ++++- config/kernel/linux-spacemit-legacy.config | 5 ++++- config/kernel/linux-starfive-edge.config | 5 ++++- config/kernel/linux-starfive2-edge.config | 5 ++++- config/kernel/linux-sun55iw3-syterkit-legacy.config | 5 ++++- config/kernel/linux-sunxi-current.config | 1 + config/kernel/linux-sunxi-edge.config | 1 + config/kernel/linux-sunxi-legacy.config | 5 ++++- config/kernel/linux-sunxi64-current.config | 1 + config/kernel/linux-sunxi64-edge.config | 1 + config/kernel/linux-sunxi64-legacy.config | 1 + config/kernel/linux-thead-current.config | 5 ++++- config/kernel/linux-thead-edge.config | 5 ++++- config/kernel/linux-tqma-current.config | 5 ++++- config/kernel/linux-uefi-riscv64-current.config | 5 ++++- config/kernel/linux-uefi-riscv64-edge.config | 5 ++++- config/kernel/linux-uefi-riscv64-legacy.config | 5 ++++- config/kernel/linux-virtual-current.config | 5 ++++- config/kernel/linux-wsl2-arm64-current.config | 5 ++++- config/kernel/linux-wsl2-arm64-edge.config | 5 ++++- config/kernel/linux-wsl2-x86-current.config | 5 ++++- config/kernel/linux-wsl2-x86-edge.config | 5 ++++- 59 files changed, 146 insertions(+), 34 deletions(-) diff --git a/config/kernel/linux-arm64-sc8280xp.config b/config/kernel/linux-arm64-sc8280xp.config index 192c19d4a3b8..5c8f7b6c7c0b 100644 --- a/config/kernel/linux-arm64-sc8280xp.config +++ b/config/kernel/linux-arm64-sc8280xp.config @@ -9276,9 +9276,9 @@ CONFIG_CIFS_DEBUG=y # CONFIG_CIFS_SWN_UPCALL is not set # CONFIG_CIFS_SMB_DIRECT is not set CONFIG_SMB_SERVER=m -# CONFIG_SMB_SERVER_SMBDIRECT is not set +CONFIG_SMB_SERVER_SMBDIRECT=y CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y -# CONFIG_SMB_SERVER_KERBEROS5 is not set +CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=m # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/config/kernel/linux-arm64-wdk2023.config b/config/kernel/linux-arm64-wdk2023.config index a0f55a7455b1..d712e95914cb 100644 --- a/config/kernel/linux-arm64-wdk2023.config +++ b/config/kernel/linux-arm64-wdk2023.config @@ -10075,7 +10075,10 @@ CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_SWN_UPCALL is not set # CONFIG_CIFS_SMB_DIRECT is not set CONFIG_CIFS_FSCACHE=y -# CONFIG_SMB_SERVER is not set +CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y +CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y +CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=m CONFIG_CODA_FS=m CONFIG_AFS_FS=m diff --git a/config/kernel/linux-bcm2711-current.config b/config/kernel/linux-bcm2711-current.config index f53a6012514e..4b94112823e1 100644 --- a/config/kernel/linux-bcm2711-current.config +++ b/config/kernel/linux-bcm2711-current.config @@ -8427,6 +8427,7 @@ CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_SWN_UPCALL is not set CONFIG_CIFS_FSCACHE=y CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=m diff --git a/config/kernel/linux-bcm2711-edge.config b/config/kernel/linux-bcm2711-edge.config index 848cdcb7cff6..72e7795734e1 100644 --- a/config/kernel/linux-bcm2711-edge.config +++ b/config/kernel/linux-bcm2711-edge.config @@ -8573,6 +8573,7 @@ CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_SWN_UPCALL is not set CONFIG_CIFS_FSCACHE=y CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=m diff --git a/config/kernel/linux-bcm2711-legacy.config b/config/kernel/linux-bcm2711-legacy.config index e8189c26f16b..1d69395676a5 100644 --- a/config/kernel/linux-bcm2711-legacy.config +++ b/config/kernel/linux-bcm2711-legacy.config @@ -8044,6 +8044,7 @@ CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_SWN_UPCALL is not set CONFIG_CIFS_FSCACHE=y CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=m diff --git a/config/kernel/linux-d1-edge.config b/config/kernel/linux-d1-edge.config index 2b683fe8c60a..3484186fe9ee 100644 --- a/config/kernel/linux-d1-edge.config +++ b/config/kernel/linux-d1-edge.config @@ -6154,7 +6154,10 @@ CONFIG_CIFS_DEBUG=y CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_SWN_UPCALL is not set CONFIG_CIFS_FSCACHE=y -# CONFIG_SMB_SERVER is not set +CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y +CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y +CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS_COMMON=m CONFIG_CODA_FS=m CONFIG_AFS_FS=m diff --git a/config/kernel/linux-imx6-current.config b/config/kernel/linux-imx6-current.config index be5216fc1d24..3821a0e0801e 100644 --- a/config/kernel/linux-imx6-current.config +++ b/config/kernel/linux-imx6-current.config @@ -10842,6 +10842,7 @@ CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_SWN_UPCALL is not set CONFIG_CIFS_FSCACHE=y CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=m diff --git a/config/kernel/linux-imx6-edge.config b/config/kernel/linux-imx6-edge.config index f7fe179012bb..9fc8401cdbd7 100644 --- a/config/kernel/linux-imx6-edge.config +++ b/config/kernel/linux-imx6-edge.config @@ -11170,6 +11170,7 @@ CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_SWN_UPCALL is not set CONFIG_CIFS_FSCACHE=y CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=m diff --git a/config/kernel/linux-imx6-legacy.config b/config/kernel/linux-imx6-legacy.config index f57bb59164e0..4a1183f72196 100644 --- a/config/kernel/linux-imx6-legacy.config +++ b/config/kernel/linux-imx6-legacy.config @@ -10665,6 +10665,7 @@ CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_SWN_UPCALL is not set CONFIG_CIFS_FSCACHE=y CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=m diff --git a/config/kernel/linux-k3-current.config b/config/kernel/linux-k3-current.config index e6ff80936d03..fd11b80d33a5 100644 --- a/config/kernel/linux-k3-current.config +++ b/config/kernel/linux-k3-current.config @@ -7450,7 +7450,10 @@ CONFIG_SUNRPC_BACKCHANNEL=y # CONFIG_SUNRPC_DEBUG is not set # CONFIG_CEPH_FS is not set # CONFIG_CIFS is not set -# CONFIG_SMB_SERVER is not set +CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y +CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y +CONFIG_SMB_SERVER_KERBEROS5=y # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set CONFIG_NLS=y diff --git a/config/kernel/linux-k3-edge.config b/config/kernel/linux-k3-edge.config index 59d6aa07b7a2..5ca055391089 100644 --- a/config/kernel/linux-k3-edge.config +++ b/config/kernel/linux-k3-edge.config @@ -7653,7 +7653,10 @@ CONFIG_RPCSEC_GSS_KRB5=y # CONFIG_SUNRPC_DEBUG is not set # CONFIG_CEPH_FS is not set # CONFIG_CIFS is not set -# CONFIG_SMB_SERVER is not set +CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y +CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y +CONFIG_SMB_SERVER_KERBEROS5=y # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set CONFIG_9P_FS=y diff --git a/config/kernel/linux-meson-current.config b/config/kernel/linux-meson-current.config index c5e1bdbd98b6..033fb7f5e8b6 100644 --- a/config/kernel/linux-meson-current.config +++ b/config/kernel/linux-meson-current.config @@ -7082,6 +7082,7 @@ CONFIG_CIFS_DFS_UPCALL=y CONFIG_CIFS_SWN_UPCALL=y CONFIG_CIFS_FSCACHE=y CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=m diff --git a/config/kernel/linux-meson-edge.config b/config/kernel/linux-meson-edge.config index e0217ca100c6..eb095c2a72ae 100644 --- a/config/kernel/linux-meson-edge.config +++ b/config/kernel/linux-meson-edge.config @@ -7339,6 +7339,7 @@ CONFIG_CIFS_DFS_UPCALL=y CONFIG_CIFS_SWN_UPCALL=y CONFIG_CIFS_FSCACHE=y CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=m diff --git a/config/kernel/linux-meson-s4t7-legacy.config b/config/kernel/linux-meson-s4t7-legacy.config index e48ebdec0622..3b5ea2bb1bc1 100644 --- a/config/kernel/linux-meson-s4t7-legacy.config +++ b/config/kernel/linux-meson-s4t7-legacy.config @@ -8129,6 +8129,7 @@ CONFIG_CIFS_DFS_UPCALL=y CONFIG_CIFS_SWN_UPCALL=y CONFIG_CIFS_FSCACHE=y CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS_COMMON=m diff --git a/config/kernel/linux-meson64-current.config b/config/kernel/linux-meson64-current.config index bb8752a4f993..b37cda63bb11 100644 --- a/config/kernel/linux-meson64-current.config +++ b/config/kernel/linux-meson64-current.config @@ -9682,6 +9682,7 @@ CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_SWN_UPCALL is not set CONFIG_CIFS_FSCACHE=y CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=m diff --git a/config/kernel/linux-meson64-edge.config b/config/kernel/linux-meson64-edge.config index 0c7d288bfa25..70cf84946cab 100644 --- a/config/kernel/linux-meson64-edge.config +++ b/config/kernel/linux-meson64-edge.config @@ -10000,6 +10000,7 @@ CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_SWN_UPCALL is not set CONFIG_CIFS_FSCACHE=y CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=m diff --git a/config/kernel/linux-mt7623-current.config b/config/kernel/linux-mt7623-current.config index 3a63a47fbca4..59f7d3602c0a 100644 --- a/config/kernel/linux-mt7623-current.config +++ b/config/kernel/linux-mt7623-current.config @@ -8006,7 +8006,10 @@ CONFIG_CIFS_DEBUG=y # CONFIG_CIFS_DEBUG_DUMP_KEYS is not set # CONFIG_CIFS_DFS_UPCALL is not set # CONFIG_CIFS_SWN_UPCALL is not set -# CONFIG_SMB_SERVER is not set +CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y +CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y +CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=m # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/config/kernel/linux-mvebu-current.config b/config/kernel/linux-mvebu-current.config index 5f2cd58e68b5..b582f90060bd 100644 --- a/config/kernel/linux-mvebu-current.config +++ b/config/kernel/linux-mvebu-current.config @@ -7206,6 +7206,7 @@ CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_SWN_UPCALL is not set CONFIG_CIFS_FSCACHE=y CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=m diff --git a/config/kernel/linux-mvebu-edge.config b/config/kernel/linux-mvebu-edge.config index 660e1674967f..419275c23743 100644 --- a/config/kernel/linux-mvebu-edge.config +++ b/config/kernel/linux-mvebu-edge.config @@ -7313,6 +7313,7 @@ CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_SWN_UPCALL is not set CONFIG_CIFS_FSCACHE=y CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=m diff --git a/config/kernel/linux-mvebu-legacy.config b/config/kernel/linux-mvebu-legacy.config index bcffe5699908..95da53af502c 100644 --- a/config/kernel/linux-mvebu-legacy.config +++ b/config/kernel/linux-mvebu-legacy.config @@ -6892,6 +6892,7 @@ CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_SWN_UPCALL is not set CONFIG_CIFS_FSCACHE=y CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=m diff --git a/config/kernel/linux-mvebu64-current.config b/config/kernel/linux-mvebu64-current.config index 74a0039acac1..cb01dcc8a8fa 100644 --- a/config/kernel/linux-mvebu64-current.config +++ b/config/kernel/linux-mvebu64-current.config @@ -7240,6 +7240,7 @@ CONFIG_CIFS_POSIX=y # CONFIG_CIFS_DFS_UPCALL is not set # CONFIG_CIFS_SWN_UPCALL is not set CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS_COMMON=m diff --git a/config/kernel/linux-mvebu64-edge.config b/config/kernel/linux-mvebu64-edge.config index 9c81df2ab753..a83210b639b3 100644 --- a/config/kernel/linux-mvebu64-edge.config +++ b/config/kernel/linux-mvebu64-edge.config @@ -7740,6 +7740,7 @@ CONFIG_CIFS_POSIX=y # CONFIG_CIFS_DFS_UPCALL is not set # CONFIG_CIFS_SWN_UPCALL is not set CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=m diff --git a/config/kernel/linux-odroidxu4-current.config b/config/kernel/linux-odroidxu4-current.config index c0d872af8593..ff75df1e7f67 100644 --- a/config/kernel/linux-odroidxu4-current.config +++ b/config/kernel/linux-odroidxu4-current.config @@ -7120,7 +7120,10 @@ CONFIG_CIFS_DEBUG=y CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_SWN_UPCALL is not set CONFIG_CIFS_FSCACHE=y -# CONFIG_SMB_SERVER is not set +CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y +CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y +CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=m CONFIG_CODA_FS=m CONFIG_AFS_FS=m diff --git a/config/kernel/linux-odroidxu4-edge.config b/config/kernel/linux-odroidxu4-edge.config index 3efa9efb76be..d7729d4b2dce 100644 --- a/config/kernel/linux-odroidxu4-edge.config +++ b/config/kernel/linux-odroidxu4-edge.config @@ -7361,7 +7361,8 @@ CONFIG_CIFS_POSIX=y CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_SWN_UPCALL is not set CONFIG_CIFS_FSCACHE=y -CONFIG_SMB_SERVER=y +CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=y diff --git a/config/kernel/linux-phytium-embedded-current.config b/config/kernel/linux-phytium-embedded-current.config index a40bdf188a72..da53d6a63f61 100644 --- a/config/kernel/linux-phytium-embedded-current.config +++ b/config/kernel/linux-phytium-embedded-current.config @@ -8064,7 +8064,10 @@ CONFIG_RPCSEC_GSS_KRB5=y # CONFIG_SUNRPC_DEBUG is not set # CONFIG_CEPH_FS is not set # CONFIG_CIFS is not set -# CONFIG_SMB_SERVER is not set +CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y +CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y +CONFIG_SMB_SERVER_KERBEROS5=y # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set CONFIG_9P_FS=y diff --git a/config/kernel/linux-rk322x-current.config b/config/kernel/linux-rk322x-current.config index 2c765b44cebb..2aec2bb45dfd 100644 --- a/config/kernel/linux-rk322x-current.config +++ b/config/kernel/linux-rk322x-current.config @@ -6992,8 +6992,9 @@ CONFIG_CIFS_POSIX=y # CONFIG_CIFS_SWN_UPCALL is not set CONFIG_CIFS_FSCACHE=y CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y -# CONFIG_SMB_SERVER_KERBEROS5 is not set +CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=m # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/config/kernel/linux-rk322x-edge.config b/config/kernel/linux-rk322x-edge.config index 04d3f410c4c1..d78c108362d7 100644 --- a/config/kernel/linux-rk322x-edge.config +++ b/config/kernel/linux-rk322x-edge.config @@ -7110,8 +7110,9 @@ CONFIG_CIFS_POSIX=y # CONFIG_CIFS_SWN_UPCALL is not set CONFIG_CIFS_FSCACHE=y CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y -# CONFIG_SMB_SERVER_KERBEROS5 is not set +CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=m # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/config/kernel/linux-rk35xx-vendor.config b/config/kernel/linux-rk35xx-vendor.config index 4d90e83e2cad..7c864a20b406 100644 --- a/config/kernel/linux-rk35xx-vendor.config +++ b/config/kernel/linux-rk35xx-vendor.config @@ -8621,7 +8621,10 @@ CONFIG_CIFS_POSIX=y # CONFIG_CIFS_DEBUG is not set CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_SWN_UPCALL is not set -# CONFIG_SMB_SERVER is not set +CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y +CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y +CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=m # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/config/kernel/linux-rockchip-current.config b/config/kernel/linux-rockchip-current.config index 11e15d32e35f..508055ae90a4 100644 --- a/config/kernel/linux-rockchip-current.config +++ b/config/kernel/linux-rockchip-current.config @@ -7157,8 +7157,9 @@ CONFIG_CIFS_POSIX=y # CONFIG_CIFS_SWN_UPCALL is not set CONFIG_CIFS_FSCACHE=y CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y -# CONFIG_SMB_SERVER_KERBEROS5 is not set +CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=m # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/config/kernel/linux-rockchip-edge.config b/config/kernel/linux-rockchip-edge.config index d6adcd577ba0..d3326f376d3a 100644 --- a/config/kernel/linux-rockchip-edge.config +++ b/config/kernel/linux-rockchip-edge.config @@ -7271,8 +7271,9 @@ CONFIG_CIFS_POSIX=y # CONFIG_CIFS_SWN_UPCALL is not set CONFIG_CIFS_FSCACHE=y CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y -# CONFIG_SMB_SERVER_KERBEROS5 is not set +CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=m # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/config/kernel/linux-rockchip-rk3588-6.10.config b/config/kernel/linux-rockchip-rk3588-6.10.config index 7135daa8019b..d801774faf9b 100644 --- a/config/kernel/linux-rockchip-rk3588-6.10.config +++ b/config/kernel/linux-rockchip-rk3588-6.10.config @@ -9952,6 +9952,7 @@ CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_SWN_UPCALL is not set CONFIG_CIFS_FSCACHE=y CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=m diff --git a/config/kernel/linux-rockchip-rk3588-6.11.config b/config/kernel/linux-rockchip-rk3588-6.11.config index fabc4c9065b7..8426a055b1c3 100644 --- a/config/kernel/linux-rockchip-rk3588-6.11.config +++ b/config/kernel/linux-rockchip-rk3588-6.11.config @@ -10021,6 +10021,7 @@ CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_SWN_UPCALL is not set CONFIG_CIFS_FSCACHE=y CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=m diff --git a/config/kernel/linux-rockchip-rk3588-collabora.config b/config/kernel/linux-rockchip-rk3588-collabora.config index 54a7d3e06956..a97e9299427b 100644 --- a/config/kernel/linux-rockchip-rk3588-collabora.config +++ b/config/kernel/linux-rockchip-rk3588-collabora.config @@ -7640,6 +7640,7 @@ CONFIG_CIFS_POSIX=y CONFIG_CIFS_DFS_UPCALL=y CONFIG_CIFS_SWN_UPCALL=y CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=m diff --git a/config/kernel/linux-rockchip64-current.config b/config/kernel/linux-rockchip64-current.config index d15c8a9da284..947f7a0a6b61 100644 --- a/config/kernel/linux-rockchip64-current.config +++ b/config/kernel/linux-rockchip64-current.config @@ -9141,6 +9141,7 @@ CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_SWN_UPCALL is not set CONFIG_CIFS_FSCACHE=y CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=m diff --git a/config/kernel/linux-rockchip64-edge.config b/config/kernel/linux-rockchip64-edge.config index 2d9397ab35e6..05db371c16bb 100644 --- a/config/kernel/linux-rockchip64-edge.config +++ b/config/kernel/linux-rockchip64-edge.config @@ -9324,6 +9324,7 @@ CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_SWN_UPCALL is not set CONFIG_CIFS_FSCACHE=y CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=m diff --git a/config/kernel/linux-sm8250-current.config b/config/kernel/linux-sm8250-current.config index 44039f0d20ec..c64e18e05cee 100644 --- a/config/kernel/linux-sm8250-current.config +++ b/config/kernel/linux-sm8250-current.config @@ -7095,7 +7095,10 @@ CONFIG_RPCSEC_GSS_KRB5=y # CONFIG_SUNRPC_DEBUG is not set # CONFIG_CEPH_FS is not set # CONFIG_CIFS is not set -# CONFIG_SMB_SERVER is not set +CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y +CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y +CONFIG_SMB_SERVER_KERBEROS5=y # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set CONFIG_NLS=y diff --git a/config/kernel/linux-sm8250-edge.config b/config/kernel/linux-sm8250-edge.config index afe7153fe16e..53aaf9a23829 100644 --- a/config/kernel/linux-sm8250-edge.config +++ b/config/kernel/linux-sm8250-edge.config @@ -7018,7 +7018,10 @@ CONFIG_RPCSEC_GSS_KRB5=y # CONFIG_SUNRPC_DEBUG is not set # CONFIG_CEPH_FS is not set # CONFIG_CIFS is not set -# CONFIG_SMB_SERVER is not set +CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y +CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y +CONFIG_SMB_SERVER_KERBEROS5=y # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set CONFIG_NLS=y diff --git a/config/kernel/linux-spacemit-6.1.config b/config/kernel/linux-spacemit-6.1.config index 91641c5b1cb5..0f290ea84d3f 100644 --- a/config/kernel/linux-spacemit-6.1.config +++ b/config/kernel/linux-spacemit-6.1.config @@ -7585,7 +7585,10 @@ CONFIG_CIFS_DEBUG=y # CONFIG_CIFS_SWN_UPCALL is not set CONFIG_CIFS_FSCACHE=y # CONFIG_CIFS_ROOT is not set -# CONFIG_SMB_SERVER is not set +CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y +CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y +CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=y # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/config/kernel/linux-spacemit-legacy.config b/config/kernel/linux-spacemit-legacy.config index 27769fc5e4d9..d800f4a1cbe8 100644 --- a/config/kernel/linux-spacemit-legacy.config +++ b/config/kernel/linux-spacemit-legacy.config @@ -7563,7 +7563,10 @@ CONFIG_CIFS_DEBUG=y # CONFIG_CIFS_SWN_UPCALL is not set CONFIG_CIFS_FSCACHE=y # CONFIG_CIFS_ROOT is not set -# CONFIG_SMB_SERVER is not set +CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y +CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y +CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS_COMMON=y # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/config/kernel/linux-starfive-edge.config b/config/kernel/linux-starfive-edge.config index 6a95642da7a1..037bdb01d587 100644 --- a/config/kernel/linux-starfive-edge.config +++ b/config/kernel/linux-starfive-edge.config @@ -8521,7 +8521,10 @@ CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_SWN_UPCALL is not set # CONFIG_CIFS_SMB_DIRECT is not set CONFIG_CIFS_FSCACHE=y -# CONFIG_SMB_SERVER is not set +CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y +CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y +CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS_COMMON=m CONFIG_CODA_FS=m CONFIG_AFS_FS=m diff --git a/config/kernel/linux-starfive2-edge.config b/config/kernel/linux-starfive2-edge.config index 6923f1db9a37..ede72ddf27b5 100644 --- a/config/kernel/linux-starfive2-edge.config +++ b/config/kernel/linux-starfive2-edge.config @@ -4882,7 +4882,10 @@ CONFIG_SUNRPC_BACKCHANNEL=y # CONFIG_SUNRPC_DEBUG is not set # CONFIG_CEPH_FS is not set # CONFIG_CIFS is not set -# CONFIG_SMB_SERVER is not set +CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y +CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y +CONFIG_SMB_SERVER_KERBEROS5=y # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set # CONFIG_9P_FS is not set diff --git a/config/kernel/linux-sun55iw3-syterkit-legacy.config b/config/kernel/linux-sun55iw3-syterkit-legacy.config index 9c897661d447..f3d6b217e6f1 100644 --- a/config/kernel/linux-sun55iw3-syterkit-legacy.config +++ b/config/kernel/linux-sun55iw3-syterkit-legacy.config @@ -6136,7 +6136,10 @@ CONFIG_NETWORK_FILESYSTEMS=y # CONFIG_NFSD is not set # CONFIG_CEPH_FS is not set # CONFIG_CIFS is not set -# CONFIG_SMB_SERVER is not set +CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y +CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y +CONFIG_SMB_SERVER_KERBEROS5=y # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set CONFIG_NLS=y diff --git a/config/kernel/linux-sunxi-current.config b/config/kernel/linux-sunxi-current.config index 8420af52a36f..b2b9cca4ed67 100644 --- a/config/kernel/linux-sunxi-current.config +++ b/config/kernel/linux-sunxi-current.config @@ -7943,6 +7943,7 @@ CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_SWN_UPCALL is not set CONFIG_CIFS_FSCACHE=y CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=m diff --git a/config/kernel/linux-sunxi-edge.config b/config/kernel/linux-sunxi-edge.config index 2f340ee81dd9..07ba3b444d42 100644 --- a/config/kernel/linux-sunxi-edge.config +++ b/config/kernel/linux-sunxi-edge.config @@ -7977,6 +7977,7 @@ CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_SWN_UPCALL is not set CONFIG_CIFS_FSCACHE=y CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=m diff --git a/config/kernel/linux-sunxi-legacy.config b/config/kernel/linux-sunxi-legacy.config index d6eee2d9f073..62bde623b223 100644 --- a/config/kernel/linux-sunxi-legacy.config +++ b/config/kernel/linux-sunxi-legacy.config @@ -7550,7 +7550,10 @@ CONFIG_CIFS_DEBUG=y CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_SWN_UPCALL is not set CONFIG_CIFS_FSCACHE=y -# CONFIG_SMB_SERVER is not set +CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y +CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y +CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=m CONFIG_CODA_FS=m CONFIG_AFS_FS=m diff --git a/config/kernel/linux-sunxi64-current.config b/config/kernel/linux-sunxi64-current.config index 1776adc786d7..c092a1c29331 100644 --- a/config/kernel/linux-sunxi64-current.config +++ b/config/kernel/linux-sunxi64-current.config @@ -8092,6 +8092,7 @@ CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_SWN_UPCALL is not set CONFIG_CIFS_FSCACHE=y CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=m diff --git a/config/kernel/linux-sunxi64-edge.config b/config/kernel/linux-sunxi64-edge.config index b557a32ef021..68b1b8551a0c 100644 --- a/config/kernel/linux-sunxi64-edge.config +++ b/config/kernel/linux-sunxi64-edge.config @@ -7993,6 +7993,7 @@ CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_SWN_UPCALL is not set CONFIG_CIFS_FSCACHE=y CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=m diff --git a/config/kernel/linux-sunxi64-legacy.config b/config/kernel/linux-sunxi64-legacy.config index 69df13a0e044..36a3da7ac84c 100644 --- a/config/kernel/linux-sunxi64-legacy.config +++ b/config/kernel/linux-sunxi64-legacy.config @@ -7745,6 +7745,7 @@ CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_SWN_UPCALL is not set CONFIG_CIFS_FSCACHE=y CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=m diff --git a/config/kernel/linux-thead-current.config b/config/kernel/linux-thead-current.config index f3c626a1da0e..c170be148b89 100644 --- a/config/kernel/linux-thead-current.config +++ b/config/kernel/linux-thead-current.config @@ -6333,7 +6333,10 @@ CONFIG_CIFS_DEBUG=y CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_SWN_UPCALL is not set CONFIG_CIFS_FSCACHE=y -# CONFIG_SMB_SERVER is not set +CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y +CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y +CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=m CONFIG_CODA_FS=m CONFIG_AFS_FS=m diff --git a/config/kernel/linux-thead-edge.config b/config/kernel/linux-thead-edge.config index 712085aa0078..72a5c0b6c396 100644 --- a/config/kernel/linux-thead-edge.config +++ b/config/kernel/linux-thead-edge.config @@ -6390,7 +6390,10 @@ CONFIG_CIFS_DEBUG=y CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_SWN_UPCALL is not set CONFIG_CIFS_FSCACHE=y -# CONFIG_SMB_SERVER is not set +CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y +CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y +CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=m CONFIG_CODA_FS=m CONFIG_AFS_FS=m diff --git a/config/kernel/linux-tqma-current.config b/config/kernel/linux-tqma-current.config index 0743faf4e48e..47fd2f3f2ae4 100644 --- a/config/kernel/linux-tqma-current.config +++ b/config/kernel/linux-tqma-current.config @@ -8021,7 +8021,10 @@ CONFIG_RPCSEC_GSS_KRB5=y # CONFIG_SUNRPC_DEBUG is not set # CONFIG_CEPH_FS is not set # CONFIG_CIFS is not set -# CONFIG_SMB_SERVER is not set +CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y +CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y +CONFIG_SMB_SERVER_KERBEROS5=y # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set CONFIG_9P_FS=y diff --git a/config/kernel/linux-uefi-riscv64-current.config b/config/kernel/linux-uefi-riscv64-current.config index b26613cdbafb..a7e0624e071d 100644 --- a/config/kernel/linux-uefi-riscv64-current.config +++ b/config/kernel/linux-uefi-riscv64-current.config @@ -8792,7 +8792,10 @@ CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_SWN_UPCALL is not set # CONFIG_CIFS_SMB_DIRECT is not set CONFIG_CIFS_FSCACHE=y -# CONFIG_SMB_SERVER is not set +CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y +CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y +CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=m CONFIG_CODA_FS=m CONFIG_AFS_FS=m diff --git a/config/kernel/linux-uefi-riscv64-edge.config b/config/kernel/linux-uefi-riscv64-edge.config index 03dc8b4de40c..4da425d8fea2 100644 --- a/config/kernel/linux-uefi-riscv64-edge.config +++ b/config/kernel/linux-uefi-riscv64-edge.config @@ -8991,7 +8991,10 @@ CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_SWN_UPCALL is not set # CONFIG_CIFS_SMB_DIRECT is not set CONFIG_CIFS_FSCACHE=y -# CONFIG_SMB_SERVER is not set +CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y +CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y +CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=m CONFIG_CODA_FS=m CONFIG_AFS_FS=m diff --git a/config/kernel/linux-uefi-riscv64-legacy.config b/config/kernel/linux-uefi-riscv64-legacy.config index 74bc3a404959..302e699fe219 100644 --- a/config/kernel/linux-uefi-riscv64-legacy.config +++ b/config/kernel/linux-uefi-riscv64-legacy.config @@ -8500,7 +8500,10 @@ CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_SWN_UPCALL is not set # CONFIG_CIFS_SMB_DIRECT is not set CONFIG_CIFS_FSCACHE=y -# CONFIG_SMB_SERVER is not set +CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y +CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y +CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=m CONFIG_CODA_FS=m CONFIG_AFS_FS=m diff --git a/config/kernel/linux-virtual-current.config b/config/kernel/linux-virtual-current.config index 9f03a400e93d..7e2d36bffb1e 100644 --- a/config/kernel/linux-virtual-current.config +++ b/config/kernel/linux-virtual-current.config @@ -8964,7 +8964,10 @@ CONFIG_CIFS_DEBUG=y CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_SWN_UPCALL is not set CONFIG_CIFS_FSCACHE=y -# CONFIG_SMB_SERVER is not set +CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y +CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y +CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS_COMMON=m CONFIG_CODA_FS=m CONFIG_AFS_FS=m diff --git a/config/kernel/linux-wsl2-arm64-current.config b/config/kernel/linux-wsl2-arm64-current.config index 056f48d8aef7..f68201b1f698 100644 --- a/config/kernel/linux-wsl2-arm64-current.config +++ b/config/kernel/linux-wsl2-arm64-current.config @@ -3818,7 +3818,10 @@ CONFIG_CIFS_POSIX=y # CONFIG_CIFS_SWN_UPCALL is not set # CONFIG_CIFS_FSCACHE is not set # CONFIG_CIFS_ROOT is not set -# CONFIG_SMB_SERVER is not set +CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y +CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y +CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=y # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/config/kernel/linux-wsl2-arm64-edge.config b/config/kernel/linux-wsl2-arm64-edge.config index 10d8de5d101e..2b888d7cd5a8 100644 --- a/config/kernel/linux-wsl2-arm64-edge.config +++ b/config/kernel/linux-wsl2-arm64-edge.config @@ -3787,7 +3787,10 @@ CONFIG_CIFS_POSIX=y # CONFIG_CIFS_SWN_UPCALL is not set # CONFIG_CIFS_FSCACHE is not set # CONFIG_CIFS_ROOT is not set -# CONFIG_SMB_SERVER is not set +CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y +CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y +CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=y # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/config/kernel/linux-wsl2-x86-current.config b/config/kernel/linux-wsl2-x86-current.config index 63dbac15e000..20151aeabde8 100644 --- a/config/kernel/linux-wsl2-x86-current.config +++ b/config/kernel/linux-wsl2-x86-current.config @@ -3553,7 +3553,10 @@ CONFIG_CIFS_POSIX=y # CONFIG_CIFS_SWN_UPCALL is not set # CONFIG_CIFS_FSCACHE is not set # CONFIG_CIFS_ROOT is not set -# CONFIG_SMB_SERVER is not set +CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y +CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y +CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=y # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/config/kernel/linux-wsl2-x86-edge.config b/config/kernel/linux-wsl2-x86-edge.config index 27c98a5a5378..a8587d6a008f 100644 --- a/config/kernel/linux-wsl2-x86-edge.config +++ b/config/kernel/linux-wsl2-x86-edge.config @@ -3776,7 +3776,10 @@ CONFIG_CIFS_POSIX=y # CONFIG_CIFS_SWN_UPCALL is not set # CONFIG_CIFS_FSCACHE is not set # CONFIG_CIFS_ROOT is not set -# CONFIG_SMB_SERVER is not set +CONFIG_SMB_SERVER=m +CONFIG_SMB_SERVER_SMBDIRECT=y +CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y +CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS=y # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set From 0afe5ec2dc6eec55e0b672ef817b1ef89e6e34fc Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Sat, 31 Aug 2024 15:50:18 +0200 Subject: [PATCH 04/15] Refactor welcome screen to improve user experience --- .../etc/update-motd.d/10-armbian-header | 77 +++++++++++++++---- .../etc/update-motd.d/30-armbian-sysinfo | 29 ++++--- .../common/etc/update-motd.d/35-armbian-tips | 4 +- .../etc/update-motd.d/40-armbian-updates | 39 ---------- .../{41-armbian-config => 41-commands} | 17 ++-- .../update-motd.d/98-armbian-autoreboot-warn | 4 +- 6 files changed, 91 insertions(+), 79 deletions(-) delete mode 100755 packages/bsp/common/etc/update-motd.d/40-armbian-updates rename packages/bsp/common/etc/update-motd.d/{41-armbian-config => 41-commands} (58%) diff --git a/packages/bsp/common/etc/update-motd.d/10-armbian-header b/packages/bsp/common/etc/update-motd.d/10-armbian-header index 9d8ac4663388..1aeefe41d7e4 100755 --- a/packages/bsp/common/etc/update-motd.d/10-armbian-header +++ b/packages/bsp/common/etc/update-motd.d/10-armbian-header @@ -22,11 +22,19 @@ VENDORTEMP="${VENDOR}" # Keep the VENDOR from image if its defined there [[ -n "${VENDORTEMP}" && "${VENDORTEMP}" != "${VENDOR}" ]] && VENDOR="${VENDORTEMP}" +# If VENDORPRETTYNAME is defined, used that +[[ -n $VENDORPRETTYNAME ]] && VENDOR="$VENDORPRETTYNAME" + if [[ -f /etc/armbian-distribution-status ]]; then . /etc/armbian-distribution-status + # Fina a way that works [[ -f /etc/lsb-release ]] && DISTRIBUTION_CODENAME=$(grep CODENAME /etc/lsb-release | cut -d"=" -f2) + [[ -f /etc/lsb-release ]] && DISTRIBUTION_ID=$(grep DISTRIB_ID /etc/lsb-release | cut -d"=" -f2) [[ -z "$DISTRIBUTION_CODENAME" && -f /etc/os-release ]] && DISTRIBUTION_CODENAME=$(grep VERSION_CODENAME /etc/os-release | cut -d"=" -f2) + [[ -z "$DISTRIBUTION_ID" && -f /etc/os-release ]] && DISTRIBUTION_ID=$(grep "^ID" /etc/os-release | cut -d"=" -f2) [[ -z "$DISTRIBUTION_CODENAME" && -x /usr/bin/lsb_release ]] && DISTRIBUTION_CODENAME=$(/usr/bin/lsb_release -c | cut -d":" -f2 | tr -d "\t") + [[ -z "$DISTRIBUTION_ID" && -x /usr/bin/lsb_release ]] && DISTRIBUTION_ID=$(/usr/bin/lsb_release -i | cut -d":" -f2 | tr -d "\t") + # Read Armbian distribution status DISTRIBUTION_STATUS=$(grep "$DISTRIBUTION_CODENAME" /etc/armbian-distribution-status | cut -d"=" -f2) fi [[ -f /etc/default/armbian-motd ]] && . /etc/default/armbian-motd @@ -35,31 +43,66 @@ for f in $MOTD_DISABLE; do [[ $f == $THIS_SCRIPT ]] && exit 0 done - +# Read Armbian kernel version KERNELID=$(uname -r) -# Odroid N2 exception -[[ -f /proc/device-tree/model ]] && [[ -n $(tr -d '\000' < /proc/device-tree/model | grep ODROID | grep Plus) ]] && BOARD_NAME+="+" - -TERM=linux toilet -f standard -F metal $(echo $BOARD_NAME | sed 's/Orange Pi/OPi/' | sed 's/NanoPi/NPi/' | sed 's/Banana Pi/BPi/') -echo -e "Welcome to \e[0;91m${VENDOR} ${VERSION} ${DISTRIBUTION_CODENAME^}\x1B[0m with $([[ $BRANCH == edge ]] && echo -e "\e[0;91mbleeding\x1B[0m edge " )\e[0;91mLinux $KERNELID\x1B[0m\n" +# Display software vendor logo +echo -e "\e[0;91m$(figlet -f small " $VENDOR")\e[0m"; -# displaying status warnings +# Display version, board, and kernel version +echo -e " \e[1;91mv${VERSION}\x1B[0m for \e[1;93m$BOARD_NAME \x1B[0mrunning \e[1;91mArmbian Linux\x1B[0m \e[1;93m${KERNELID^}\x1B[0m" +# render image and board type if [[ "$IMAGE_TYPE" != "stable" ]]; then - [[ "$IMAGE_TYPE" == "user-built" ]] && UNSUPPORTED_TEXT="built from trunk" - [[ "$IMAGE_TYPE" == "nightly" ]] && UNSUPPORTED_TEXT="untested automated build" + [[ "$IMAGE_TYPE" == "user-built" ]] && HARDWARE_STATUS="\e[1;91mnot supported\x1B[0m (custom image)" + [[ "$IMAGE_TYPE" == "nightly" ]] && HARDWARE_STATUS="\e[1;91mfor advanced users\x1B[0m (rolling release)" +else + [[ "$BOARD_TYPE" == "csc" || "$BOARD_TYPE" == "tvb" ]] && HARDWARE_STATUS="Community maintained" + [[ "$BOARD_TYPE" == "wip" ]] && HARDWARE_STATUS="\e[1;91mfor advanced users\x1B[0m (work in progress)" + [[ "$BOARD_TYPE" == "eos" ]] && HARDWARE_STATUS="\e[1;91mend of life\x1B[0m" +fi + +# render distribution status +if [[ $DISTRIBUTION_STATUS == supported ]]; then + DISTRO_STATUS="\e[1;92mstable\e[0m ($DISTRIBUTION_CODENAME)" +elif [[ $DISTRIBUTION_STATUS == eos ]]; then + DISTRO_STATUS="\e[1;91mend of life\e[0m ($DISTRIBUTION_CODENAME)" else - [[ "$BOARD_TYPE" == "csc" || "$BOARD_TYPE" == "tvb" ]] && UNSUPPORTED_TEXT="community creations" - [[ "$BOARD_TYPE" == "wip" ]] && UNSUPPORTED_TEXT="work in progress" - [[ "$BOARD_TYPE" == "eos" ]] && UNSUPPORTED_TEXT="end of life" + DISTRO_STATUS="\e[1;93mrolling\e[0m ($DISTRIBUTION_CODENAME)" +fi + +# read packages update status +NUM_UPDATES=0 +NUM_UPDATES_ONHOLD=0 +NUM_SECURITY_UPDATES=0 +[[ -f /var/cache/apt/archives/updates.number ]] && . /var/cache/apt/archives/updates.number +if [[ $NUM_UPDATES -gt 0 ]] && grep -q linux /var/cache/apt/archives/updates.list 2>/dev/null; then + if [[ $NUM_UPDATES_ONHOLD -gt 0 ]]; then + UPDATE_STATUS="FW upgrade \e[1;91mdisabled\e[0m" + else + UPDATE_STATUS="FW upgrade \e[1;92menabled\e[0m" + fi + UPDATE_STATUS+=" and \e[1;92m$NUM_UPDATES\e[0m package" + # Cosmetic is important + [[ $NUM_UPDATES -gt 1 ]] && UPDATE_STATUS+="s" + UPDATE_STATUS+=" available for upgrade\e[0m " +fi + +# draw a line to start this section +#printf "\e[0;90m OS "; printf '%.s─' $(seq 1 76); echo -e " \x1B[0m" +echo "" + +# Display packages status +if [[ -n $DISTRO_STATUS ]]; then + echo -e " Packages: ${DISTRIBUTION_ID^} ${DISTRO_STATUS}" fi -if [[ -n $DISTRIBUTION_STATUS && $DISTRIBUTION_STATUS != supported ]]; then - [[ -n $UNSUPPORTED_TEXT ]] && UNSUPPORTED_TEXT+=" & " - UNSUPPORTED_TEXT+="unsupported ($DISTRIBUTION_CODENAME) userspace!" +# Display available updates +if [[ -n $UPDATE_STATUS ]]; then + echo -e " Updates: $UPDATE_STATUS" fi -if [[ -n $UNSUPPORTED_TEXT ]]; then - echo -e "\e[0;91mNo end-user support: \x1B[0m$UNSUPPORTED_TEXT\n" +# Display hardware support status +if [[ -n $HARDWARE_STATUS ]]; then + echo -e " Support: $HARDWARE_STATUS" fi diff --git a/packages/bsp/common/etc/update-motd.d/30-armbian-sysinfo b/packages/bsp/common/etc/update-motd.d/30-armbian-sysinfo index abd85bab7acf..9d8f4fe82b12 100755 --- a/packages/bsp/common/etc/update-motd.d/30-armbian-sysinfo +++ b/packages/bsp/common/etc/update-motd.d/30-armbian-sysinfo @@ -123,7 +123,13 @@ swap_usage=$( (awk '/Swap/ { printf("%3.0f", $3/$2*100) }' <<<${swap_info} 2>/de swap_total=$(awk '{print $(2)}' <<<${swap_info}) # display info -display "System load" "${load%% *}" "${critical_load}" "0" "%" "" + +# draw a line to start this section + +#printf "\e[0;90m Sysinfo "; printf '%.s─' $(seq 1 71); echo -e " \x1B[0m" +echo "" + +display " Load" "${load%% *}" "${critical_load}" "0" "%" "" printf "Up time: \x1B[92m%s\x1B[0m\t" "$time" display "Local users" "${users##* }" "3" "2" "" @@ -140,12 +146,12 @@ else swap_total+="M" fi -display "Memory usage" "$memory_usage" "70" "0" "%" " of ${memory_total}" +display " Memory usage" "$memory_usage" "70" "0" "%" " of ${memory_total}" display "Zram usage" "$swap_usage" "75" "0" "%" " of ${swap_total}" printf "IP: " printf "\x1B[92m%s\x1B[0m" "$ip_address" echo "" # fixed newline -display "CPU temp" "$board_temp" $CPU_TEMP_LIMIT "0" "°C" "" +display " CPU temp" "$board_temp" $CPU_TEMP_LIMIT "0" "°C" "" display "Ambient temp" "$amb_temp" $AMB_TEMP_LIMIT "0" "°C" "" display "Usage of /" "$root_usage" "90" "1" "%" " of $root_total" echo "" # fixed newline @@ -163,16 +169,16 @@ if [[ -n "$PRIMARY_INTERFACE" ]] && vnstat -i "$PRIMARY_INTERFACE" &> /dev/null; [[ "$traffic" == *"Not enough"* ]] && { traffic_tx="n/a "; traffic_rx="n/a "; } case $PRIMARY_DIRECTION in tx) - printf "TX today: \x1B[92m%s\x1B[0m \t" "$traffic_tx" + printf " TX today: \x1B[92m%s\x1B[0m \t" "$traffic_tx" line=$((line+1)) ;; rx) - printf "RX today: \x1B[92m%s\x1B[0m \t" "$traffic_rx" + printf " RX today: \x1B[92m%s\x1B[0m \t" "$traffic_rx" line=$((line+1)) ;; both) - printf "TX today: \x1B[92m%s\x1B[0m \t" "$traffic_tx" - printf "RX today: \x1B[92m%s\x1B[0m \t" "$traffic_rx" + printf " TX today: \x1B[92m%s\x1B[0m \t" "$traffic_tx" + printf " RX today: \x1B[92m%s\x1B[0m \t" "$traffic_rx" line=$((line+1)) ;; *) #off or whatever @@ -185,18 +191,17 @@ if [[ $(command -v zpool) ]]; then if [[ -n $(echo $zpoolstatus | grep 'not loaded') ]]; then : elif [[ -n $(echo $zpoolstatus | grep 'degraded\|OFFLINE') ]]; then - printf "ZFS pool: " + printf " ZFS pool: " echo -ne "\e[0;91mDegraded\x1B[0m" line=$((line+1)) elif [[ -n $(echo $zpoolstatus | grep 'no pools available') ]]; then - printf "ZFS pool: " + printf " ZFS pool: " echo -ne "n/a" line=$((line+1)) else - printf "ZFS pool: " + printf " ZFS pool: " echo -ne "\e[0;92mOnline\x1B[0m" line=$((line+1)) fi fi -[[ $line -ne 0 ]] && echo "" -echo "" +if [[ $line -ne 0 ]]; then echo ""; fi diff --git a/packages/bsp/common/etc/update-motd.d/35-armbian-tips b/packages/bsp/common/etc/update-motd.d/35-armbian-tips index 0b54c9c3fabc..6afe203ba88d 100755 --- a/packages/bsp/common/etc/update-motd.d/35-armbian-tips +++ b/packages/bsp/common/etc/update-motd.d/35-armbian-tips @@ -25,6 +25,8 @@ if [[ -f $quotes && $(( $RANDOM % 1 )) == 0 ]]; then DUE_DATE=$(echo $quote | cut -d"|" -f1) SELECTED_QUOTE=$(echo $quote | cut -d"|" -f2) if [[ -n $SELECTED_QUOTE && $(date +'%Y-%m-%d') < $(date -d $DUE_DATE +"%Y-%m-%d") ]]; then - echo -e "\e[93mTip of the day:\e[39m $SELECTED_QUOTE\n" + # draw a line to start this section + printf "\n\e[0;90m Tips:\x1B[0m\n " #; printf '%.s─' $(seq 1 5); echo -e " \x1B[0m" + echo -e "\n$SELECTED_QUOTE" | fold -w 79 -s | sed 's/^/ /' fi fi diff --git a/packages/bsp/common/etc/update-motd.d/40-armbian-updates b/packages/bsp/common/etc/update-motd.d/40-armbian-updates deleted file mode 100755 index 1321d54d7af8..000000000000 --- a/packages/bsp/common/etc/update-motd.d/40-armbian-updates +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash -# -# Copyright (c) Authors: https://www.armbian.com/authors -# -# This file is licensed under the terms of the GNU General Public -# License version 2. This program is licensed "as is" without any -# warranty of any kind, whether express or implied. - -# DO NOT EDIT THIS FILE but add config options to /etc/default/armbian-motd -# any changes will be lost on board support package update - -THIS_SCRIPT="updates" -MOTD_DISABLE="" - -[[ -f /etc/default/armbian-motd ]] && . /etc/default/armbian-motd - -for f in $MOTD_DISABLE; do - [[ $f == $THIS_SCRIPT ]] && exit 0 -done - -NUM_UPDATES=0 -NUM_UPDATES_ONHOLD=0 - -[[ -f /var/cache/apt/archives/updates.number ]] && . /var/cache/apt/archives/updates.number - -if [[ $NUM_UPDATES -gt 0 ]]; then - echo -en "[\e[31m $NUM_SECURITY_UPDATES security updates available, $NUM_UPDATES updates total\e[0m: \e[1mapt upgrade\e[0m " -fi - -if [[ $NUM_UPDATES_ONHOLD -gt 0 ]] && grep -q linux /var/cache/apt/archives/updates.list 2>/dev/null; then - [[ $NUM_UPDATES -gt 0 ]] && echo -en "| " || echo -en "[ " - echo -en "\e[31mKernel and firmware upgrades disabled:\e[0m \e[1marmbian-config\e[0m " -fi - -if [[ $NUM_UPDATES -gt 0 ]] || [[ $NUM_UPDATES_ONHOLD -gt 0 ]]; then - echo -e "]" - echo -e "Last check: \e[92m$DATE\e[0m" - echo -fi diff --git a/packages/bsp/common/etc/update-motd.d/41-armbian-config b/packages/bsp/common/etc/update-motd.d/41-commands similarity index 58% rename from packages/bsp/common/etc/update-motd.d/41-armbian-config rename to packages/bsp/common/etc/update-motd.d/41-commands index 8cad023e3d3a..e5ae79de2c9b 100755 --- a/packages/bsp/common/etc/update-motd.d/41-armbian-config +++ b/packages/bsp/common/etc/update-motd.d/41-commands @@ -9,7 +9,7 @@ # DO NOT EDIT THIS FILE but add config options to /etc/default/armbian-motd # any changes will be lost on board support package update -THIS_SCRIPT="config" +THIS_SCRIPT="commands" MOTD_DISABLE="" [[ -f /etc/default/armbian-motd ]] && . /etc/default/armbian-motd @@ -18,13 +18,14 @@ for f in $MOTD_DISABLE; do [[ $f == $THIS_SCRIPT ]] && exit 0 done -if [[ $(( $RANDOM % 2 )) == 0 ]]; then - if [[ -f /usr/sbin/armbian-config ]]; then - echo -e "[\e[31m General system configuration (beta)\e[0m: \e[1marmbian-config\e[0m ]\n" - else - echo -e "[\e[31m Menu-driven system configuration (beta)\e[0m: \e[1msudo apt update && sudo apt install armbian-config\e[0m ]\n" - fi -fi +echo "" +printf "\e[0;90m Commands: \e[0;90m\n" #; printf '%.s─' $(seq 1 39); echo -e "\x1B[0m" +echo "" +echo -e " \e[1;93mUpdate\e[1;39m: sudo apt update ; sudo apt upgrade" +echo -e " \e[1;93mSystem config\e[1;39m: sudo armbian-config" +echo -e "\033[0m" +#printf "\e[0;90m www.armbian.com/donate "; printf '%.s─' $(seq 1 21); echo -e "\x1B[0m" +#echo "" exit 0 diff --git a/packages/bsp/common/etc/update-motd.d/98-armbian-autoreboot-warn b/packages/bsp/common/etc/update-motd.d/98-armbian-autoreboot-warn index 2e6036fd6935..c248a8be2f64 100755 --- a/packages/bsp/common/etc/update-motd.d/98-armbian-autoreboot-warn +++ b/packages/bsp/common/etc/update-motd.d/98-armbian-autoreboot-warn @@ -10,6 +10,6 @@ # any changes will be lost on board support package update if [[ -f /var/run/resize2fs-reboot ]]; then - printf "\e[0;91mWarning: a reboot is needed to finish resizing the filesystem \x1B[0m \n" - printf "\e[0;91mPlease reboot the system as soon as possible \x1B[0m \n" + printf "\e[0;91m Warning: a reboot is needed to finish resizing the filesystem \x1B[0m \n" + printf "\e[0;91m Please reboot the system as soon as possible \x1B[0m \n" fi From d81d52ba9735a693d2747474ddf97654510b035c Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Sat, 31 Aug 2024 15:56:01 +0200 Subject: [PATCH 05/15] Cosmetic adjustement of profile.d scripts to align with motd --- .../common/etc/default/armbian-motd.dpkg-dist | 2 +- .../armbian-activate-profile-sync-daemon.sh | 4 +- .../armbian-check-first-login-reboot.sh | 6 +-- .../etc/update-motd.d/10-armbian-header | 30 +++++++------- .../etc/update-motd.d/30-armbian-sysinfo | 39 ++++++++++++------- .../common/etc/update-motd.d/35-armbian-tips | 4 +- .../bsp/common/etc/update-motd.d/41-commands | 29 ++++++++++---- 7 files changed, 69 insertions(+), 45 deletions(-) diff --git a/packages/bsp/common/etc/default/armbian-motd.dpkg-dist b/packages/bsp/common/etc/default/armbian-motd.dpkg-dist index 3dfad79f3d7b..da1dbb0b1e69 100644 --- a/packages/bsp/common/etc/default/armbian-motd.dpkg-dist +++ b/packages/bsp/common/etc/default/armbian-motd.dpkg-dist @@ -6,7 +6,7 @@ MOTD_DISABLE="" ONE_WIRE="" -HIDE_IP_PATTERN="^dummy0|^lo" +HIDE_IP_PATTERN="^dummy0|^lo|^docker" PRIMARY_INTERFACE="$(ip route | grep '^default' | sed "s/.*dev //" | cut -d" " -f1)" PRIMARY_DIRECTION="rx" STORAGE=/dev/sda1 diff --git a/packages/bsp/common/etc/profile.d/armbian-activate-profile-sync-daemon.sh b/packages/bsp/common/etc/profile.d/armbian-activate-profile-sync-daemon.sh index 9f0b86523b9f..63f9d163776a 100644 --- a/packages/bsp/common/etc/profile.d/armbian-activate-profile-sync-daemon.sh +++ b/packages/bsp/common/etc/profile.d/armbian-activate-profile-sync-daemon.sh @@ -18,10 +18,10 @@ if [ -f "${HOME}/.activate_psd" ]; then sed -i 's/#USE_OVERLAYFS=.*/USE_OVERLAYFS="yes"/' "${config_file}" case $(/usr/bin/psd p 2>/dev/null | grep Overlayfs) in *active*) - echo -e "\nConfigured profile sync daemon with overlayfs." + echo -e "\n Configured profile sync daemon with overlayfs." ;; *) - echo -e "\nConfigured profile sync daemon." + echo -e "\n Configured profile sync daemon." sed -i 's/USE_OVERLAYFS="yes"/#USE_OVERLAYFS="no"/' "${config_file}" ;; esac diff --git a/packages/bsp/common/etc/profile.d/armbian-check-first-login-reboot.sh b/packages/bsp/common/etc/profile.d/armbian-check-first-login-reboot.sh index 175c2a9e99a4..dd67df3d116a 100644 --- a/packages/bsp/common/etc/profile.d/armbian-check-first-login-reboot.sh +++ b/packages/bsp/common/etc/profile.d/armbian-check-first-login-reboot.sh @@ -10,15 +10,15 @@ if [ "$-" != "${-#*i}" ]; then OutstandingPackages="$(grep -Ev "linux-base|linux-image" /var/run/reboot-required.pkgs 2>/dev/null)" if [ -f "/var/run/.reboot_required" ]; then - printf "\n[\e[0;91m Kernel was updated, please reboot\x1B[0m ]\n\n" + printf "\n \e[0;91mKernel was updated, please reboot\x1B[0m \n\n" elif [ "X${OutstandingPackages}" != "X" ]; then # No kernel update involved, just regular packages like e.g. dbus require a reboot Packages="$(grep -Ev "linux-base|linux-image" /var/run/reboot-required.pkgs | sort | uniq | tr '\n' ',' | sed -e 's/,/, /g' -e 's/,\ $//')" OlderThanOneDay=$(find /var/run/reboot-required -mtime +1) if [ "X${OlderThanOneDay}" = "X" ]; then - printf "\n[\e[0;92m some packages require a reboot (${Packages})\x1B[0m ]\n\n" + printf "\n\e[0;92m Some packages require a reboot (${Packages})\x1B[0m\n\n" else - printf "\n[\e[0;91m some packages require a reboot since more than 1 day (${Packages})\x1B[0m ]\n\n" + printf "\n\e[0;91m Some packages require a reboot since more than 1 day (${Packages})\x1B[0m\n\n" fi fi fi diff --git a/packages/bsp/common/etc/update-motd.d/10-armbian-header b/packages/bsp/common/etc/update-motd.d/10-armbian-header index 1aeefe41d7e4..92a3f8db7984 100755 --- a/packages/bsp/common/etc/update-motd.d/10-armbian-header +++ b/packages/bsp/common/etc/update-motd.d/10-armbian-header @@ -47,28 +47,28 @@ done KERNELID=$(uname -r) # Display software vendor logo -echo -e "\e[0;91m$(figlet -f small " $VENDOR")\e[0m"; +echo -e "\e[1;91m$(figlet -f small " $VENDOR")\e[0m"; # Display version, board, and kernel version -echo -e " \e[1;91mv${VERSION}\x1B[0m for \e[1;93m$BOARD_NAME \x1B[0mrunning \e[1;91mArmbian Linux\x1B[0m \e[1;93m${KERNELID^}\x1B[0m" +echo -e " \e[0;92mv${VERSION}\x1B[0m for $BOARD_NAME running Armbian Linux \e[0;92m${KERNELID^}\x1B[0m" # render image and board type if [[ "$IMAGE_TYPE" != "stable" ]]; then - [[ "$IMAGE_TYPE" == "user-built" ]] && HARDWARE_STATUS="\e[1;91mnot supported\x1B[0m (custom image)" - [[ "$IMAGE_TYPE" == "nightly" ]] && HARDWARE_STATUS="\e[1;91mfor advanced users\x1B[0m (rolling release)" + [[ "$IMAGE_TYPE" == "user-built" ]] && HARDWARE_STATUS="\e[0;91mDIY\x1B[0m (custom image)\x1B[0m" + [[ "$IMAGE_TYPE" == "nightly" ]] && HARDWARE_STATUS="\e[0;91mfor advanced users\x1B[0m (rolling release)\x1B[0m" else - [[ "$BOARD_TYPE" == "csc" || "$BOARD_TYPE" == "tvb" ]] && HARDWARE_STATUS="Community maintained" - [[ "$BOARD_TYPE" == "wip" ]] && HARDWARE_STATUS="\e[1;91mfor advanced users\x1B[0m (work in progress)" - [[ "$BOARD_TYPE" == "eos" ]] && HARDWARE_STATUS="\e[1;91mend of life\x1B[0m" + [[ "$BOARD_TYPE" == "csc" || "$BOARD_TYPE" == "tvb" ]] && HARDWARE_STATUS="\e[0;91mDIY (community maintained)\x1B[0m" + [[ "$BOARD_TYPE" == "wip" ]] && HARDWARE_STATUS="\e[0;91mfor advanced users\x1B[0m (work in progress)\x1B[0m" + [[ "$BOARD_TYPE" == "eos" ]] && HARDWARE_STATUS="\e[0;91mend of life\x1B[0m" fi # render distribution status if [[ $DISTRIBUTION_STATUS == supported ]]; then - DISTRO_STATUS="\e[1;92mstable\e[0m ($DISTRIBUTION_CODENAME)" + DISTRO_STATUS="\e[0;92mstable\e[0m ($DISTRIBUTION_CODENAME)" elif [[ $DISTRIBUTION_STATUS == eos ]]; then - DISTRO_STATUS="\e[1;91mend of life\e[0m ($DISTRIBUTION_CODENAME)" + DISTRO_STATUS="\e[0;91mend of life\e[0m ($DISTRIBUTION_CODENAME)" else - DISTRO_STATUS="\e[1;93mrolling\e[0m ($DISTRIBUTION_CODENAME)" + DISTRO_STATUS="\e[0;93mrolling\e[0m ($DISTRIBUTION_CODENAME)" fi # read packages update status @@ -76,11 +76,11 @@ NUM_UPDATES=0 NUM_UPDATES_ONHOLD=0 NUM_SECURITY_UPDATES=0 [[ -f /var/cache/apt/archives/updates.number ]] && . /var/cache/apt/archives/updates.number -if [[ $NUM_UPDATES -gt 0 ]] && grep -q linux /var/cache/apt/archives/updates.list 2>/dev/null; then - if [[ $NUM_UPDATES_ONHOLD -gt 0 ]]; then - UPDATE_STATUS="FW upgrade \e[1;91mdisabled\e[0m" +if [[ $NUM_UPDATES -gt 0 ]]; then + if apt-mark showhold | grep -q linux-image 2>/dev/null; then + UPDATE_STATUS="Kernel upgrade \e[0;91mdisabled\e[0m" else - UPDATE_STATUS="FW upgrade \e[1;92menabled\e[0m" + UPDATE_STATUS="Kernel upgrade \e[0;92menabled\e[0m" fi UPDATE_STATUS+=" and \e[1;92m$NUM_UPDATES\e[0m package" # Cosmetic is important @@ -88,8 +88,6 @@ if [[ $NUM_UPDATES -gt 0 ]] && grep -q linux /var/cache/apt/archives/updates.lis UPDATE_STATUS+=" available for upgrade\e[0m " fi -# draw a line to start this section -#printf "\e[0;90m OS "; printf '%.s─' $(seq 1 76); echo -e " \x1B[0m" echo "" # Display packages status diff --git a/packages/bsp/common/etc/update-motd.d/30-armbian-sysinfo b/packages/bsp/common/etc/update-motd.d/30-armbian-sysinfo index 9d8f4fe82b12..4ce2ae7c46e1 100755 --- a/packages/bsp/common/etc/update-motd.d/30-armbian-sysinfo +++ b/packages/bsp/common/etc/update-motd.d/30-armbian-sysinfo @@ -19,7 +19,7 @@ MOTD_DISABLE="" PRIMARY_INTERFACE="eth0" PRIMARY_DIRECTION="rx" STORAGE=/dev/sda1 -HIDE_IP_PATTERN="^dummy0|^lo" +HIDE_IP_PATTERN="^dummy0|^lo|^docker" CPU_TEMP_LIMIT=60 # Temperature offset in Celcius degrees CPU_TEMP_OFFSET=0 @@ -53,6 +53,10 @@ function display() { fi } # display +function get_wan_address(){ +curl -s http://whatismyip.akamai.com/ +} + function get_ip_addresses() { local ips=() for f in /sys/class/net/*; do @@ -91,6 +95,7 @@ function storage_info() { # Works only with ambienttemp and batteryinfo since A20 is slow enough :) amb_temp=$(ambienttemp &) ip_address=$(get_ip_addresses &) +wan_ip_address=$(get_wan_address &) batteryinfo storage_info getboardtemp @@ -126,9 +131,15 @@ swap_total=$(awk '{print $(2)}' <<<${swap_info}) # draw a line to start this section -#printf "\e[0;90m Sysinfo "; printf '%.s─' $(seq 1 71); echo -e " \x1B[0m" +#echo "" +echo -en " IP addresses: \x1B[93m(LAN)\x1B[0m \x1B[92m$ip_address\x1B[0m " +if [[ -n $wan_ip_address ]]; then +echo -e "\x1B[93m(WAN)\x1B[0m $wan_ip_address" +fi +echo "" +printf "\e[0;90m Performance: \x1B[0m" +echo "" # fixed newline echo "" - display " Load" "${load%% *}" "${critical_load}" "0" "%" "" printf "Up time: \x1B[92m%s\x1B[0m\t" "$time" @@ -148,8 +159,6 @@ fi display " Memory usage" "$memory_usage" "70" "0" "%" " of ${memory_total}" display "Zram usage" "$swap_usage" "75" "0" "%" " of ${swap_total}" -printf "IP: " -printf "\x1B[92m%s\x1B[0m" "$ip_address" echo "" # fixed newline display " CPU temp" "$board_temp" $CPU_TEMP_LIMIT "0" "°C" "" display "Ambient temp" "$amb_temp" $AMB_TEMP_LIMIT "0" "°C" "" @@ -164,21 +173,23 @@ display "Battery" "$battery_percent" "20" "1" "%" "$status_battery_text" ; a=$(( line=0 if [[ -n "$PRIMARY_INTERFACE" ]] && vnstat -i "$PRIMARY_INTERFACE" &> /dev/null; then traffic=$(vnstat -i $PRIMARY_INTERFACE --oneline | cut -d";" -f4,5) - traffic_rx=$(echo $traffic | cut -d";" -f1,1 | sed -r 's/([0-9]+\.[0-9]{1})[0-9]*/\1/') - traffic_tx=$(echo $traffic | cut -d";" -f2,2 | sed -r 's/([0-9]+\.[0-9]{1})[0-9]*/\1/') + traffic_rx=$(echo $traffic | cut -d";" -f1,1 | sed -r 's/([0-9]+\.[0-9]{1})[0-9]*/\1/' | cut -d" " -f1 | cut -d"," -f1) + traffic_rx_unit=$(echo $traffic | cut -d";" -f1,1 | sed -r 's/([0-9]+\.[0-9]{1})[0-9]*/\1/' | cut -d" " -f2) + traffic_tx=$(echo $traffic | cut -d";" -f2,2 | sed -r 's/([0-9]+\.[0-9]{1})[0-9]*/\1/' | cut -d" " -f1 | cut -d"," -f1) + traffic_tx_unit=$(echo $traffic | cut -d";" -f2,2 | sed -r 's/([0-9]+\.[0-9]{1})[0-9]*/\1/' | cut -d" " -f2) [[ "$traffic" == *"Not enough"* ]] && { traffic_tx="n/a "; traffic_rx="n/a "; } case $PRIMARY_DIRECTION in tx) - printf " TX today: \x1B[92m%s\x1B[0m \t" "$traffic_tx" + display " TX today" "$traffic_tx" 500 0 " $traffic_tx_unit" "" line=$((line+1)) ;; rx) - printf " RX today: \x1B[92m%s\x1B[0m \t" "$traffic_rx" + display " RX today" "$traffic_rx" 500 0 " $traffic_rx_unit" "" line=$((line+1)) ;; both) - printf " TX today: \x1B[92m%s\x1B[0m \t" "$traffic_tx" - printf " RX today: \x1B[92m%s\x1B[0m \t" "$traffic_rx" + display " TX today" "$traffic_tx" 500 0 " $traffic_tx_unit" "" + display "RX today" "$traffic_rx" 500 0 " $traffic_rx_unit" "" line=$((line+1)) ;; *) #off or whatever @@ -191,15 +202,15 @@ if [[ $(command -v zpool) ]]; then if [[ -n $(echo $zpoolstatus | grep 'not loaded') ]]; then : elif [[ -n $(echo $zpoolstatus | grep 'degraded\|OFFLINE') ]]; then - printf " ZFS pool: " + printf " ZFS pool: " echo -ne "\e[0;91mDegraded\x1B[0m" line=$((line+1)) elif [[ -n $(echo $zpoolstatus | grep 'no pools available') ]]; then - printf " ZFS pool: " + printf " ZFS pool: " echo -ne "n/a" line=$((line+1)) else - printf " ZFS pool: " + printf " ZFS pool: " echo -ne "\e[0;92mOnline\x1B[0m" line=$((line+1)) fi diff --git a/packages/bsp/common/etc/update-motd.d/35-armbian-tips b/packages/bsp/common/etc/update-motd.d/35-armbian-tips index 6afe203ba88d..c1b6067abc7a 100755 --- a/packages/bsp/common/etc/update-motd.d/35-armbian-tips +++ b/packages/bsp/common/etc/update-motd.d/35-armbian-tips @@ -25,8 +25,8 @@ if [[ -f $quotes && $(( $RANDOM % 1 )) == 0 ]]; then DUE_DATE=$(echo $quote | cut -d"|" -f1) SELECTED_QUOTE=$(echo $quote | cut -d"|" -f2) if [[ -n $SELECTED_QUOTE && $(date +'%Y-%m-%d') < $(date -d $DUE_DATE +"%Y-%m-%d") ]]; then - # draw a line to start this section - printf "\n\e[0;90m Tips:\x1B[0m\n " #; printf '%.s─' $(seq 1 5); echo -e " \x1B[0m" + printf "\e[0;90m Tips:\x1B[0m\n " #; printf '%.s─' $(seq 1 5); echo -e " \x1B[0m" echo -e "\n$SELECTED_QUOTE" | fold -w 79 -s | sed 's/^/ /' + echo "" fi fi diff --git a/packages/bsp/common/etc/update-motd.d/41-commands b/packages/bsp/common/etc/update-motd.d/41-commands index e5ae79de2c9b..457093edd305 100755 --- a/packages/bsp/common/etc/update-motd.d/41-commands +++ b/packages/bsp/common/etc/update-motd.d/41-commands @@ -18,14 +18,29 @@ for f in $MOTD_DISABLE; do [[ $f == $THIS_SCRIPT ]] && exit 0 done +printf "\e[0;90m Commands: \x1B[0m\n" #; printf '%.s─' $(seq 1 39); echo -e "\x1B[0m" echo "" -printf "\e[0;90m Commands: \e[0;90m\n" #; printf '%.s─' $(seq 1 39); echo -e "\x1B[0m" -echo "" -echo -e " \e[1;93mUpdate\e[1;39m: sudo apt update ; sudo apt upgrade" -echo -e " \e[1;93mSystem config\e[1;39m: sudo armbian-config" + +list=( + "System config ","sudo ","armbian-config" + "System monitor ","","htop" +) + +# just for easier coloring +yellow() { printf '%s' $'\e[1;33m' "$*" $'\e[0m'; } + +for l in "${list[@]}" +do + name=$(echo $l | cut -d"," -f1) + sudo=$(echo $l | cut -d"," -f2) + command=$(echo $l | cut -d"," -f3) + + if command -v $command &> /dev/null + then + printf "$(yellow " %-26s %-0s"): $sudo$command\n" "$name" + fi +done + echo -e "\033[0m" -#printf "\e[0;90m www.armbian.com/donate "; printf '%.s─' $(seq 1 21); echo -e "\x1B[0m" -#echo "" exit 0 - From 9af94d5977f1c5f330088e87c7936b097658952b Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Sat, 31 Aug 2024 15:37:50 +0200 Subject: [PATCH 06/15] Store list of preinstalled extensions EXTENSIONS and add VENDORPRETTYNAME to image fingerprint --- lib/functions/bsp/armbian-bsp-cli-deb.sh | 2 ++ lib/functions/configuration/main-config.sh | 1 + lib/functions/image/fingerprint.sh | 1 + 3 files changed, 4 insertions(+) diff --git a/lib/functions/bsp/armbian-bsp-cli-deb.sh b/lib/functions/bsp/armbian-bsp-cli-deb.sh index eef3db9ed36a..a0cb9c7d7909 100644 --- a/lib/functions/bsp/armbian-bsp-cli-deb.sh +++ b/lib/functions/bsp/armbian-bsp-cli-deb.sh @@ -97,6 +97,7 @@ function compile_armbian-bsp-cli() { BOARDFAMILY=${BOARDFAMILY} BUILD_REPOSITORY_URL=${BUILD_REPOSITORY_URL} BUILD_REPOSITORY_COMMIT=${BUILD_REPOSITORY_COMMIT} + EXTENSIONS=${ENABLE_EXTENSIONS} LINUXFAMILY=$LINUXFAMILY ARCH=$ARCHITECTURE BOOT_SOC=$BOOT_SOC @@ -107,6 +108,7 @@ function compile_armbian-bsp-cli() { FORCE_BOOTSCRIPT_UPDATE=$FORCE_BOOTSCRIPT_UPDATE FORCE_UBOOT_UPDATE=$FORCE_UBOOT_UPDATE VENDOR="$VENDOR" + VENDORPRETTYNAME="$VENDORPRETTYNAME" VENDORDOCS="$VENDORDOCS" VENDORURL="$VENDORURL" VENDORSUPPORT="$VENDORSUPPORT" diff --git a/lib/functions/configuration/main-config.sh b/lib/functions/configuration/main-config.sh index 91c354c2d2e9..8df5570373b6 100644 --- a/lib/functions/configuration/main-config.sh +++ b/lib/functions/configuration/main-config.sh @@ -40,6 +40,7 @@ function do_main_configuration() { # Armbian image is set as unofficial if build manually or without declaring from outside [[ -z $VENDOR ]] && VENDOR="Armbian-unofficial" + [[ -z $VENDORPRETTYNAME ]] && VENDORPRETTYNAME="${VENDOR}" # Use framework defaults for community Armbian images and unsupported distribution when building Armbian distribution if [[ ${VENDOR} == "Armbian" ]] && [[ ${BOARD_TYPE} != "conf" || $(cat $SRC/config/distributions/$RELEASE/support) != "supported" ]]; then diff --git a/lib/functions/image/fingerprint.sh b/lib/functions/image/fingerprint.sh index 3bca89cf1b43..1fbb7914a09a 100644 --- a/lib/functions/image/fingerprint.sh +++ b/lib/functions/image/fingerprint.sh @@ -23,6 +23,7 @@ function fingerprint_image() { Build date: $(date +'%d.%m.%Y') Sources: ${BUILD_REPOSITORY_URL} Sources rev: ${BUILD_REPOSITORY_COMMIT} + Extensions: ${ENABLE_EXTENSIONS} Authors: https://www.armbian.com/authors Maintainer: ${MAINTAINER} <$MAINTAINERMAIL> Support: ${VENDORSUPPORT} From ae53057334278e21f33659a154d394f2ea2db9da Mon Sep 17 00:00:00 2001 From: JohnTheCoolingFan Date: Sun, 1 Sep 2024 18:15:06 +0300 Subject: [PATCH 07/15] bigtreetech-cb1: edge: remove hook that changed device tree used --- config/boards/bigtreetech-cb1.conf | 6 ------ 1 file changed, 6 deletions(-) diff --git a/config/boards/bigtreetech-cb1.conf b/config/boards/bigtreetech-cb1.conf index fccba206e634..a986944d2b77 100644 --- a/config/boards/bigtreetech-cb1.conf +++ b/config/boards/bigtreetech-cb1.conf @@ -11,9 +11,3 @@ BOOTFS_TYPE="fat" BOOT_FS_LABEL="BOOT" OVERLAY_PREFIX="sun50i-h616" BOOT_FDT_FILE="allwinner/sun50i-h616-bigtreetech-cb1-sd.dtb" - -post_family_config__fdt_bigtreetech_cb1() { - if [[ "${BRANCH}" = "edge" ]]; then - BOOT_FDT_FILE="allwinner/sun50i-h616-bigtreetech-pi.dtb" - fi -} From 23cff9170c972169dd9772b4e44b70ee7e1bab82 Mon Sep 17 00:00:00 2001 From: JohnTheCoolingFan Date: Sun, 1 Sep 2024 20:25:04 +0300 Subject: [PATCH 08/15] Replace symlinked patches by pointed files --- ...0i-h616-bigtreetech-cb1-enable-emac1.patch | 47 ++++++++++++- ...50i-h616-bigtreetech-cb1-enable-hdmi.patch | 66 ++++++++++++++++++- 2 files changed, 111 insertions(+), 2 deletions(-) mode change 120000 => 100644 patch/kernel/archive/sunxi-6.7/patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1-enable-emac1.patch mode change 120000 => 100644 patch/kernel/archive/sunxi-6.7/patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1-enable-hdmi.patch diff --git a/patch/kernel/archive/sunxi-6.7/patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1-enable-emac1.patch b/patch/kernel/archive/sunxi-6.7/patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1-enable-emac1.patch deleted file mode 120000 index 93a6f46415e3..000000000000 --- a/patch/kernel/archive/sunxi-6.7/patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1-enable-emac1.patch +++ /dev/null @@ -1 +0,0 @@ -../../sunxi-6.6/patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1-enable-emac1.patch \ No newline at end of file diff --git a/patch/kernel/archive/sunxi-6.7/patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1-enable-emac1.patch b/patch/kernel/archive/sunxi-6.7/patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1-enable-emac1.patch new file mode 100644 index 000000000000..6509e0f87fbb --- /dev/null +++ b/patch/kernel/archive/sunxi-6.7/patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1-enable-emac1.patch @@ -0,0 +1,46 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: JohnTheCoolingFan +Date: Thu, 13 Jun 2024 11:50:55 +0000 +Subject: ARM64: dts: sun50i-h616: BigTreeTech CB1: Enable EMAC1 + +Signed-off-by: JohnTheCoolingFan +--- + arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi | 18 ++++++++++ + 1 file changed, 18 insertions(+) + +diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi +index bbff30ccf..b98e85a51 100644 +--- a/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi ++++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi +@@ -142,10 +142,28 @@ mcp2515_clock: mcp2515_clock { + #clock-cells = <0>; + clock-frequency = <12000000>; + }; + }; + ++&emac1 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&rmii_pins>; ++ phy-mode = "rmii"; ++ phy-handle = <&rmii_phy>; ++ phy-supply = <®_dldo1>; ++ allwinner,rx-delay-ps = <3100>; ++ allwinner,tx-delay-ps = <700>; ++ status = "okay"; ++}; ++ ++&mdio1 { ++ rmii_phy: ethernet-phy@1 { ++ compatible = "ethernet-phy-ieee802.3-c22"; ++ reg = <1>; ++ }; ++}; ++ + &mmc0 { + vmmc-supply = <®_dldo1>; + broken-cd; + bus-width = <4>; + max-frequency = <50000000>; +-- +Created with Armbian build tools https://github.com/armbian/build + diff --git a/patch/kernel/archive/sunxi-6.7/patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1-enable-hdmi.patch b/patch/kernel/archive/sunxi-6.7/patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1-enable-hdmi.patch deleted file mode 120000 index 0de064853345..000000000000 --- a/patch/kernel/archive/sunxi-6.7/patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1-enable-hdmi.patch +++ /dev/null @@ -1 +0,0 @@ -../../sunxi-6.6/patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1-enable-hdmi.patch \ No newline at end of file diff --git a/patch/kernel/archive/sunxi-6.7/patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1-enable-hdmi.patch b/patch/kernel/archive/sunxi-6.7/patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1-enable-hdmi.patch new file mode 100644 index 000000000000..2d9e9768e897 --- /dev/null +++ b/patch/kernel/archive/sunxi-6.7/patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1-enable-hdmi.patch @@ -0,0 +1,65 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: JohnTheCoolingFan +Date: Thu, 13 Jun 2024 11:07:35 +0000 +Subject: ARM64: dts: sun50i-h616: BigTreeTech CB1: Enable HDMI + +Signed-off-by: JohnTheCoolingFan +--- + arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi | 26 ++++++++++ + 1 file changed, 26 insertions(+) + +diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi +index e82da4b6e..bbff30ccf 100644 +--- a/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi ++++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi +@@ -23,10 +23,21 @@ aliases { + + chosen { + stdout-path = "serial0:115200n8"; + }; + ++ connector { ++ compatible = "hdmi-connector"; ++ type = "d"; ++ ++ port { ++ hdmi_con_in: endpoint { ++ remote-endpoint = <&hdmi_out_con>; ++ }; ++ }; ++ }; ++ + leds { + compatible = "gpio-leds"; + + act_led: led-0 { + gpios = <&pio 7 5 GPIO_ACTIVE_LOW>; /* PH5 */ +@@ -255,10 +266,25 @@ reg_dldo1: dldo1 { + }; + }; + }; + }; + ++&de { ++ status = "okay"; ++}; ++ ++&hdmi { ++ hvcc-supply = <®_aldo1>; ++ status = "okay"; ++}; ++ ++&hdmi_out { ++ hdmi_out_con: endpoint { ++ remote-endpoint = <&hdmi_con_in>; ++ }; ++}; ++ + &cpu0 { + cpu-supply = <®_dcdc2>; + status = "okay"; + }; + +-- +Created with Armbian build tools https://github.com/armbian/build + From 02eec74c1ebf4c0419427619f2add6f9a08dffe8 Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Mon, 15 Jul 2024 22:52:36 +0200 Subject: [PATCH 09/15] linux-rk35xx-vendor: enable `CONFIG_KPROBES` - for tetragon & co --- config/kernel/linux-rk35xx-vendor.config | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/config/kernel/linux-rk35xx-vendor.config b/config/kernel/linux-rk35xx-vendor.config index 7c864a20b406..958eb923f227 100644 --- a/config/kernel/linux-rk35xx-vendor.config +++ b/config/kernel/linux-rk35xx-vendor.config @@ -614,10 +614,11 @@ CONFIG_KVM=y # General architecture-dependent options # CONFIG_ARCH_HAS_SUBPAGE_FAULTS=y -# CONFIG_KPROBES is not set +CONFIG_KPROBES=y # CONFIG_JUMP_LABEL is not set CONFIG_UPROBES=y CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_KRETPROBES=y CONFIG_HAVE_IOREMAP_PROT=y CONFIG_HAVE_KPROBES=y CONFIG_HAVE_KRETPROBES=y @@ -9396,12 +9397,14 @@ CONFIG_DYNAMIC_FTRACE_WITH_REGS=y # CONFIG_HWLAT_TRACER is not set # CONFIG_OSNOISE_TRACER is not set # CONFIG_TIMERLAT_TRACER is not set -# CONFIG_FTRACE_SYSCALLS is not set +CONFIG_FTRACE_SYSCALLS=y # CONFIG_TRACER_SNAPSHOT is not set CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set # CONFIG_PROFILE_ALL_BRANCHES is not set CONFIG_BLK_DEV_IO_TRACE=y +CONFIG_KPROBE_EVENTS=y +# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set CONFIG_UPROBE_EVENTS=y CONFIG_BPF_EVENTS=y CONFIG_DYNAMIC_EVENTS=y @@ -9419,6 +9422,7 @@ CONFIG_FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY=y # CONFIG_RING_BUFFER_STARTUP_TEST is not set # CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set # CONFIG_PREEMPTIRQ_DELAY_TEST is not set +# CONFIG_KPROBE_EVENT_GEN_TEST is not set # CONFIG_RV is not set # CONFIG_SAMPLES is not set CONFIG_STRICT_DEVMEM=y @@ -9437,6 +9441,7 @@ CONFIG_STRICT_DEVMEM=y # # CONFIG_KUNIT is not set # CONFIG_NOTIFIER_ERROR_INJECTION is not set +# CONFIG_FUNCTION_ERROR_INJECTION is not set # CONFIG_FAULT_INJECTION is not set CONFIG_ARCH_HAS_KCOV=y CONFIG_CC_HAS_SANCOV_TRACE_PC=y From b834256138ec414a5f78ee5fc195c1276b54e40c Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Sun, 7 Apr 2024 22:12:50 +0200 Subject: [PATCH 10/15] kernel-dtb: copy also the dtb binary for the board to output --- lib/functions/compilation/kernel.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/functions/compilation/kernel.sh b/lib/functions/compilation/kernel.sh index a6926e57f941..1bda4ca11420 100644 --- a/lib/functions/compilation/kernel.sh +++ b/lib/functions/compilation/kernel.sh @@ -196,6 +196,12 @@ function kernel_dtb_only_build() { exit_with_error "Failed to parse BOOT_FDT_FILE: ${BOOT_FDT_FILE}" fi + # Copy the bin dtb for convenience + display_alert "Kernel DTB-only for development" "Copying binary ${BOOT_FDT_FILE}" "warn" + declare binary_dtb="${kernel_work_dir}/arch/${ARCH}/boot/dts/${fdt_dir}/${fdt_file}" + declare binary_dtb_dest="${SRC}/output/${fdt_dir}-${fdt_file}--${KERNEL_MAJOR_MINOR}-${BRANCH}.dtb" + run_host_command_logged cp -v "${binary_dtb}" "${binary_dtb_dest}" + # Kernel build should produce a preprocessed version of all DTS files built into DTBs at arch/arm64/boot/dts/${fdt_dir}/.${fdt_file}.dts.tmp declare preprocessed_fdt_source="${kernel_work_dir}/arch/${ARCH}/boot/dts/${fdt_dir}/.${fdt_file}.dts.tmp" From ea028fbcbac1a6321b17557de1367cafb2a4f2ad Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Thu, 29 Aug 2024 15:17:56 +0200 Subject: [PATCH 11/15] prepare-host: trixie and sid don't carry python3-distutils anymore --- lib/functions/host/prepare-host.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/functions/host/prepare-host.sh b/lib/functions/host/prepare-host.sh index 85378415532d..1232bdbc1c32 100644 --- a/lib/functions/host/prepare-host.sh +++ b/lib/functions/host/prepare-host.sh @@ -297,8 +297,8 @@ function adaptative_prepare_host_dependencies() { # Needed for some u-boot's, lest "tools/mkeficapsule.c:21:10: fatal error: gnutls/gnutls.h" host_dependencies+=("libgnutls28-dev") - # Noble and later releases do not carry "python3-distutils" https://docs.python.org/3.10/whatsnew/3.10.html#distutils-deprecated - if [[ "$host_release" =~ ^(noble|wilma)$ ]]; then + # Noble/Trixie and later releases do not carry "python3-distutils" https://docs.python.org/3.10/whatsnew/3.10.html#distutils-deprecated + if [[ "$host_release" =~ ^(trixie|sid|noble|wilma)$ ]]; then display_alert "python3-distutils not available on host release '${host_release}'" "distutils was deprecated with Python 3.12" "debug" else host_dependencies+=("python3-distutils") From 8f51668615b324adf0034e03bf661f5f2d68cb59 Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Sat, 24 Aug 2024 00:21:43 +0200 Subject: [PATCH 12/15] linux-rockchip-rk3588-6.11.config: enable `CONFIG_INPUT_PWM_BEEPER=m` - mostly for the cm3588 nas; mainline kernel has a `compatible = "pwm-beeper";` buzzer impl on pwm8 - see https://github.com/torvalds/linux/blob/3d5f968a177d468cd13568ef901c5be84d83d32b/arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts#L63-L68 --- config/kernel/linux-rockchip-rk3588-6.11.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/kernel/linux-rockchip-rk3588-6.11.config b/config/kernel/linux-rockchip-rk3588-6.11.config index 8426a055b1c3..31d3372d74fa 100644 --- a/config/kernel/linux-rockchip-rk3588-6.11.config +++ b/config/kernel/linux-rockchip-rk3588-6.11.config @@ -4237,7 +4237,7 @@ CONFIG_INPUT_ATI_REMOTE2=m # CONFIG_INPUT_REGULATOR_HAPTIC is not set CONFIG_INPUT_UINPUT=m # CONFIG_INPUT_PCF8574 is not set -# CONFIG_INPUT_PWM_BEEPER is not set +CONFIG_INPUT_PWM_BEEPER=m # CONFIG_INPUT_PWM_VIBRA is not set CONFIG_INPUT_RK805_PWRKEY=m # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set From 881f0cae3887c0db217d0c38cf965b2b9c00462c Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Sat, 17 Aug 2024 20:51:51 +0200 Subject: [PATCH 13/15] desktop: amd64: drop nvidia-drivers forced ppa (focal stuff? no thanks) --- .../sources/apt/nvidia-drivers.gpg | Bin 6713 -> 0 bytes .../sources/apt/nvidia-drivers.source | 1 - 2 files changed, 1 deletion(-) delete mode 100644 config/optional/architectures/amd64/_config/desktop/common/environments/_all_environments/sources/apt/nvidia-drivers.gpg delete mode 100644 config/optional/architectures/amd64/_config/desktop/common/environments/_all_environments/sources/apt/nvidia-drivers.source diff --git a/config/optional/architectures/amd64/_config/desktop/common/environments/_all_environments/sources/apt/nvidia-drivers.gpg b/config/optional/architectures/amd64/_config/desktop/common/environments/_all_environments/sources/apt/nvidia-drivers.gpg deleted file mode 100644 index ddb652aff63c9a97ac9b351a93b5f9d1f46896cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6713 zcmajiRa6{GurA=i9R}AR!QCZTfDqh+J3)do8FYZ)?(XjH4#5d-!F6zVC)nLNckOld z+j;$8YIUuzy1Rb$D8g%us)AvFfDPX$JcY8>NJUy>6>hW;p%8K>DVvkI3Y zmlzkHBDvNY&k3=+M?IaERHu!}ozp_S+oZ~um&H!#joLBwGQzI_tenq;=c)BQI&wI6o) zfo)TX6V!s|`Qzd~rS)tLB7i5Lbi84(QC%%zP&Ih@t0jB3BD#jXTlhP>Ptjt{V}Vvs zfZ{2`PC-Jx<7{{jbK$BCmk)p8+f_)Ktj#a+4Akf|+}tgHoZIc6EZ~o3F>;)PObBk= z!M?Iw#11&jW7%(l#bf+U10rf5Q7!xg0`*1AGr5ffos)({Po&*&gV2XKexr;ghHwNb zwq7b_XT&f2nT1t3NQ4ufN7}eTh#oZ(U%nx*VnqxV9&K$JjA!4E!zmV7l?MB_bioUx zJ9(F1!!WvvaB~=!l1bMIWUf(N{lKreQIBDg^cNxKsFAe_@avxttNjU2{d#M=B5Wt4 zvY|^`NVlm1f>K~AkesITba82N}zu$gCWCQar(=;(OII{zKLHfy=xyV zDs*PPw_6_`2!jkjM1a+8M#%Zg142~II^(1dn?{E8rlm(pm8&^EOa}5=JK^L#Tv&S~ z9fEX~2-s7~_0zzccP~>93@*N7UJb<#0;Te*25BZZ+vf&DfEX1qmcj;TVc|5*Y(Z+7 zYw0rxCmocdB>{EBv&+c_D%tGm7l77cHZXHCU&Z?yyhxPyTN$0iLXprt{d2-(3#GiA z+WRmOXTsZ!*QD5vlffz2COzBv4a2pBm&`@^)?GUVk;=wk1za-E@c|Tj1R?4??y2wQ zGVUrlC^rcQ(|(uU5s95T^=O#!XLUXzO=z$AEg)$JI68}4nqA>!VLG(TnWUJf9}Lhl z`t7A*H3jbM!g%+~?5L&MUwtwIpQ?+uU&lbgSp0nVH9Q4zn*P zghe$dO3LEVOIYW^6c>LiPg>&}#9yd)E!|C=s>0~&qIJZQ9iEhxL~;;_H8h$hPft@% zph4#XH0N25`8`XmIf z1%?EQriy_Y!ZxftU^=u)4nUkMn6uFp3=Fhv*4n_KJ^3$ocX#Hib~8gGTAx1 zkUEj4ZC-ZHB@R9feL$<4%?m8>s8l7KO2k?+)lSee5&-hk*JI;BGZv%C_g!#s1R2+T zRj)Tl$^ks_!V6btanqiT&%P;RAkJliscx5dM%$G=E3OMfb!^g;1#8Fs>hW*G{3%m- zcsj|FBF#lxI{`PIc$=p+N#dVQB5ai-9~Jo42{Dok^=O_}k5JG6#`h$>J&ylO4=Ugt z0Tuk@y0-1qlDxD#k#7{!SAvw^B5{KM4At_WY zRi_GhxnT610d&wLLH8Evk5h5{_Kpu(rJ|pi_CJb0LiAXW!DD4AJ2*(M{%M&K)W_Ya z^8?}n($$M`0CQyQ&AG95j z9m#WnFEEHX+Z^05A@CY>D%SeU)ONvd=t3BgHfZ;0p-Q5dwna^Hj(ww|3#`)aIJQdf zlcoDu5(-n{<)t&n@D}SIE%-U{7Nh``89dt+MDQXL@cAH-HstRe{ihzmsW^{iv^*oB zI>U(!iM03$b9s_iacd0-Msl2%&Y5|Zr@?H@b<6eW z$Z$P-z8IA(QLbdycO?$jzGh+90gW~8rSQVNV*gchPX**ogv6I;)KqNW49|$zInpux zRrCA&ubO|8@e!;y{b$L@(h9F+eqhPjz6b>Y9tJ?ArLOae=JL4EiPc~1x*vHrE>Ac0 zJ*vXcNSqFn+7N@Dg{5Nulh-4waFb5>eOMPPAeq%XN;raWgf}Wy3A1t}-i^r{u`iYa zJLx2naRc?2;nw>Q6-Moq0sG$mO5}0B`b?WsMe88p5~y71JJ4brf^UVqtqDcM*Khrh zg4fluLyu*YbmfSYpE{^3^NVyc2J-A4)51=MYqGq7nX-Q6FzhI=0bS_j*P3A$_uaR3 zdQjzs@n#V&ZNi@DVcZx>lG?uIR4v+`@yGh)sqq^X^i#v;jD|kD~ z)stIEMAn9qyhocP@P%9ULAfGvK$-2-L8y@4By2l|%c)*?} z@nA@BCZIgz*XShYt{r^N*U-5^SzH-sZt_#M)ISl9)as}tGx6_bsSWBmKo-B~CReLO z=i&SheJ1F&lnUTR9HE}9o-=63{F;DovI4v_wU+bK+Mzsld(T8T8}y{a-x zJ+Y_Rf7Q_SZkfew_NJz(2+|tW9?KP2hzI{wvwr$l&A$mj5Z0S!^Q40dDJz|ud@>>+ z9~>MiuQtu?t8q_QO^S5wy|0MrWrSm0w2e&E#XBiV`q=vD0j(E zU$mAe4*M*dg^U5{t%6Ha(B%5ui~rEFkhjta{Y`tz9!nB+DfVs?f=wI(&Dw(#DI7Ci zDncF%q2? zI-N3x9T|L3IX$><>(oZ zj@*2+BM2?`)D0~XS=gQaw(iAg6ib=J{y`vS$+DivccC8Cnw+D^Y5vARZSiB`!%8#M>n-yJ?2Vum-sb{#cmX{~KI!HqVb zg=QK;QuEp|H5Sm`-uOz-y)mUijSH@8mE$D&5pR0uF7X@@{e(0L_?7tsa`o7LDf_~^ zQbX0u)~xYmSU|he(B}Q%p^vdQ-xSvB>~&r}%Z+=T;epu5|MNiM_cX;dulujFZT&ooV`k*!E?Z<$)=b9KRLFi3I~lM1rJlIXC}Q^Q^g%2rI%wBbi5!bGphY z-OMDvDgoyGcScrd91k|kF@M0F9%XEMEnglh8@K;++%<*czjgmj4tlVjQEvO6A3HS3 zpstW^S&s2YQ=}v&F^@vvDMCmaR`!6S4|$CM-1M?R*-0@~RWEm9>X(L41GEt~_|yxX zs@7UV`9su+%^h{JsQFxj$84wV(F`jNBqb5T>n3(4nH}kz)xq8>ojYt<4@~OMv#}wp zTXQ--SKr~YMBn@Vyh<>gV7P0SCGw&$?c=J}SwAHn?OY3ZVUiT5US`0_O%)?+;T`j9 zzG%tfi;y{K!+cmNB#8b+Et?&?T2eh;q^M?c=Ztd>7N8#L@xNoq?v6#+E!Uk$+>Y9% z1U|%UQ}{e9HbOjp$71D;Kii{B3G+CnQ<-W#V2!R!yg;tufAMNP`kymdlfh#1MUL_zD679?rf;v?E+Inn~*~ zmEi4WYYgRL4=}(?a^Vre$pRM(RLf852VhC4i?FE3KG2B={{K%t?EmaQ(24hdd8F(R zLfyvQ%b3N0fN*!a8v9-oK?a``=1L%Ft>=g6yql24U3XW)VJcIZff~fdKKpXZ>djVP z_U>!)c-{}LhGiS(&$d+Kwz(Jir;9ZpURA{YKChf|#`eavbsqQuWe^WPd{v6ta7Ndx z$viVB`n-VZENs3JsrUnh=J}?8oZn;8*i47}HpkY1#8l`i1v&~t=fj&^FI}_*+@T#~ z7h*{Ro$2KRXdbW+XFjtLY5J-Bqk~=F1y{BrWJBx%)`o97-(G`vusHEO8ERV+Y-Zso z3oJ_yS+x**dI%J|3zoy+Yb-R0tvQgIwYCHazv&gyqZslOwIOV!^ z)Yiv@oKSedZ(8;dWJf;x!8gJNzhJJ;+=XUfCt58*1fBsW9AjcHxE zW(OW`HSbi!)D&mRbo9*ERvnkTcN}aV!fU>#{j<1gDPGnS)Z_e+PAU3$ij%FN@9Tg% zs;F&CUl!oume3~{yAhJRBvAHh!Yy;^&pEY;fxx|+ZA8}f7D@2Jp55y@k`Wxxj2zLp ze<#h0fbAy_hXm#}WGFL5(H2C+5tXT!cDdyzjzJh1)<(nWxuC}ntmPi@JCjqrYacPhEf7Xb#`*Rk!e3<^^>7lSp*wR~C z-2g2;%S#0uL9h7eO*MT>;<IuLA6xMW*&S4K`tWFrPU0 zq8_e_2D&ga2H3c>6}Jl?mNvEg@!9JZQ{f02e?X$btou68(d3$$HdlM?Nwj)dbngyl zTcXzlyQ`$RU2X3TzWIhhcrZ~Z6;hDX=$Yy9)L7UksB8K`_0>J6vqH(GdjbAK5L%^6 z@cLPNw(8*on~?C6+hDfxDs!B%WI0}btR=oJap`mPiIfG|oXRS$9D@6;(My0Y&KW#TbCJjD@phd;T4+1bMTVhLx!C=3>VUn@6hQqr_DmBAgPS79mB8a!vZ>dIyt0Vs3d6}``de%fqb7} z9}6?I6QpA$OY*H}jN_DvsHGn;q3>P5=&*(JD(+b5=Bx-`HG4y-F`^C{RYaCS5qeZK z*&X~Nhy?!43t~Q%PMA>J&z~|XGzZ?`Y@B|$f)SS>%1`T(0B7Rf4BQmk zpFL?ZkiSIU)wo<{(^$Cl^?sm}XSUP>L&LiUKa2&Qddg|3Ba+v(#WH>`wt7ygWZJ;0 zU31Hob=^KZ54tGP(b9mo$gg;fj5o(iH8$xUS<19kB9^^2UA1mqHilz1te0yRm z|5f&R=2e&i??QZ6$}?mq;k@GHD<_p)AEQzfOvUSGbYoi$r{BgwJdPw3*~~;(9R=O? zwa*B_2Vc?K7boxkRP(@)g~&_XKZ!kSO?-_O4-34kaQ{N!FW@;KlxA*m)3;qDjqK*? zSHfcag}o7~;CXh&hXh*-l}fB%`b^}k{^R78y}0M~iEXj9^tSn@^aj&<;GYEG90xM( zdwxaTaDo4-IpPm@P6J$ODDZVZj=h*5ULRcN{-friHT$ocf0GtRtT!(v^Am|E%mMUe zlrmBAd#a!i$(vlMV@PsHkkT9L%Xvvv`>~kz6GbQ%@KociI>k67FLp5@H&vs!!5>`` zhj!cv9d9sz8`{13MzhR54?Q%*TnlgG&2;Dm^GQZJE9bl->YaD&cyr1)!588YR$~gH zDK)@|6D7Q+x0QQ*?O8Y&f+C7@4Nk6%*bQvg1t%>KqUbdc-b+A1z~YS5sTVEa+!ybB=jMKL2*>e9Y)Z!v{E5Yk9l_5=tydU^#2Bh+(zS6UD!Z~WO=3fj zO@i+wKD|Rm4S^sR@2Ckdb-@ Date: Thu, 29 Aug 2024 12:06:30 +0200 Subject: [PATCH 14/15] thinkpad-x13s: bump to jhovold's wip/sc8280xp-6.11-rc5; userspace fixes - replace mantic support with oracular - add mtools pkg, remove UEFI_MOUNT_POINT_SKIP_FSTAB (thanks to the wdk2023 maintainer for the tip) - re-enable fprintd/limpam-fprintd pkg install across all releases (Trixie fixed it recently) - do no alsa-ucm-conf hacks for Trixie, as 1.2.12 landed there - cleanup commented out stuff from years ago - update .config (no changes except BTF enablement) --- config/boards/thinkpad-x13s.wip | 39 ++--- config/kernel/linux-arm64-sc8280xp.config | 188 ++++++++++++++++++---- 2 files changed, 170 insertions(+), 57 deletions(-) diff --git a/config/boards/thinkpad-x13s.wip b/config/boards/thinkpad-x13s.wip index 130a33678deb..439d03fbc707 100644 --- a/config/boards/thinkpad-x13s.wip +++ b/config/boards/thinkpad-x13s.wip @@ -21,22 +21,23 @@ declare -g BOOT_LOGO=desktop # This board boots via EFI/Grub, but requires a DTB to be passed, from Grub, to the Kernel. declare -g GRUB_CMDLINE_LINUX_DEFAULT="clk_ignore_unused pd_ignore_unused arm64.nopauth efi=noruntime" # iommu.passthrough=0 iommu.strict=0 pcie_aspm.policy=powersupersave declare -g BOOT_FDT_FILE="qcom/sc8280xp-lenovo-thinkpad-x13s.dtb" -declare -g UEFI_MOUNT_POINT_SKIP_FSTAB="yes" # If we leave the /boot/efi in fstab, systemd hangs waiting for it. @TODO why? -enable_extension "grub-with-dtb" # important, puts the whole DTB handling in place. +# declare -g UEFI_MOUNT_POINT_SKIP_FSTAB="yes" # If we leave the /boot/efi in fstab, systemd hangs waiting for it; FIXED: by adding mtools pkg + +enable_extension "grub-with-dtb" # important, puts the whole DTB handling in place. # Use the full firmware, complete linux-firmware plus Armbian's declare -g BOARD_FIRMWARE_INSTALL="-full" function post_family_config_branch_sc8280xp__jhovolds_69y_kernel() { - declare -g KERNEL_MAJOR_MINOR="6.10" # Major and minor versions of this kernel. - declare -g KERNELBRANCH='branch:wip/sc8280xp-6.10' + declare -g KERNEL_MAJOR_MINOR="6.11" # Major and minor versions of this kernel. + declare -g KERNELBRANCH='branch:wip/sc8280xp-6.11-rc5' declare -g KERNELSOURCE='https://github.com/jhovold/linux.git' declare -g LINUXCONFIG="linux-${ARCH}-${BRANCH}" # for this board: linux-arm64-sc8280xp display_alert "Set up jhovold's kernel ${KERNELBRANCH} for" "${BOARD}" "info" } function x13s_is_userspace_supported() { - [[ "${RELEASE}" == "trixie" || "${RELEASE}" == "sid" || "${RELEASE}" == "mantic" || "${RELEASE}" == "noble" ]] && return 0 + [[ "${RELEASE}" == "trixie" || "${RELEASE}" == "sid" || "${RELEASE}" == "noble" || "${RELEASE}" == "oracular" ]] && return 0 return 1 } @@ -56,13 +57,9 @@ function post_family_config__debian_now_has_userspace_for_the_x13s() { add_packages_to_image "alsa-ucm-conf" # for audio; see https://packages.ubuntu.com/alsa-ucm-conf and https://packages.debian.org/alsa-ucm-conf - we need 1.2.10 + patches, see below add_packages_to_image "acpi" # general ACPI support add_packages_to_image "zstd" # for zstd compression of initrd - - ## Trixie, as of 2023-10-13, is missing fprintd and libpam-fprintd; see https://tracker.debian.org/pkg/fprintd and https://tracker.debian.org/pkg/libpam-fprintd - ## rpardini: checked on 2024-07-07 and they're back! - #if [[ "${RELEASE}" != "trixie" ]]; then - # add_packages_to_image "fprintd" # for fingerprint reader; see https://packages.ubuntu.com/fprintd and https://packages.debian.org/fprintd - # add_packages_to_image "libpam-fprintd" # for fingerprint reader PAM support; see https://packages.ubuntu.com/libpam-fprintd and https://packages.debian.org/libpam-fprintd - #fi + add_packages_to_image "mtools" # for access to the EFI partition + add_packages_to_image "fprintd" # for fingerprint reader; see https://packages.ubuntu.com/fprintd and https://packages.debian.org/fprintd + add_packages_to_image "libpam-fprintd" # for fingerprint reader PAM support; see https://packages.ubuntu.com/libpam-fprintd and https://packages.debian.org/libpam-fprintd # Also needed, not listed here: # - mesa > 23.1.5; see https://packages.ubuntu.com/mesa-vulkan-drivers and https://packages.debian.org/mesa-vulkan-drivers @@ -80,9 +77,15 @@ function pre_customize_image__x13s_debian_ucm_hack_via_patch() { return 0 fi + # No longer needed for Trixie, as of 2024-08-29, Trixie already has 1.2.12 which is higher than the 1.2.11 needed. + if [[ "${RELEASE}" == "trixie" ]]; then + display_alert "No alsa-ucm-conf hacks needed for ${BOARD}" "${RELEASE} already has the necessary alsa-ucm-conf" "info" + return 0 + fi + display_alert "Fixing alsa-ucm-conf for ${BOARD}" "${RELEASE}///${BOARD}" "warn" ( - cd "${SDCARD}/usr/share/alsa" + cd "${SDCARD}/usr/share/alsa" || exit 6 curl -L "https://github.com/alsa-project/alsa-ucm-conf/archive/refs/heads/master.tar.gz" | tar xvzf - --strip-components=1 ) @@ -113,16 +116,6 @@ function post_family_tweaks_bsp__thinkpad_x13s_bsp_always_start_pdmapper() { EOD } -# Disabled, see https://github.com/jhovold/linux/wiki/X13s#touchscreen -# function post_family_tweaks_bsp__thinkpad_x13s_bsp_touchscreen_udev_unbind_i2c_hid_hack() { -# ## Hack in udev so touchscreen can work - from https://github.com/ironrobin/x13s-alarm/tree/trunk/x13s-touchscreen-udev -# display_alert "Adding to bsp-cli" "${BOARD}: udev for touchscreen bind" "info" -# add_file_from_stdin_to_bsp_destination "/usr/lib/udev/rules.d/72-x13s-touchscreen.rules" <<- 'EOD' -# ACTION=="add" \ -# , RUN+="/bin/bash -c 'echo 4-0010 > /sys/bus/i2c/drivers/i2c_hid_of/bind'" -# EOD -# } - ## ## Include certain firmware in the initrd ## diff --git a/config/kernel/linux-arm64-sc8280xp.config b/config/kernel/linux-arm64-sc8280xp.config index 5c8f7b6c7c0b..78fe543c0135 100644 --- a/config/kernel/linux-arm64-sc8280xp.config +++ b/config/kernel/linux-arm64-sc8280xp.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.9.0-rc6 Kernel Configuration +# Linux/arm64 6.11.0-rc5 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0" CONFIG_CC_IS_GCC=y @@ -13,9 +13,7 @@ CONFIG_LD_VERSION=23800 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y -CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y -CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y -CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y +CONFIG_GCC_ASM_GOTO_OUTPUT_BROKEN=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y CONFIG_PAHOLE_VERSION=125 @@ -120,7 +118,7 @@ CONFIG_TICK_CPU_ACCOUNTING=y # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set CONFIG_IRQ_TIME_ACCOUNTING=y CONFIG_HAVE_SCHED_AVG_IRQ=y -CONFIG_SCHED_THERMAL_PRESSURE=y +CONFIG_SCHED_HW_PRESSURE=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT_V3=y CONFIG_TASKSTATS=y @@ -141,6 +139,7 @@ CONFIG_PREEMPT_RCU=y # CONFIG_RCU_EXPERT is not set CONFIG_TREE_SRCU=y CONFIG_TASKS_RCU_GENERIC=y +CONFIG_NEED_TASKS_RCU=y CONFIG_TASKS_RCU=y CONFIG_TASKS_TRACE_RCU=y CONFIG_RCU_STALL_COMMON=y @@ -172,11 +171,12 @@ CONFIG_CC_NO_STRINGOP_OVERFLOW=y CONFIG_ARCH_SUPPORTS_INT128=y CONFIG_NUMA_BALANCING=y CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y +CONFIG_SLAB_OBJ_EXT=y CONFIG_CGROUPS=y CONFIG_PAGE_COUNTER=y # CONFIG_CGROUP_FAVOR_DYNMODS is not set CONFIG_MEMCG=y -CONFIG_MEMCG_KMEM=y +# CONFIG_MEMCG_V1 is not set CONFIG_BLK_CGROUP=y CONFIG_CGROUP_WRITEBACK=y CONFIG_CGROUP_SCHED=y @@ -235,7 +235,7 @@ CONFIG_POSIX_TIMERS=y CONFIG_PRINTK=y CONFIG_BUG=y CONFIG_ELF_CORE=y -CONFIG_BASE_FULL=y +# CONFIG_BASE_SMALL is not set CONFIG_FUTEX=y CONFIG_FUTEX_PI=y CONFIG_EPOLL=y @@ -255,7 +255,6 @@ CONFIG_CACHESTAT_SYSCALL=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_SELFTEST is not set CONFIG_KALLSYMS_ALL=y -CONFIG_KALLSYMS_BASE_RELATIVE=y CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y CONFIG_HAVE_PERF_EVENTS=y CONFIG_GUEST_PERF_EVENTS=y @@ -312,6 +311,7 @@ CONFIG_BUILTIN_RETURN_ADDRESS_STRIPS_PAC=y # Platform selection # # CONFIG_ARCH_ACTIONS is not set +# CONFIG_ARCH_AIROHA is not set CONFIG_ARCH_SUNXI=y # CONFIG_ARCH_ALPINE is not set # CONFIG_ARCH_APPLE is not set @@ -393,6 +393,7 @@ CONFIG_ARM64_ERRATUM_2645198=y CONFIG_ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD=y CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_ERRATUM_3117295=y +CONFIG_ARM64_ERRATUM_3194386=y CONFIG_CAVIUM_ERRATUM_22375=y CONFIG_CAVIUM_ERRATUM_23144=y CONFIG_CAVIUM_ERRATUM_23154=y @@ -537,6 +538,7 @@ CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y CONFIG_CMDLINE="" CONFIG_EFI_STUB=y CONFIG_EFI=y +# CONFIG_COMPRESSED_INSTALL is not set CONFIG_DMI=y # end of Boot options @@ -659,6 +661,7 @@ CONFIG_ACPI_MCFG=y CONFIG_ACPI_CPPC_LIB=y CONFIG_ACPI_PROCESSOR=y CONFIG_ACPI_IPMI=m +CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_THERMAL=y CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y CONFIG_ACPI_TABLE_UPGRADE=y @@ -787,6 +790,7 @@ CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y CONFIG_ARCH_WANT_PMD_MKWRITE=y CONFIG_HAVE_MOD_ARCH_SPECIFIC=y CONFIG_MODULES_USE_ELF_RELA=y +CONFIG_ARCH_WANTS_EXECMEM_LATE=y CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK=y CONFIG_SOFTIRQ_ON_OWN_STACK=y CONFIG_ARCH_HAS_ELF_RANDOMIZE=y @@ -825,6 +829,7 @@ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_ARCH_SUPPORTS_PAGE_TABLE_CHECK=y CONFIG_ARCH_HAVE_TRACE_MMIO_ACCESS=y CONFIG_ARCH_HAS_HW_PTE_YOUNG=y +CONFIG_ARCH_HAS_KERNEL_FPU_SUPPORT=y # # GCOV-based kernel profiling @@ -839,7 +844,6 @@ CONFIG_FUNCTION_ALIGNMENT=4 # end of General architecture-dependent options CONFIG_RT_MUTEXES=y -CONFIG_BASE_SMALL=0 CONFIG_MODULES=y # CONFIG_MODULE_DEBUG is not set CONFIG_MODULE_FORCE_LOAD=y @@ -865,11 +869,9 @@ CONFIG_BLK_CGROUP_PUNT_BIO=y CONFIG_BLK_DEV_BSG_COMMON=y CONFIG_BLK_DEV_BSGLIB=y CONFIG_BLK_DEV_INTEGRITY=y -CONFIG_BLK_DEV_INTEGRITY_T10=y CONFIG_BLK_DEV_WRITE_MOUNTED=y CONFIG_BLK_DEV_ZONED=y CONFIG_BLK_DEV_THROTTLING=y -# CONFIG_BLK_DEV_THROTTLING_LOW is not set CONFIG_BLK_WBT=y CONFIG_BLK_WBT_MQ=y # CONFIG_BLK_CGROUP_IOLATENCY is not set @@ -877,7 +879,6 @@ CONFIG_BLK_WBT_MQ=y # CONFIG_BLK_CGROUP_IOCOST is not set # CONFIG_BLK_CGROUP_IOPRIO is not set CONFIG_BLK_DEBUG_FS=y -CONFIG_BLK_DEBUG_FS_ZONED=y CONFIG_BLK_SED_OPAL=y # CONFIG_BLK_INLINE_ENCRYPTION is not set @@ -973,6 +974,7 @@ CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y CONFIG_ZSWAP_ZPOOL_DEFAULT="zbud" CONFIG_ZBUD=y CONFIG_Z3FOLD=m +CONFIG_HAVE_ZSMALLOC=y CONFIG_ZSMALLOC=m # CONFIG_ZSMALLOC_STAT is not set CONFIG_ZSMALLOC_CHAIN_SIZE=8 @@ -985,6 +987,7 @@ CONFIG_SLUB=y CONFIG_SLAB_MERGE_DEFAULT=y CONFIG_SLAB_FREELIST_RANDOM=y CONFIG_SLAB_FREELIST_HARDENED=y +CONFIG_SLAB_BUCKETS=y # CONFIG_SLUB_STATS is not set CONFIG_SLUB_CPU_PARTIAL=y # CONFIG_RANDOM_KMALLOC_CACHES is not set @@ -996,7 +999,7 @@ CONFIG_SPARSEMEM=y CONFIG_SPARSEMEM_EXTREME=y CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y CONFIG_SPARSEMEM_VMEMMAP=y -CONFIG_HAVE_FAST_GUP=y +CONFIG_HAVE_GUP_FAST=y CONFIG_ARCH_KEEP_MEMBLOCK=y CONFIG_NUMA_KEEP_MEMINFO=y CONFIG_MEMORY_ISOLATION=y @@ -1032,6 +1035,7 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y # CONFIG_TRANSPARENT_HUGEPAGE_NEVER is not set CONFIG_THP_SWAP=y # CONFIG_READ_ONLY_THP_FOR_FS is not set +CONFIG_PGTABLE_HAS_HUGE_LEAVES=y CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y CONFIG_USE_PERCPU_NUMA_NODE_ID=y @@ -1061,12 +1065,15 @@ CONFIG_ARCH_HAS_PTE_SPECIAL=y CONFIG_MEMFD_CREATE=y CONFIG_SECRETMEM=y # CONFIG_ANON_VMA_NAME is not set +CONFIG_HAVE_ARCH_USERFAULTFD_WP=y CONFIG_HAVE_ARCH_USERFAULTFD_MINOR=y CONFIG_USERFAULTFD=y +CONFIG_PTE_MARKER_UFFD_WP=y # CONFIG_LRU_GEN is not set CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y CONFIG_PER_VMA_LOCK=y CONFIG_LOCK_MM_AND_FIND_VMA=y +CONFIG_EXECMEM=y # # Data Access Monitoring @@ -1107,6 +1114,7 @@ CONFIG_NET_KEY=m CONFIG_NET_KEY_MIGRATE=y CONFIG_SMC=m CONFIG_SMC_DIAG=m +# CONFIG_SMC_LO is not set CONFIG_XDP_SOCKETS=y # CONFIG_XDP_SOCKETS_DIAG is not set CONFIG_NET_HANDSHAKE=y @@ -1642,6 +1650,7 @@ CONFIG_NET_DSA_TAG_OCELOT_8021Q=m # CONFIG_NET_DSA_TAG_LAN9303 is not set # CONFIG_NET_DSA_TAG_SJA1105 is not set CONFIG_NET_DSA_TAG_TRAILER=m +# CONFIG_NET_DSA_TAG_VSC73XX_8021Q is not set # CONFIG_NET_DSA_TAG_XRS700X is not set CONFIG_VLAN_8021Q=m CONFIG_VLAN_8021Q_GVRP=y @@ -1900,6 +1909,7 @@ CONFIG_BT_MTKUART=m CONFIG_BT_QCOMSMD=m # CONFIG_BT_VIRTIO is not set # CONFIG_BT_NXPUART is not set +# CONFIG_BT_INTEL_PCIE is not set # end of Bluetooth device drivers CONFIG_AF_RXRPC=m @@ -2048,7 +2058,6 @@ CONFIG_PCI_HOST_THUNDER_ECAM=y CONFIG_PCI_HOST_COMMON=y CONFIG_PCI_HOST_GENERIC=y # CONFIG_PCIE_HISI_ERR is not set -# CONFIG_PCIE_MICROCHIP_HOST is not set CONFIG_PCI_TEGRA=y CONFIG_PCIE_ROCKCHIP=y CONFIG_PCIE_ROCKCHIP_HOST=y @@ -2086,6 +2095,12 @@ CONFIG_PCIE_QCOM=m # # CONFIG_PCIE_MOBIVEIL_PLAT is not set # end of Mobiveil-based PCIe controllers + +# +# PLDA-based PCIe controllers +# +# CONFIG_PCIE_MICROCHIP_HOST is not set +# end of PLDA-based PCIe controllers # end of PCI controller drivers # @@ -2100,6 +2115,9 @@ CONFIG_PCIE_QCOM=m # CONFIG_PCI_SW_SWITCHTEC is not set # end of PCI switch controller drivers +CONFIG_HAVE_PWRCTL=y +CONFIG_PCI_PWRCTL=m +CONFIG_PCI_PWRCTL_PWRSEQ=m # CONFIG_CXL_BUS is not set # CONFIG_PCCARD is not set # CONFIG_RAPIDIO is not set @@ -2254,6 +2272,9 @@ CONFIG_ARM_PSCI_FW=y # Qualcomm firmware drivers # CONFIG_QCOM_SCM=y +CONFIG_QCOM_TZMEM=y +CONFIG_QCOM_TZMEM_MODE_GENERIC=y +# CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE is not set # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set CONFIG_QCOM_QSEECOM=y CONFIG_QCOM_QSEECOM_UEFISECAPP=y @@ -2469,6 +2490,7 @@ CONFIG_NVME_TCP=m # CONFIG_NVME_TCP_TLS is not set # CONFIG_NVME_HOST_AUTH is not set CONFIG_NVME_TARGET=m +# CONFIG_NVME_TARGET_DEBUGFS is not set # CONFIG_NVME_TARGET_PASSTHRU is not set CONFIG_NVME_TARGET_LOOP=m CONFIG_NVME_TARGET_RDMA=m @@ -2514,6 +2536,7 @@ CONFIG_MISC_RTSX=m # CONFIG_OPEN_DICE is not set # CONFIG_VCPU_STALL_DETECTOR is not set # CONFIG_NSM is not set +# CONFIG_MARVELL_CN10K_DPI is not set CONFIG_C2PORT=m # @@ -2550,6 +2573,7 @@ CONFIG_MISC_RTSX_USB=m # CONFIG_UACCE is not set # CONFIG_PVPANIC is not set # CONFIG_GP_PCI1XXXX is not set +# CONFIG_KEBA_CP500 is not set # end of Misc devices # @@ -2804,6 +2828,7 @@ CONFIG_VXLAN=m CONFIG_GENEVE=m # CONFIG_BAREUDP is not set CONFIG_GTP=m +# CONFIG_PFCP is not set # CONFIG_AMT is not set CONFIG_MACSEC=m CONFIG_NETCONSOLE=m @@ -2870,7 +2895,6 @@ CONFIG_DEFXX=m CONFIG_SKFP=m # CONFIG_HIPPI is not set # CONFIG_QCOM_IPA is not set -# CONFIG_NET_SB1000 is not set CONFIG_PHYLINK=m CONFIG_PHYLIB=m CONFIG_SWPHY=y @@ -2882,6 +2906,7 @@ CONFIG_SFP=m # # MII PHY device drivers # +# CONFIG_AIR_EN8811H_PHY is not set CONFIG_AMD_PHY=m CONFIG_MESON_GXL_PHY=m # CONFIG_ADIN_PHY is not set @@ -2968,7 +2993,6 @@ CONFIG_CAN_KVASER_PCI=m CONFIG_CAN_PEAK_PCI=m CONFIG_CAN_PEAK_PCIEC=y CONFIG_CAN_PLX_PCI=m -CONFIG_CAN_SJA1000_ISA=m # CONFIG_CAN_SJA1000_PLATFORM is not set CONFIG_CAN_SOFTING=m @@ -3029,6 +3053,7 @@ CONFIG_MDIO_BUS_MUX_MMIOREG=m # # PCS device drivers # +# CONFIG_PCS_XPCS is not set # end of PCS device drivers # CONFIG_PLIP is not set @@ -3144,6 +3169,7 @@ CONFIG_ATH10K_USB=m CONFIG_ATH10K_SNOC=m # CONFIG_ATH10K_DEBUG is not set # CONFIG_ATH10K_DEBUGFS is not set +CONFIG_ATH10K_LEDS=y CONFIG_WCN36XX=m # CONFIG_WCN36XX_DEBUGFS is not set CONFIG_ATH11K=m @@ -3626,6 +3652,7 @@ CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=m CONFIG_DEVMEM=y # CONFIG_DEVPORT is not set CONFIG_TCG_TPM=m +# CONFIG_TCG_TPM2_HMAC is not set CONFIG_HW_RANDOM_TPM=y CONFIG_TCG_TIS_CORE=m # CONFIG_TCG_TIS is not set @@ -3703,6 +3730,7 @@ CONFIG_I2C_ISCH=m # CONFIG_I2C_SIS96X is not set # CONFIG_I2C_VIA is not set # CONFIG_I2C_VIAPRO is not set +# CONFIG_I2C_ZHAOXIN is not set # # ACPI drivers @@ -3789,6 +3817,7 @@ CONFIG_SPI_BUTTERFLY=m # CONFIG_SPI_CADENCE is not set # CONFIG_SPI_CADENCE_QUADSPI is not set # CONFIG_SPI_CADENCE_XSPI is not set +# CONFIG_SPI_CH341 is not set # CONFIG_SPI_DESIGNWARE is not set # CONFIG_SPI_HISI_KUNPENG is not set # CONFIG_SPI_HISI_SFC_V3XX is not set @@ -3803,7 +3832,6 @@ CONFIG_SPI_MESON_SPIFC=m # CONFIG_SPI_ORION is not set # CONFIG_SPI_PCI1XXXX is not set # CONFIG_SPI_PL022 is not set -# CONFIG_SPI_PXA2XX is not set CONFIG_SPI_ROCKCHIP=m # CONFIG_SPI_ROCKCHIP_SFC is not set # CONFIG_SPI_QCOM_QSPI is not set @@ -3892,10 +3920,12 @@ CONFIG_PINCTRL_MAX77620=y # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set # CONFIG_PINCTRL_OCELOT is not set CONFIG_PINCTRL_ROCKCHIP=y +# CONFIG_PINCTRL_SCMI is not set CONFIG_PINCTRL_SINGLE=y # CONFIG_PINCTRL_STMFX is not set # CONFIG_PINCTRL_SX150X is not set CONFIG_PINCTRL_ZYNQMP=y +# CONFIG_PINCTRL_IMX_SCMI is not set CONFIG_PINCTRL_MESON=y CONFIG_PINCTRL_MESON_GXBB=y CONFIG_PINCTRL_MESON_GXL=y @@ -3955,6 +3985,7 @@ CONFIG_PINCTRL_QCOM_SPMI_PMIC=y CONFIG_PINCTRL_QCOM_SSBI_PMIC=y CONFIG_PINCTRL_LPASS_LPI=m CONFIG_PINCTRL_SC7280_LPASS_LPI=m +# CONFIG_PINCTRL_SM4250_LPASS_LPI is not set # CONFIG_PINCTRL_SM6115_LPASS_LPI is not set CONFIG_PINCTRL_SM8250_LPASS_LPI=m # CONFIG_PINCTRL_SM8350_LPASS_LPI is not set @@ -4100,6 +4131,13 @@ CONFIG_GPIO_VIPERBOARD=m # CONFIG_GPIO_SIM is not set # end of Virtual GPIO drivers +# +# GPIO Debugging utilities +# +# CONFIG_GPIO_SLOPPY_LOGIC_ANALYZER is not set +# CONFIG_GPIO_VIRTUSER is not set +# end of GPIO Debugging utilities + CONFIG_W1=m CONFIG_W1_CON=y @@ -4157,6 +4195,8 @@ CONFIG_POWER_RESET_SYSCON_POWEROFF=y CONFIG_REBOOT_MODE=y CONFIG_SYSCON_REBOOT_MODE=y # CONFIG_NVMEM_REBOOT_MODE is not set +CONFIG_POWER_SEQUENCING=m +CONFIG_POWER_SEQUENCING_QCOM_WCN=m CONFIG_POWER_SUPPLY=y # CONFIG_POWER_SUPPLY_DEBUG is not set CONFIG_POWER_SUPPLY_HWMON=y @@ -4182,6 +4222,7 @@ CONFIG_BATTERY_AXP20X=m CONFIG_AXP20X_POWER=m # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_BATTERY_MAX1720X is not set # CONFIG_BATTERY_MAX1721X is not set # CONFIG_CHARGER_ISP1704 is not set # CONFIG_CHARGER_MAX8903 is not set @@ -4212,6 +4253,7 @@ CONFIG_CHARGER_QCOM_SMBB=m # CONFIG_CHARGER_RT9471 is not set CONFIG_CHARGER_CROS_USBPD=m CONFIG_CHARGER_CROS_PCHG=m +CONFIG_CHARGER_CROS_CONTROL=m # CONFIG_CHARGER_UCS1002 is not set # CONFIG_CHARGER_BD99954 is not set # CONFIG_BATTERY_UG3105 is not set @@ -4251,6 +4293,7 @@ CONFIG_SENSORS_ATXP1=m # CONFIG_SENSORS_CHIPCAP2 is not set # CONFIG_SENSORS_CORSAIR_CPRO is not set # CONFIG_SENSORS_CORSAIR_PSU is not set +CONFIG_SENSORS_CROS_EC=m CONFIG_SENSORS_DRIVETEMP=m CONFIG_SENSORS_DS620=m # CONFIG_SENSORS_DS1621 is not set @@ -4372,6 +4415,7 @@ CONFIG_SENSORS_AMC6821=m # CONFIG_SENSORS_INA2XX is not set # CONFIG_SENSORS_INA238 is not set # CONFIG_SENSORS_INA3221 is not set +# CONFIG_SENSORS_SPD5118 is not set # CONFIG_SENSORS_TC74 is not set CONFIG_SENSORS_THMC50=m CONFIG_SENSORS_TMP102=m @@ -4574,6 +4618,7 @@ CONFIG_LPC_SCH=m # CONFIG_MFD_88PM800 is not set # CONFIG_MFD_88PM805 is not set # CONFIG_MFD_88PM860X is not set +# CONFIG_MFD_88PM886_PMIC is not set # CONFIG_MFD_MAX14577 is not set # CONFIG_MFD_MAX77541 is not set CONFIG_MFD_MAX77620=y @@ -4654,11 +4699,14 @@ CONFIG_MFD_SYSCON=y # CONFIG_MFD_ROHM_BD718XX is not set # CONFIG_MFD_ROHM_BD71828 is not set # CONFIG_MFD_ROHM_BD957XMUF is not set +# CONFIG_MFD_ROHM_BD96801 is not set # CONFIG_MFD_STPMIC1 is not set # CONFIG_MFD_STMFX is not set # CONFIG_MFD_ATC260X_I2C is not set # CONFIG_MFD_KHADAS_MCU is not set CONFIG_MFD_QCOM_PM8008=m +# CONFIG_MFD_CS40L50_I2C is not set +# CONFIG_MFD_CS40L50_SPI is not set CONFIG_MFD_VEXPRESS_SYSREG=y # CONFIG_RAVE_SP_CORE is not set # CONFIG_MFD_INTEL_M10_BMC_SPI is not set @@ -4742,6 +4790,7 @@ CONFIG_REGULATOR_QCOM_SPMI=y # CONFIG_REGULATOR_RTQ6752 is not set # CONFIG_REGULATOR_RTQ2208 is not set # CONFIG_REGULATOR_SLG51000 is not set +CONFIG_REGULATOR_SUN20I=y # CONFIG_REGULATOR_SY8106A is not set # CONFIG_REGULATOR_SY8824X is not set # CONFIG_REGULATOR_SY8827N is not set @@ -5106,6 +5155,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y # # Chips&Media media platform drivers # +# CONFIG_VIDEO_E5010_JPEG_ENC is not set # # Intel media platform drivers @@ -5143,6 +5193,11 @@ CONFIG_VIDEO_CAFE_CCIC=m CONFIG_VIDEO_QCOM_CAMSS=m CONFIG_VIDEO_QCOM_VENUS=m +# +# Raspberry Pi media platform drivers +# +# CONFIG_VIDEO_RASPBERRYPI_PISP_BE is not set + # # Renesas media platform drivers # @@ -5377,6 +5432,8 @@ CONFIG_VIDEO_M52790=m # CONFIG_VIDEO_DS90UB913 is not set # CONFIG_VIDEO_DS90UB953 is not set # CONFIG_VIDEO_DS90UB960 is not set +# CONFIG_VIDEO_MAX96714 is not set +# CONFIG_VIDEO_MAX96717 is not set # end of Video serializers and deserializers # @@ -5620,11 +5677,11 @@ CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 # CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set CONFIG_DRM_LOAD_EDID_FIRMWARE=y -CONFIG_DRM_DP_AUX_BUS=m CONFIG_DRM_DISPLAY_HELPER=m +CONFIG_DRM_DISPLAY_DP_AUX_BUS=m +# CONFIG_DRM_DISPLAY_DP_AUX_CEC is not set +# CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV is not set CONFIG_DRM_DISPLAY_DP_HELPER=y -CONFIG_DRM_DP_AUX_CHARDEV=y -# CONFIG_DRM_DP_CEC is not set CONFIG_DRM_EXEC=m CONFIG_DRM_GEM_DMA_HELPER=m CONFIG_DRM_GEM_SHMEM_HELPER=m @@ -5691,11 +5748,13 @@ CONFIG_DRM_PANEL=y # CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D is not set # CONFIG_DRM_PANEL_DSI_CM is not set # CONFIG_DRM_PANEL_LVDS is not set +# CONFIG_DRM_PANEL_HIMAX_HX83102 is not set # CONFIG_DRM_PANEL_HIMAX_HX83112A is not set # CONFIG_DRM_PANEL_HIMAX_HX8394 is not set # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set # CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set # CONFIG_DRM_PANEL_ILITEK_ILI9805 is not set +# CONFIG_DRM_PANEL_ILITEK_ILI9806E is not set # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set # CONFIG_DRM_PANEL_ILITEK_ILI9882T is not set # CONFIG_DRM_PANEL_INNOLUX_EJ030NA is not set @@ -5708,8 +5767,10 @@ CONFIG_DRM_PANEL=y # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set # CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set +# CONFIG_DRM_PANEL_LINCOLNTECH_LCD197 is not set # CONFIG_DRM_PANEL_LG_LB035Q02 is not set # CONFIG_DRM_PANEL_LG_LG4573 is not set +# CONFIG_DRM_PANEL_LG_SW43408 is not set # CONFIG_DRM_PANEL_MAGNACHIP_D53E6EA8966 is not set # CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set # CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set @@ -5731,11 +5792,13 @@ CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m # CONFIG_DRM_PANEL_RAYDIUM_RM67191 is not set # CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set # CONFIG_DRM_PANEL_RAYDIUM_RM692E5 is not set +# CONFIG_DRM_PANEL_RAYDIUM_RM69380 is not set # CONFIG_DRM_PANEL_RONBO_RB070D30 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set # CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set # CONFIG_DRM_PANEL_SAMSUNG_DB7430 is not set # CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set +# CONFIG_DRM_PANEL_SAMSUNG_S6E3FA7 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6D27A1 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6D7AA0 is not set @@ -5846,10 +5909,12 @@ CONFIG_DRM_I2C_ADV7511_CEC=y # CONFIG_DRM_XEN_FRONTEND is not set # CONFIG_DRM_LIMA is not set # CONFIG_DRM_PANFROST is not set +# CONFIG_DRM_PANTHOR is not set # CONFIG_DRM_TIDSS is not set # CONFIG_DRM_GUD is not set # CONFIG_DRM_SSD130X is not set # CONFIG_DRM_POWERVR is not set +# CONFIG_DRM_WERROR is not set CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y # @@ -5936,6 +6001,7 @@ CONFIG_BACKLIGHT_PWM=m # CONFIG_BACKLIGHT_QCOM_WLED is not set # CONFIG_BACKLIGHT_ADP8860 is not set # CONFIG_BACKLIGHT_ADP8870 is not set +# CONFIG_BACKLIGHT_LM3509 is not set # CONFIG_BACKLIGHT_LM3630A is not set # CONFIG_BACKLIGHT_LM3639 is not set CONFIG_BACKLIGHT_LP855X=m @@ -6036,6 +6102,7 @@ CONFIG_SND_HDA_CODEC_HDMI=m CONFIG_SND_HDA_CODEC_CIRRUS=m # CONFIG_SND_HDA_CODEC_CS8409 is not set CONFIG_SND_HDA_CODEC_CONEXANT=m +# CONFIG_SND_HDA_CODEC_SENARYTECH is not set CONFIG_SND_HDA_CODEC_CA0110=m CONFIG_SND_HDA_CODEC_CA0132=m CONFIG_SND_HDA_CODEC_CA0132_DSP=y @@ -6246,6 +6313,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=m # CONFIG_SND_SOC_AK4458 is not set # CONFIG_SND_SOC_AK4554 is not set # CONFIG_SND_SOC_AK4613 is not set +# CONFIG_SND_SOC_AK4619 is not set # CONFIG_SND_SOC_AK4642 is not set # CONFIG_SND_SOC_AK5386 is not set # CONFIG_SND_SOC_AK5558 is not set @@ -6290,6 +6358,7 @@ CONFIG_SND_SOC_ALC5632=m # CONFIG_SND_SOC_CS4341 is not set # CONFIG_SND_SOC_CS4349 is not set # CONFIG_SND_SOC_CS53L30 is not set +# CONFIG_SND_SOC_CS530X_I2C is not set # CONFIG_SND_SOC_CX2072X is not set # CONFIG_SND_SOC_DA7213 is not set CONFIG_SND_SOC_DA7219=m @@ -6297,6 +6366,7 @@ CONFIG_SND_SOC_DMIC=m CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_ES7134 is not set # CONFIG_SND_SOC_ES7241 is not set +# CONFIG_SND_SOC_ES8311 is not set # CONFIG_SND_SOC_ES8316 is not set # CONFIG_SND_SOC_ES8326 is not set # CONFIG_SND_SOC_ES8328_I2C is not set @@ -6335,13 +6405,16 @@ CONFIG_SND_SOC_MAX98927=m # CONFIG_SND_SOC_PCM5102A is not set # CONFIG_SND_SOC_PCM512x_I2C is not set # CONFIG_SND_SOC_PCM512x_SPI is not set +# CONFIG_SND_SOC_PCM6240 is not set # CONFIG_SND_SOC_PEB2466 is not set +# CONFIG_SND_SOC_RK3308 is not set # CONFIG_SND_SOC_RK3328 is not set CONFIG_SND_SOC_RL6231=m # CONFIG_SND_SOC_RT1017_SDCA_SDW is not set # CONFIG_SND_SOC_RT1308_SDW is not set # CONFIG_SND_SOC_RT1316_SDW is not set # CONFIG_SND_SOC_RT1318_SDW is not set +# CONFIG_SND_SOC_RT1320_SDW is not set CONFIG_SND_SOC_RT5514=m CONFIG_SND_SOC_RT5514_SPI=m # CONFIG_SND_SOC_RT5616 is not set @@ -6409,6 +6482,7 @@ CONFIG_SND_SOC_TLV320AIC23_I2C=m # CONFIG_SND_SOC_UDA1334 is not set CONFIG_SND_SOC_WCD_CLASSH=m CONFIG_SND_SOC_WCD_MBHC=m +# CONFIG_SND_SOC_WCD937X_SDW is not set CONFIG_SND_SOC_WCD938X=m CONFIG_SND_SOC_WCD938X_SDW=m # CONFIG_SND_SOC_WCD939X_SDW is not set @@ -6589,6 +6663,7 @@ CONFIG_HID_UDRAW_PS3=m CONFIG_HID_U2FZERO=m CONFIG_HID_WACOM=m CONFIG_HID_WIIMOTE=m +# CONFIG_HID_WINWING is not set CONFIG_HID_XINMO=m CONFIG_HID_ZEROPLUS=m CONFIG_ZEROPLUS_FF=y @@ -6867,7 +6942,7 @@ CONFIG_USB_HSIC_USB3503=m # CONFIG_USB_HSIC_USB4604 is not set # CONFIG_USB_LINK_LAYER_TEST is not set CONFIG_USB_CHAOSKEY=m -# CONFIG_USB_ONBOARD_HUB is not set +# CONFIG_USB_ONBOARD_DEV is not set # CONFIG_USB_ATM is not set # @@ -7098,7 +7173,6 @@ CONFIG_MSPRO_BLOCK=m CONFIG_MEMSTICK_TIFM_MS=m CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK_R592=m -CONFIG_MEMSTICK_REALTEK_PCI=m CONFIG_MEMSTICK_REALTEK_USB=m CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y @@ -7115,6 +7189,7 @@ CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y # CONFIG_LEDS_BCM6328 is not set # CONFIG_LEDS_BCM6358 is not set # CONFIG_LEDS_CR0014114 is not set +CONFIG_LEDS_CROS_EC=m # CONFIG_LEDS_EL15203000 is not set # CONFIG_LEDS_LM3530 is not set # CONFIG_LEDS_LM3532 is not set @@ -7190,8 +7265,8 @@ CONFIG_LEDS_TRIGGER_CAMERA=m CONFIG_LEDS_TRIGGER_PANIC=y # CONFIG_LEDS_TRIGGER_NETDEV is not set # CONFIG_LEDS_TRIGGER_PATTERN is not set -CONFIG_LEDS_TRIGGER_AUDIO=m # CONFIG_LEDS_TRIGGER_TTY is not set +# CONFIG_LEDS_TRIGGER_INPUT_EVENTS is not set # # Simple LED drivers @@ -7300,6 +7375,7 @@ CONFIG_RTC_DRV_PCF8563=y # CONFIG_RTC_DRV_S35390A is not set # CONFIG_RTC_DRV_FM3130 is not set # CONFIG_RTC_DRV_RX8010 is not set +# CONFIG_RTC_DRV_RX8111 is not set # CONFIG_RTC_DRV_RX8581 is not set # CONFIG_RTC_DRV_RX8025 is not set # CONFIG_RTC_DRV_EM3027 is not set @@ -7446,7 +7522,6 @@ CONFIG_UIO_AEC=m CONFIG_UIO_SERCOS3=m CONFIG_UIO_PCI_GENERIC=m CONFIG_UIO_NETX=m -# CONFIG_UIO_PRUSS is not set CONFIG_UIO_MF624=m CONFIG_VFIO=m CONFIG_VFIO_GROUP=y @@ -7520,7 +7595,6 @@ CONFIG_XEN_FRONT_PGDIR_SHBUF=m # CONFIG_GREYBUS is not set # CONFIG_COMEDI is not set CONFIG_STAGING=y -# CONFIG_PRISM2_USB is not set # CONFIG_RTLLIB is not set CONFIG_RTL8723BS=m CONFIG_R8712U=m @@ -7583,7 +7657,6 @@ CONFIG_VIDEO_SUNXI_CEDRUS=m # CONFIG_LTE_GDM724X is not set # CONFIG_FB_TFT is not set # CONFIG_KS7010 is not set -# CONFIG_PI433 is not set # CONFIG_XIL_AXIS_FIFO is not set # CONFIG_FIELDBUS_DEV is not set # CONFIG_VME_BUS is not set @@ -7611,8 +7684,12 @@ CONFIG_CROS_USBPD_LOGGER=m CONFIG_CROS_USBPD_NOTIFY=m # CONFIG_CHROMEOS_PRIVACY_SCREEN is not set CONFIG_CROS_TYPEC_SWITCH=m +# CONFIG_CZNIC_PLATFORMS is not set # CONFIG_MELLANOX_PLATFORM is not set # CONFIG_SURFACE_PLATFORMS is not set +CONFIG_ARM64_PLATFORM_DEVICES=y +# CONFIG_EC_ACER_ASPIRE1 is not set +# CONFIG_EC_LENOVO_YOGA_C630 is not set CONFIG_HAVE_CLK=y CONFIG_HAVE_CLK_PREPARE=y CONFIG_COMMON_CLK=y @@ -7667,6 +7744,7 @@ CONFIG_COMMON_CLK_MESON_DUALDIV=y CONFIG_COMMON_CLK_MESON_MPLL=y CONFIG_COMMON_CLK_MESON_PLL=y CONFIG_COMMON_CLK_MESON_VID_PLL_DIV=y +CONFIG_COMMON_CLK_MESON_VCLK=y CONFIG_COMMON_CLK_MESON_CLKC_UTILS=y CONFIG_COMMON_CLK_MESON_AO_CLKC=y CONFIG_COMMON_CLK_MESON_EE_CLKC=y @@ -7676,6 +7754,8 @@ CONFIG_COMMON_CLK_AXG=y # CONFIG_COMMON_CLK_AXG_AUDIO is not set # CONFIG_COMMON_CLK_A1_PLL is not set # CONFIG_COMMON_CLK_A1_PERIPHERALS is not set +CONFIG_COMMON_CLK_C3_PLL=y +CONFIG_COMMON_CLK_C3_PERIPHERALS=y CONFIG_COMMON_CLK_G12A=y CONFIG_COMMON_CLK_S4_PLL=y CONFIG_COMMON_CLK_S4_PERIPHERALS=y @@ -7686,13 +7766,13 @@ CONFIG_ARMADA_37XX_CLK=y CONFIG_ARMADA_AP806_SYSCON=y CONFIG_ARMADA_CP110_SYSCON=y CONFIG_QCOM_GDSC=y -CONFIG_QCOM_RPMCC=y CONFIG_COMMON_CLK_QCOM=y # CONFIG_CLK_X1E80100_CAMCC is not set # CONFIG_CLK_X1E80100_DISPCC is not set # CONFIG_CLK_X1E80100_GCC is not set # CONFIG_CLK_X1E80100_GPUCC is not set # CONFIG_CLK_X1E80100_TCSRCC is not set +# CONFIG_CLK_QCM2290_GPUCC is not set # CONFIG_QCOM_A53PLL is not set # CONFIG_QCOM_A7PLL is not set # CONFIG_QCOM_CLK_APCS_MSM8916 is not set @@ -7708,6 +7788,7 @@ CONFIG_QCOM_CLK_RPMH=y # CONFIG_IPQ_GCC_6018 is not set # CONFIG_IPQ_GCC_8074 is not set # CONFIG_IPQ_GCC_9574 is not set +# CONFIG_IPQ_NSSCC_QCA8K is not set CONFIG_MSM_GCC_8916=y # CONFIG_MSM_GCC_8917 is not set # CONFIG_MSM_GCC_8939 is not set @@ -7759,9 +7840,11 @@ CONFIG_SDM_DISPCC_845=y # CONFIG_SDM_LPASSCC_845 is not set # CONFIG_SDX_GCC_75 is not set # CONFIG_SM_CAMCC_6350 is not set +# CONFIG_SM_CAMCC_7150 is not set # CONFIG_SM_CAMCC_8250 is not set # CONFIG_SM_CAMCC_8450 is not set # CONFIG_SM_CAMCC_8550 is not set +# CONFIG_SM_CAMCC_8650 is not set # CONFIG_SM_DISPCC_8250 is not set # CONFIG_SM_DISPCC_8650 is not set # CONFIG_SM_GCC_4450 is not set @@ -7788,6 +7871,7 @@ CONFIG_SM_GCC_8350=m # CONFIG_SM_GPUCC_8650 is not set # CONFIG_SM_TCSRCC_8550 is not set # CONFIG_SM_TCSRCC_8650 is not set +# CONFIG_SM_VIDEOCC_7150 is not set # CONFIG_SM_VIDEOCC_8150 is not set # CONFIG_SM_VIDEOCC_8250 is not set CONFIG_SM_VIDEOCC_8350=m @@ -7848,6 +7932,7 @@ CONFIG_ARM_TIMER_SP804=y CONFIG_MAILBOX=y CONFIG_ARM_MHU=y # CONFIG_ARM_MHU_V2 is not set +# CONFIG_ARM_MHU_V3 is not set CONFIG_PLATFORM_MHU=y # CONFIG_PL320_MBOX is not set # CONFIG_ARMADA_37XX_RWTM_MBOX is not set @@ -7862,6 +7947,7 @@ CONFIG_QCOM_APCS_IPC=y CONFIG_XGENE_SLIMPRO_MBOX=m CONFIG_ZYNQMP_IPI_MBOX=y CONFIG_SUN6I_MSGBOX=y +# CONFIG_QCOM_CPUCP_MBOX is not set CONFIG_QCOM_IPCC=y CONFIG_IOMMU_IOVA=y CONFIG_IOMMU_API=y @@ -7997,7 +8083,9 @@ CONFIG_QCOM_LLCC=m CONFIG_QCOM_KRYO_L2_ACCESSORS=y CONFIG_QCOM_MDT_LOADER=m CONFIG_QCOM_OCMEM=m +CONFIG_QCOM_PD_MAPPER=m CONFIG_QCOM_PDR_HELPERS=m +CONFIG_QCOM_PDR_MSG=m CONFIG_QCOM_PMIC_GLINK=m CONFIG_QCOM_QMI_HELPERS=m # CONFIG_QCOM_RAMP_CTRL is not set @@ -8190,12 +8278,14 @@ CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m # CONFIG_AD7091R5 is not set # CONFIG_AD7091R8 is not set # CONFIG_AD7124 is not set +# CONFIG_AD7173 is not set # CONFIG_AD7192 is not set # CONFIG_AD7266 is not set # CONFIG_AD7280 is not set # CONFIG_AD7291 is not set # CONFIG_AD7292 is not set # CONFIG_AD7298 is not set +# CONFIG_AD7380 is not set # CONFIG_AD7476 is not set # CONFIG_AD7606_IFACE_PARALLEL is not set # CONFIG_AD7606_IFACE_SPI is not set @@ -8206,6 +8296,7 @@ CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m # CONFIG_AD7793 is not set # CONFIG_AD7887 is not set # CONFIG_AD7923 is not set +# CONFIG_AD7944 is not set # CONFIG_AD7949 is not set # CONFIG_AD799X is not set # CONFIG_AD9467 is not set @@ -8255,6 +8346,7 @@ CONFIG_ROCKCHIP_SARADC=m # CONFIG_TI_ADC128S052 is not set # CONFIG_TI_ADC161S626 is not set CONFIG_TI_ADS1015=m +# CONFIG_TI_ADS1119 is not set # CONFIG_TI_ADS7924 is not set # CONFIG_TI_ADS1100 is not set # CONFIG_TI_ADS1298 is not set @@ -8308,6 +8400,7 @@ CONFIG_VIPERBOARD_ADC=m # CONFIG_ATLAS_EZO_SENSOR is not set # CONFIG_BME680 is not set # CONFIG_CCS811 is not set +# CONFIG_ENS160 is not set # CONFIG_IAQCORE is not set # CONFIG_PMS7003 is not set # CONFIG_SCD30_CORE is not set @@ -8355,6 +8448,8 @@ CONFIG_AD5446=m # CONFIG_AD5593R is not set # CONFIG_AD5504 is not set # CONFIG_AD5624R_SPI is not set +# CONFIG_AD9739A is not set +# CONFIG_ADI_AXI_DAC is not set # CONFIG_LTC2688 is not set # CONFIG_AD5686_SPI is not set # CONFIG_AD5696_I2C is not set @@ -8499,6 +8594,7 @@ CONFIG_ACPI_ALS=m # CONFIG_AL3010 is not set # CONFIG_AL3320A is not set # CONFIG_APDS9300 is not set +# CONFIG_APDS9306 is not set # CONFIG_APDS9960 is not set # CONFIG_AS73211 is not set # CONFIG_BH1750 is not set @@ -8544,6 +8640,7 @@ CONFIG_IIO_CROS_EC_LIGHT_PROX=m # CONFIG_VCNL4000 is not set # CONFIG_VCNL4035 is not set # CONFIG_VEML6030 is not set +# CONFIG_VEML6040 is not set # CONFIG_VEML6070 is not set # CONFIG_VEML6075 is not set # CONFIG_VL6180 is not set @@ -8695,13 +8792,14 @@ CONFIG_IIO_CROS_EC_BARO=m # CONFIG_NTB is not set CONFIG_PWM=y -CONFIG_PWM_SYSFS=y # CONFIG_PWM_DEBUG is not set # CONFIG_PWM_ATMEL_TCB is not set +# CONFIG_PWM_AXI_PWMGEN is not set # CONFIG_PWM_CLK is not set CONFIG_PWM_CROS_EC=m # CONFIG_PWM_DWC is not set # CONFIG_PWM_FSL_FTM is not set +# CONFIG_PWM_GPIO is not set # CONFIG_PWM_HIBVT is not set CONFIG_PWM_MESON=m # CONFIG_PWM_PCA9685 is not set @@ -8721,8 +8819,10 @@ CONFIG_ARM_GIC_V2M=y CONFIG_ARM_GIC_V3=y CONFIG_ARM_GIC_V3_ITS=y CONFIG_ARM_GIC_V3_ITS_PCI=y +CONFIG_IRQ_MSI_LIB=y # CONFIG_AL_FIC is not set CONFIG_HISILICON_IRQ_MBIGEN=y +# CONFIG_LAN966X_OIC is not set CONFIG_SUN6I_R_INTC=y CONFIG_SUNXI_NMI_INTC=y # CONFIG_XILINX_INTC is not set @@ -8751,6 +8851,7 @@ CONFIG_RESET_SIMPLE=y CONFIG_RESET_SUNXI=y # CONFIG_RESET_TI_SYSCON is not set # CONFIG_RESET_TI_TPS380X is not set +CONFIG_RESET_ZYNQMP=y CONFIG_COMMON_RESET_HI3660=y CONFIG_COMMON_RESET_HI6220=y @@ -8838,6 +8939,7 @@ CONFIG_PHY_ROCKCHIP_PCIE=m # CONFIG_PHY_ROCKCHIP_SNPS_PCIE3 is not set CONFIG_PHY_ROCKCHIP_TYPEC=m CONFIG_PHY_ROCKCHIP_USB=m +# CONFIG_PHY_ROCKCHIP_USBDP is not set # CONFIG_PHY_SAMSUNG_USB2 is not set CONFIG_PHY_TEGRA_XUSB=m # CONFIG_PHY_TUSB1210 is not set @@ -8889,6 +8991,7 @@ CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder,anbox-binder,anbox-hwbi # CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set # end of Android +CONFIG_TRACE_GPU_MEM=y CONFIG_LIBNVDIMM=m CONFIG_BLK_DEV_PMEM=m CONFIG_ND_CLAIM=y @@ -8943,6 +9046,7 @@ CONFIG_INTERCONNECT_QCOM_BCM_VOTER=y # CONFIG_INTERCONNECT_QCOM_MSM8909 is not set # CONFIG_INTERCONNECT_QCOM_MSM8916 is not set # CONFIG_INTERCONNECT_QCOM_MSM8939 is not set +# CONFIG_INTERCONNECT_QCOM_MSM8953 is not set # CONFIG_INTERCONNECT_QCOM_MSM8974 is not set # CONFIG_INTERCONNECT_QCOM_MSM8996 is not set CONFIG_INTERCONNECT_QCOM_OSM_L3=m @@ -8972,6 +9076,7 @@ CONFIG_INTERCONNECT_QCOM_SDM845=y # CONFIG_INTERCONNECT_QCOM_SM8550 is not set # CONFIG_INTERCONNECT_QCOM_SM8650 is not set # CONFIG_INTERCONNECT_QCOM_X1E80100 is not set +CONFIG_INTERCONNECT_CLK=y # CONFIG_COUNTER is not set # CONFIG_MOST is not set # CONFIG_PECI is not set @@ -9083,6 +9188,7 @@ CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y # CONFIG_NETFS_SUPPORT=m # CONFIG_NETFS_STATS is not set +# CONFIG_NETFS_DEBUG is not set # CONFIG_FSCACHE is not set # end of Caches @@ -9227,6 +9333,7 @@ CONFIG_EROFS_FS_SECURITY=y CONFIG_EROFS_FS_ZIP=y # CONFIG_EROFS_FS_ZIP_LZMA is not set # CONFIG_EROFS_FS_ZIP_DEFLATE is not set +# CONFIG_EROFS_FS_ZIP_ZSTD is not set # CONFIG_EROFS_FS_ONDEMAND is not set # CONFIG_EROFS_FS_PCPU_KTHREAD is not set CONFIG_NETWORK_FILESYSTEMS=y @@ -9436,6 +9543,7 @@ CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_ALGAPI2=y CONFIG_CRYPTO_AEAD=y CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_SIG=y CONFIG_CRYPTO_SIG2=y CONFIG_CRYPTO_SKCIPHER=y CONFIG_CRYPTO_SKCIPHER2=y @@ -9473,7 +9581,6 @@ CONFIG_CRYPTO_ECC=m CONFIG_CRYPTO_ECDH=m # CONFIG_CRYPTO_ECDSA is not set # CONFIG_CRYPTO_ECRDSA is not set -# CONFIG_CRYPTO_SM2 is not set # CONFIG_CRYPTO_CURVE25519 is not set # end of Public-key cryptography @@ -9604,7 +9711,6 @@ CONFIG_CRYPTO_USER_API_RNG=m # CONFIG_CRYPTO_USER_API_RNG_CAVP is not set CONFIG_CRYPTO_USER_API_AEAD=m CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y -# CONFIG_CRYPTO_STATS is not set # end of Userspace interface CONFIG_CRYPTO_HASH_INFO=y @@ -9819,13 +9925,13 @@ CONFIG_NEED_DMA_MAP_STATE=y CONFIG_ARCH_DMA_ADDR_T_64BIT=y CONFIG_DMA_DECLARE_COHERENT=y CONFIG_ARCH_HAS_SETUP_DMA_OPS=y -CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y CONFIG_SWIOTLB=y # CONFIG_SWIOTLB_DYNAMIC is not set CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC=y +CONFIG_DMA_NEED_SYNC=y # CONFIG_DMA_RESTRICTED_POOL is not set CONFIG_DMA_NONCOHERENT_MMAP=y CONFIG_DMA_COHERENT_POOL=y @@ -9845,7 +9951,6 @@ CONFIG_CMA_ALIGNMENT=8 # CONFIG_DMA_API_DEBUG is not set # CONFIG_DMA_MAP_BENCHMARK is not set CONFIG_SGL_ALLOC=y -# CONFIG_FORCE_NR_CPUS is not set CONFIG_CPU_RMAP=y CONFIG_DQL=y CONFIG_GLOB=y @@ -9916,11 +10021,22 @@ CONFIG_DEBUG_KERNEL=y # # Compile-time checks and compiler options # +CONFIG_DEBUG_INFO=y CONFIG_AS_HAS_NON_CONST_ULEB128=y -CONFIG_DEBUG_INFO_NONE=y +# CONFIG_DEBUG_INFO_NONE is not set # CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set # CONFIG_DEBUG_INFO_DWARF4 is not set -# CONFIG_DEBUG_INFO_DWARF5 is not set +CONFIG_DEBUG_INFO_DWARF5=y +# CONFIG_DEBUG_INFO_REDUCED is not set +CONFIG_DEBUG_INFO_COMPRESSED_NONE=y +# CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set +# CONFIG_DEBUG_INFO_SPLIT is not set +CONFIG_DEBUG_INFO_BTF=y +CONFIG_PAHOLE_HAS_SPLIT_BTF=y +CONFIG_PAHOLE_HAS_LANG_EXCLUDE=y +CONFIG_DEBUG_INFO_BTF_MODULES=y +# CONFIG_MODULE_ALLOW_BTF_MISMATCH is not set +# CONFIG_GDB_SCRIPTS is not set CONFIG_FRAME_WARN=2048 CONFIG_STRIP_ASM_SYMS=y # CONFIG_READABLE_ASM is not set @@ -9992,6 +10108,7 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y CONFIG_DEBUG_MEMORY_INIT=y CONFIG_MEMORY_NOTIFIER_ERROR_INJECT=m # CONFIG_DEBUG_PER_CPU_MAPS is not set +# CONFIG_MEM_ALLOC_PROFILING is not set CONFIG_HAVE_ARCH_KASAN=y CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y CONFIG_HAVE_ARCH_KASAN_HW_TAGS=y @@ -10014,6 +10131,7 @@ CONFIG_PANIC_ON_OOPS_VALUE=0 CONFIG_PANIC_TIMEOUT=0 CONFIG_LOCKUP_DETECTOR=y CONFIG_SOFTLOCKUP_DETECTOR=y +# CONFIG_SOFTLOCKUP_DETECTOR_INTR_STORM is not set # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_HAVE_HARDLOCKUP_DETECTOR_BUDDY=y # CONFIG_HARDLOCKUP_DETECTOR is not set @@ -10089,6 +10207,7 @@ CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=20000 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set # CONFIG_LATENCYTOP is not set # CONFIG_DEBUG_CGROUP_REF is not set +CONFIG_USER_STACKTRACE_SUPPORT=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_RETVAL=y @@ -10109,6 +10228,7 @@ CONFIG_IO_STRICT_DEVMEM=y # arm64 Debugging # # CONFIG_PID_IN_CONTEXTIDR is not set +# CONFIG_DEBUG_EFI is not set # CONFIG_ARM64_RELOC_TEST is not set # CONFIG_CORESIGHT is not set # end of arm64 Debugging From dd6300d4cce9056eb5efa16ce3b656c16734bbe7 Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Thu, 29 Aug 2024 12:06:58 +0200 Subject: [PATCH 15/15] thinkpad-x13s: kernel: update vs jhovold's wip/sc8280xp-6.11-rc5 johan_defconfig --- config/kernel/linux-arm64-sc8280xp.config | 25 +++++++++++++++-------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/config/kernel/linux-arm64-sc8280xp.config b/config/kernel/linux-arm64-sc8280xp.config index 78fe543c0135..33010fa2aa3c 100644 --- a/config/kernel/linux-arm64-sc8280xp.config +++ b/config/kernel/linux-arm64-sc8280xp.config @@ -393,7 +393,7 @@ CONFIG_ARM64_ERRATUM_2645198=y CONFIG_ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD=y CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_ERRATUM_3117295=y -CONFIG_ARM64_ERRATUM_3194386=y +# CONFIG_ARM64_ERRATUM_3194386 is not set CONFIG_CAVIUM_ERRATUM_22375=y CONFIG_CAVIUM_ERRATUM_23144=y CONFIG_CAVIUM_ERRATUM_23154=y @@ -2143,7 +2143,9 @@ CONFIG_FW_LOADER_SYSFS=y CONFIG_EXTRA_FIRMWARE="" CONFIG_FW_LOADER_USER_HELPER=y # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set -# CONFIG_FW_LOADER_COMPRESS is not set +CONFIG_FW_LOADER_COMPRESS=y +CONFIG_FW_LOADER_COMPRESS_XZ=y +CONFIG_FW_LOADER_COMPRESS_ZSTD=y CONFIG_FW_CACHE=y # CONFIG_FW_UPLOAD is not set # end of Firmware loader @@ -3240,7 +3242,7 @@ CONFIG_NET_FAILOVER=m # Input device support # CONFIG_INPUT=y -CONFIG_INPUT_LEDS=y +CONFIG_INPUT_LEDS=m CONFIG_INPUT_FF_MEMLESS=y CONFIG_INPUT_SPARSEKMAP=m CONFIG_INPUT_MATRIXKMAP=m @@ -6764,7 +6766,7 @@ CONFIG_USB_TMC=m # # also be needed; see USB_STORAGE Help for more info # -CONFIG_USB_STORAGE=y +CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set CONFIG_USB_STORAGE_REALTEK=m CONFIG_REALTEK_AUTOPM=y @@ -7063,7 +7065,11 @@ CONFIG_TYPEC_TCPCI=m # CONFIG_TYPEC_TCPCI_MAXIM is not set # CONFIG_TYPEC_FUSB302 is not set CONFIG_TYPEC_QCOM_PMIC=m -# CONFIG_TYPEC_UCSI is not set +CONFIG_TYPEC_UCSI=m +# CONFIG_UCSI_CCG is not set +# CONFIG_UCSI_ACPI is not set +# CONFIG_UCSI_STM32G0 is not set +CONFIG_UCSI_PMIC_GLINK=m # CONFIG_TYPEC_TPS6598X is not set # CONFIG_TYPEC_ANX7411 is not set # CONFIG_TYPEC_RT1719 is not set @@ -7175,7 +7181,7 @@ CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK_R592=m CONFIG_MEMSTICK_REALTEK_USB=m CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y +CONFIG_LEDS_CLASS=m # CONFIG_LEDS_CLASS_FLASH is not set CONFIG_LEDS_CLASS_MULTICOLOR=m CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y @@ -7197,7 +7203,7 @@ CONFIG_LEDS_CROS_EC=m # CONFIG_LEDS_LM3692X is not set # CONFIG_LEDS_SUN50I_A100 is not set # CONFIG_LEDS_PCA9532 is not set -CONFIG_LEDS_GPIO=y +CONFIG_LEDS_GPIO=m CONFIG_LEDS_LP3944=m # CONFIG_LEDS_LP3952 is not set # CONFIG_LEDS_LP50XX is not set @@ -7223,7 +7229,6 @@ CONFIG_LEDS_LT3593=m # LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM) # # CONFIG_LEDS_BLINKM is not set -CONFIG_LEDS_SYSCON=y # CONFIG_LEDS_MLXREG is not set # CONFIG_LEDS_USER is not set # CONFIG_LEDS_SPI_BYTE is not set @@ -7510,8 +7515,10 @@ CONFIG_SYNC_FILE=y # CONFIG_DMABUF_MOVE_NOTIFY is not set # CONFIG_DMABUF_DEBUG is not set # CONFIG_DMABUF_SELFTESTS is not set -# CONFIG_DMABUF_HEAPS is not set +CONFIG_DMABUF_HEAPS=y # CONFIG_DMABUF_SYSFS_STATS is not set +CONFIG_DMABUF_HEAPS_SYSTEM=y +CONFIG_DMABUF_HEAPS_CMA=y # end of DMABUF options CONFIG_UIO=m