[bot] AutoMerging: merge all upstream's changes:

* https://github.com/coolsnowwolf/lede: add missing ssb and bcma (coolsnowwolf#11343) add python3-setuptools (coolsnowwolf#11345) bcm53xx: 5.4: add missing kconfig (coolsnowwolf#11341)
UtMetoo · Jul 3, 2023 · 331b1c5 · 331b1c5
2 parents 32e9af4 + 8d2d9dd
commit 331b1c5
Show file tree

Hide file tree

Showing 4 changed files with 1,279 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -35,7 +35,7 @@
    libmpc-dev libmpfr-dev libncurses5-dev libncursesw5-dev libreadline-dev libssl-dev libtool lrzsz \
    mkisofs msmtp nano ninja-build p7zip p7zip-full patch pkgconf python2.7 python3 python3-pyelftools \
    libpython3-dev qemu-utils rsync scons squashfs-tools subversion swig texinfo uglifyjs upx-ucl unzip \
-   vim wget xmlto xxd zlib1g-dev
+   vim wget xmlto xxd zlib1g-dev python3-setuptools
    ```
 
 3. 下载源代码，更新 feeds 并选择配置

diff --git a/target/linux/bcm53xx/config-5.4 b/target/linux/bcm53xx/config-5.4
@@ -45,6 +45,7 @@ CONFIG_ARM_APPENDED_DTB=y
 CONFIG_ARM_ARCH_TIMER=y
 CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
 # CONFIG_ARM_ATAG_DTB_COMPAT is not set
+CONFIG_ARM_CRYPTO=y
 CONFIG_ARM_ERRATA_754322=y
 CONFIG_ARM_ERRATA_764369=y
 CONFIG_ARM_ERRATA_775420=y