| Message ID | 20181210110518.14012-1-martyn.welch@collabora.com |
|---|---|
| State | Superseded |
| Delegated to: | Stefano Babic |
| Headers | show |
| Series | [U-Boot,RESEND,v3,1/3] Don't enable CONFIG_SPL_DM_USB for non-DM SPL | expand |
On 10/12/2018 12:05, Martyn Welch wrote: > When CONFIG_SPL_DM_USB was added, it was added defaulted on without > protection to ensure it didn't get set for non-DM SPL builds. > > This leads to unexpected and confusing failures when building a DM based > U-Boot but with a non-DM SPL, as the defconfig is unlikely to have > CONFIG_SPL_DM_USB actively disabled. > > Tweak the Kconfig to not enable this setting unless CONFIG_SPL_DM is set. > > Signed-off-by: Martyn Welch <martyn.welch@collabora.com> > > --- > > Changes in v3: > - New in v3 > > Changes in v2: None > > drivers/usb/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig > index d456beb43f..3c978d43aa 100644 > --- a/drivers/usb/Kconfig > +++ b/drivers/usb/Kconfig > @@ -49,7 +49,7 @@ config DM_USB > > config SPL_DM_USB > bool "Enable driver model for USB in SPL" > - depends on DM_USB > + depends on SPL_DM && DM_USB > default y > > source "drivers/usb/host/Kconfig" Reviewed-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
On 12/10/2018 12:05 PM, Martyn Welch wrote: > When CONFIG_SPL_DM_USB was added, it was added defaulted on without > protection to ensure it didn't get set for non-DM SPL builds. > > This leads to unexpected and confusing failures when building a DM based > U-Boot but with a non-DM SPL, as the defconfig is unlikely to have > CONFIG_SPL_DM_USB actively disabled. > > Tweak the Kconfig to not enable this setting unless CONFIG_SPL_DM is set. > > Signed-off-by: Martyn Welch <martyn.welch@collabora.com> Ah, I didn't realize the other patches weren't USB too. Applied, thanks.
On Mon, 2018-12-10 at 13:07 +0100, Marek Vasut wrote: > On 12/10/2018 12:05 PM, Martyn Welch wrote: > > When CONFIG_SPL_DM_USB was added, it was added defaulted on without > > protection to ensure it didn't get set for non-DM SPL builds. > > > > This leads to unexpected and confusing failures when building a DM > > based > > U-Boot but with a non-DM SPL, as the defconfig is unlikely to have > > CONFIG_SPL_DM_USB actively disabled. > > > > Tweak the Kconfig to not enable this setting unless CONFIG_SPL_DM > > is set. > > > > Signed-off-by: Martyn Welch <martyn.welch@collabora.com> > > Ah, I didn't realize the other patches weren't USB too. > Applied, thanks. > Thanks. I assume this is juat patch 1/3 that you've applied? Martyn
On 12/10/2018 02:53 PM, Martyn Welch wrote: > On Mon, 2018-12-10 at 13:07 +0100, Marek Vasut wrote: >> On 12/10/2018 12:05 PM, Martyn Welch wrote: >>> When CONFIG_SPL_DM_USB was added, it was added defaulted on without >>> protection to ensure it didn't get set for non-DM SPL builds. >>> >>> This leads to unexpected and confusing failures when building a DM >>> based >>> U-Boot but with a non-DM SPL, as the defconfig is unlikely to have >>> CONFIG_SPL_DM_USB actively disabled. >>> >>> Tweak the Kconfig to not enable this setting unless CONFIG_SPL_DM >>> is set. >>> >>> Signed-off-by: Martyn Welch <martyn.welch@collabora.com> >> >> Ah, I didn't realize the other patches weren't USB too. >> Applied, thanks. >> > > Thanks. > > I assume this is juat patch 1/3 that you've applied? Yes
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index d456beb43f..3c978d43aa 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@ -49,7 +49,7 @@ config DM_USB config SPL_DM_USB bool "Enable driver model for USB in SPL" - depends on DM_USB + depends on SPL_DM && DM_USB default y source "drivers/usb/host/Kconfig"
When CONFIG_SPL_DM_USB was added, it was added defaulted on without protection to ensure it didn't get set for non-DM SPL builds. This leads to unexpected and confusing failures when building a DM based U-Boot but with a non-DM SPL, as the defconfig is unlikely to have CONFIG_SPL_DM_USB actively disabled. Tweak the Kconfig to not enable this setting unless CONFIG_SPL_DM is set. Signed-off-by: Martyn Welch <martyn.welch@collabora.com> --- Changes in v3: - New in v3 Changes in v2: None drivers/usb/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)