| Message ID | 20250203220825.707590-1-raymond.mao@linaro.org |
|---|---|
| State | Accepted |
| Commit | a26e957381ecba59603a3ca455c30d6f8eae0ce7 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [v2,1/3] mbedtls: fix incorrect kconfig dependencies on mbedtls | expand |
On Tue, 4 Feb 2025 at 00:08, Raymond Mao <raymond.mao@linaro.org> wrote: > > Fixed the building failures when WGET_HTTPS,NET_LWIP and MBEDTLS_LIB > are selected due to a few incorrect kconfig dependencies. > > Signed-off-by: Raymond Mao <raymond.mao@linaro.org> > --- > Changes in v2: > - Remove the renaming to patch 3/3 and update the commit message accordingly. > > cmd/Kconfig | 1 - > lib/mbedtls/Kconfig | 3 ++- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/cmd/Kconfig b/cmd/Kconfig > index e62817bd977..2e2dd459f56 100644 > --- a/cmd/Kconfig > +++ b/cmd/Kconfig > @@ -2160,7 +2160,6 @@ config WGET_HTTPS > select ASYMMETRIC_PUBLIC_KEY_SUBTYPE > select X509_CERTIFICATE_PARSER > select PKCS7_MESSAGE_PARSER > - select MBEDTLS_LIB_CRYPTO > select MBEDTLS_LIB_TLS > select RSA_VERIFY_WITH_PKEY > select X509_CERTIFICATE_PARSER > diff --git a/lib/mbedtls/Kconfig b/lib/mbedtls/Kconfig > index 35d8c507a89..bb8ac5f862b 100644 > --- a/lib/mbedtls/Kconfig > +++ b/lib/mbedtls/Kconfig > @@ -156,6 +156,7 @@ endif # LEGACY_CRYPTO_BASIC > > config LEGACY_CRYPTO_CERT > bool "legacy certificate libraries" > + depends on LEGACY_CRYPTO > select ASN1_DECODER_LEGACY if ASN1_DECODER > select ASYMMETRIC_PUBLIC_KEY_LEGACY if \ > ASYMMETRIC_PUBLIC_KEY_SUBTYPE > @@ -491,7 +492,7 @@ config MBEDTLS_LIB_TLS > depends on ASYMMETRIC_PUBLIC_KEY_MBEDTLS > depends on ASN1_DECODER_MBEDTLS > depends on ASYMMETRIC_PUBLIC_KEY_MBEDTLS > - depends on MBEDTLS_LIB_CRYPTO > + depends on MBEDTLS_LIB > help > Enable MbedTLS TLS library. Required for HTTPs support > in wget > -- > 2.25.1 > Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Hi Tom, Is it able to merge this series for the upcoming release? This series includes the hotfix for the building failures when WGET_HTTPS,NET_LWIP and MBEDTLS_LIB are selected. But it is rebased on one of Simon's patch: '[PATCH 01/19] mbedtls: Add SHA symbols for VPL' https://lore.kernel.org/u-boot/20250126184333.4058848-2-sjg@chromium.org/ Thanks regards, Raymond On Tue, 4 Feb 2025 at 03:49, Ilias Apalodimas <ilias.apalodimas@linaro.org> wrote: > > On Tue, 4 Feb 2025 at 00:08, Raymond Mao <raymond.mao@linaro.org> wrote: > > > > Fixed the building failures when WGET_HTTPS,NET_LWIP and MBEDTLS_LIB > > are selected due to a few incorrect kconfig dependencies. > > > > Signed-off-by: Raymond Mao <raymond.mao@linaro.org> > > --- > > Changes in v2: > > - Remove the renaming to patch 3/3 and update the commit message accordingly. > > > > cmd/Kconfig | 1 - > > lib/mbedtls/Kconfig | 3 ++- > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/cmd/Kconfig b/cmd/Kconfig > > index e62817bd977..2e2dd459f56 100644 > > --- a/cmd/Kconfig > > +++ b/cmd/Kconfig > > @@ -2160,7 +2160,6 @@ config WGET_HTTPS > > select ASYMMETRIC_PUBLIC_KEY_SUBTYPE > > select X509_CERTIFICATE_PARSER > > select PKCS7_MESSAGE_PARSER > > - select MBEDTLS_LIB_CRYPTO > > select MBEDTLS_LIB_TLS > > select RSA_VERIFY_WITH_PKEY > > select X509_CERTIFICATE_PARSER > > diff --git a/lib/mbedtls/Kconfig b/lib/mbedtls/Kconfig > > index 35d8c507a89..bb8ac5f862b 100644 > > --- a/lib/mbedtls/Kconfig > > +++ b/lib/mbedtls/Kconfig > > @@ -156,6 +156,7 @@ endif # LEGACY_CRYPTO_BASIC > > > > config LEGACY_CRYPTO_CERT > > bool "legacy certificate libraries" > > + depends on LEGACY_CRYPTO > > select ASN1_DECODER_LEGACY if ASN1_DECODER > > select ASYMMETRIC_PUBLIC_KEY_LEGACY if \ > > ASYMMETRIC_PUBLIC_KEY_SUBTYPE > > @@ -491,7 +492,7 @@ config MBEDTLS_LIB_TLS > > depends on ASYMMETRIC_PUBLIC_KEY_MBEDTLS > > depends on ASN1_DECODER_MBEDTLS > > depends on ASYMMETRIC_PUBLIC_KEY_MBEDTLS > > - depends on MBEDTLS_LIB_CRYPTO > > + depends on MBEDTLS_LIB > > help > > Enable MbedTLS TLS library. Required for HTTPs support > > in wget > > -- > > 2.25.1 > > > > Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
On Wed, Feb 26, 2025 at 10:25:22AM -0500, Raymond Mao wrote: > Hi Tom, > > Is it able to merge this series for the upcoming release? > This series includes the hotfix for the building failures when > WGET_HTTPS,NET_LWIP and MBEDTLS_LIB are selected. > But it is rebased on one of Simon's patch: > '[PATCH 01/19] mbedtls: Add SHA symbols for VPL' > https://lore.kernel.org/u-boot/20250126184333.4058848-2-sjg@chromium.org/ No, sorry, I did not realize you intended this for the v2025.04 release, I though it was for v2025.07. If this is something we need for the release then please rebase on top of current master, thanks.
Hi Tom, On Wed, 26 Feb 2025 at 10:39, Tom Rini <trini@konsulko.com> wrote: > > On Wed, Feb 26, 2025 at 10:25:22AM -0500, Raymond Mao wrote: > > > Hi Tom, > > > > Is it able to merge this series for the upcoming release? > > This series includes the hotfix for the building failures when > > WGET_HTTPS,NET_LWIP and MBEDTLS_LIB are selected. > > But it is rebased on one of Simon's patch: > > '[PATCH 01/19] mbedtls: Add SHA symbols for VPL' > > https://lore.kernel.org/u-boot/20250126184333.4058848-2-sjg@chromium.org/ > > No, sorry, I did not realize you intended this for the v2025.04 release, > I though it was for v2025.07. If this is something we need for the > release then please rebase on top of current master, thanks. > This series can be directly applied on top of current master 'Prepare v2025.04-rc3' since Simon's patch was merged. I ran on the CI with rebasing on the master and all tests passed. Thanks and regards, Raymond > -- > Tom
On Mon, 03 Feb 2025 14:08:12 -0800, Raymond Mao wrote: > Fixed the building failures when WGET_HTTPS,NET_LWIP and MBEDTLS_LIB > are selected due to a few incorrect kconfig dependencies. > > Applied to u-boot/master, thanks!
diff --git a/cmd/Kconfig b/cmd/Kconfig index e62817bd977..2e2dd459f56 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -2160,7 +2160,6 @@ config WGET_HTTPS select ASYMMETRIC_PUBLIC_KEY_SUBTYPE select X509_CERTIFICATE_PARSER select PKCS7_MESSAGE_PARSER - select MBEDTLS_LIB_CRYPTO select MBEDTLS_LIB_TLS select RSA_VERIFY_WITH_PKEY select X509_CERTIFICATE_PARSER diff --git a/lib/mbedtls/Kconfig b/lib/mbedtls/Kconfig index 35d8c507a89..bb8ac5f862b 100644 --- a/lib/mbedtls/Kconfig +++ b/lib/mbedtls/Kconfig @@ -156,6 +156,7 @@ endif # LEGACY_CRYPTO_BASIC config LEGACY_CRYPTO_CERT bool "legacy certificate libraries" + depends on LEGACY_CRYPTO select ASN1_DECODER_LEGACY if ASN1_DECODER select ASYMMETRIC_PUBLIC_KEY_LEGACY if \ ASYMMETRIC_PUBLIC_KEY_SUBTYPE @@ -491,7 +492,7 @@ config MBEDTLS_LIB_TLS depends on ASYMMETRIC_PUBLIC_KEY_MBEDTLS depends on ASN1_DECODER_MBEDTLS depends on ASYMMETRIC_PUBLIC_KEY_MBEDTLS - depends on MBEDTLS_LIB_CRYPTO + depends on MBEDTLS_LIB help Enable MbedTLS TLS library. Required for HTTPs support in wget
Fixed the building failures when WGET_HTTPS,NET_LWIP and MBEDTLS_LIB are selected due to a few incorrect kconfig dependencies. Signed-off-by: Raymond Mao <raymond.mao@linaro.org> --- Changes in v2: - Remove the renaming to patch 3/3 and update the commit message accordingly. cmd/Kconfig | 1 - lib/mbedtls/Kconfig | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-)