diff options
| author | Ron Yorston <rmy@pobox.com> | 2022-01-13 08:02:41 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2022-01-13 08:02:41 +0000 |
| commit | 4734416a21312488a5099a297907783bee4ccc22 (patch) | |
| tree | e42b034f9685a0a07ad080076b757bfba654cf7d /configs | |
| parent | b8751bbc9ac24e71fbe1e79c69074b4c87a134d8 (diff) | |
| parent | b3eec1651fb02d70716caa355f49320719f74c75 (diff) | |
| download | busybox-w32-4734416a21312488a5099a297907783bee4ccc22.tar.gz busybox-w32-4734416a21312488a5099a297907783bee4ccc22.tar.bz2 busybox-w32-4734416a21312488a5099a297907783bee4ccc22.zip | |
Merge busybox into merge
Fix merge conflicts in coreutils/ls.c and shell/ash.c.
Update config files to turn off SHA1_HWACCEL. It uses non-portable
assembler.
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/mingw32_defconfig | 2 | ||||
| -rw-r--r-- | configs/mingw64_defconfig | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/configs/mingw32_defconfig b/configs/mingw32_defconfig index d41899fdc..408b13eb8 100644 --- a/configs/mingw32_defconfig +++ b/configs/mingw32_defconfig | |||
| @@ -112,6 +112,8 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y | |||
| 112 | # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set | 112 | # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set |
| 113 | CONFIG_PASSWORD_MINLEN=6 | 113 | CONFIG_PASSWORD_MINLEN=6 |
| 114 | CONFIG_MD5_SMALL=1 | 114 | CONFIG_MD5_SMALL=1 |
| 115 | CONFIG_SHA1_SMALL=3 | ||
| 116 | # CONFIG_SHA1_HWACCEL is not set | ||
| 115 | CONFIG_SHA3_SMALL=1 | 117 | CONFIG_SHA3_SMALL=1 |
| 116 | # CONFIG_FEATURE_FAST_TOP is not set | 118 | # CONFIG_FEATURE_FAST_TOP is not set |
| 117 | # CONFIG_FEATURE_ETC_NETWORKS is not set | 119 | # CONFIG_FEATURE_ETC_NETWORKS is not set |
diff --git a/configs/mingw64_defconfig b/configs/mingw64_defconfig index 449f16ae6..05596ab8e 100644 --- a/configs/mingw64_defconfig +++ b/configs/mingw64_defconfig | |||
| @@ -112,6 +112,8 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y | |||
| 112 | # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set | 112 | # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set |
| 113 | CONFIG_PASSWORD_MINLEN=6 | 113 | CONFIG_PASSWORD_MINLEN=6 |
| 114 | CONFIG_MD5_SMALL=1 | 114 | CONFIG_MD5_SMALL=1 |
| 115 | CONFIG_SHA1_SMALL=3 | ||
| 116 | # CONFIG_SHA1_HWACCEL is not set | ||
| 115 | CONFIG_SHA3_SMALL=1 | 117 | CONFIG_SHA3_SMALL=1 |
| 116 | # CONFIG_FEATURE_FAST_TOP is not set | 118 | # CONFIG_FEATURE_FAST_TOP is not set |
| 117 | # CONFIG_FEATURE_ETC_NETWORKS is not set | 119 | # CONFIG_FEATURE_ETC_NETWORKS is not set |