Hi Lukasz, Quoting Lukasz Majewski (2019-08-23 23:05:41) > > Quoting Lukasz Majewski (2019-08-23 10:37:28) > > > On Sun, 18 Aug 2019 17:16:06 +0200 > > > Jonas Smedegaard <[email protected]> wrote: > > > > > > > commit 37304aaf60bf ("Convert CONFIG_USE_PREBOOT and > > > > CONFIG_PREBOOT to Kconfig") intended to support CONFIG_PREBOOT, > > > > but include/configs/sunxi-common.h hardcodes preboot as part of > > > > internally defined CONSOLE_STDIN_SETTINGS, silently ignoring any > > > > board-specific CONFIG_PREBOOT. > > > > > > > > Tested-by: Jonas Smedegaard <[email protected]> > > > > Signed-off-by: Jonas Smedegaard <[email protected]> > > > > Series-Cc: Jagan Teki <[email protected]> > > > > --- > > > > > > > > include/configs/sunxi-common.h | 7 ++++++- > > > > 1 file changed, 6 insertions(+), 1 deletion(-) > > > > > > > > diff --git a/include/configs/sunxi-common.h > > > > b/include/configs/sunxi-common.h index d7133a73fc..2069884b63 > > > > 100644 --- a/include/configs/sunxi-common.h > > > > +++ b/include/configs/sunxi-common.h > > > > @@ -432,8 +432,13 @@ extern int soft_i2c_gpio_scl; > > > > #include <config_distro_bootcmd.h> > > > > > > > > #ifdef CONFIG_USB_KEYBOARD > > > > +#ifdef CONFIG_USE_PREBOOT > > > > +#ifndef CONFIG_PREBOOT > > > > +#define CONFIG_PREBOOT \ > > > > + "usb start" > > > > > > Shouldn't this (CONFIG_PREBOOT) be set in the Kconfig? > > > > My changeset ensures that _if_ CONFIG_PREBOOT is set in Kconfig then > > it is not _also_ set in header file. > > > > Reason for my approach was to keep the changeset minimal. > > I think I have been misunderstood...
Likewise... :-)
> The patch to which you referred in the commit message:
>
> commit 37304aaf60bf ("Convert CONFIG_USE_PREBOOT and CONFIG_PREBOOT to
> Kconfig")
>
> was supposed to move setting of CONFIG_PREBOOT to Kconfig.
>
> As it broke your setup - I proposed that you could add your fix not to
> sunxi-common.h, but to Kconfig. In that way you would benefit from the
> patch you refer to.
commit 37304aaf60bf did not break my setup.
This proposed patch _improves_ commit 37304aaf60bf to make it possible
to pass CONFIG_USE_PREBOOT in Kconfig on sunxi devices.
In fact, that is the very thing that next patch in this patchset does -
which is what fixes my device: My device was broken also before commit
37304aaf60bf.
This patchset still applies when unfuzzed. Should I make a non-change
v2 of this patch, or do anyone have other comments on it?
- Jonas
--
* Jonas Smedegaard - idealist & Internet-arkitekt
* Tlf.: +45 40843136 Website: http://dr.jones.dk/
[x] quote me freely [ ] ask before reusing [ ] keep private
signature.asc
Description: signature
