| Message ID | 20181118151435.111676-3-sjg@chromium.org |
|---|---|
| State | Accepted |
| Delegated to: | Simon Glass |
| Headers | show |
| Series | Various fixes and improvements | expand |
Hi Simon, On 18/11/2018 16:14, Simon Glass wrote: > In some cases it is necessary to read the keyboard in early phases of > U-Boot. The cros_ec keyboard is kept in the misc directory. Update the > config to allow this. > > Signed-off-by: Simon Glass <sjg@chromium.org> > --- > > Changes in v2: > - Leave the misc uclass alone since it stops sandbox_spl working > > drivers/misc/Kconfig | 72 +++++++++++++++++++++++++++++++++++++++++++ > drivers/misc/Makefile | 8 +++-- > 2 files changed, 77 insertions(+), 3 deletions(-) > > diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig > index 48febc47d26..802046cf966 100644 > --- a/drivers/misc/Kconfig > +++ b/drivers/misc/Kconfig > @@ -13,6 +13,24 @@ config MISC > set of generic read, write and ioctl methods may be used to > access the device. > > +config SPL_MISC > + bool "Enable Driver Model for Misc drivers in SPL" > + depends on SPL_DM > + help > + Enable driver model for miscellaneous devices. This class is > + used only for those do not fit other more general classes. A > + set of generic read, write and ioctl methods may be used to > + access the device. Platforms currently use CONFIG_SPL_DRIVERS_MISC_SUPPORT and CONFIG_MISC to enable the MISC drivers in the SPL. JJ > + > +config TPL_MISC > + bool "Enable Driver Model for Misc drivers in TPL" > + depends on TPL_DM > + help > + Enable driver model for miscellaneous devices. This class is > + used only for those do not fit other more general classes. A > + set of generic read, write and ioctl methods may be used to > + access the device. > + > config ALTERA_SYSID > bool "Altera Sysid support" > depends on MISC > @@ -68,6 +86,24 @@ config CROS_EC > control access to the battery and main PMIC depending on the > device. You can use the 'crosec' command to access it. > > +config SPL_CROS_EC > + bool "Enable Chrome OS EC in SPL" > + help > + Enable access to the Chrome OS EC in SPL. This is a separate > + microcontroller typically available on a SPI bus on Chromebooks. It > + provides access to the keyboard, some internal storage and may > + control access to the battery and main PMIC depending on the > + device. You can use the 'crosec' command to access it. > + > +config TPL_CROS_EC > + bool "Enable Chrome OS EC in TPL" > + help > + Enable access to the Chrome OS EC in TPL. This is a separate > + microcontroller typically available on a SPI bus on Chromebooks. It > + provides access to the keyboard, some internal storage and may > + control access to the battery and main PMIC depending on the > + device. You can use the 'crosec' command to access it. > + > config CROS_EC_I2C > bool "Enable Chrome OS EC I2C driver" > depends on CROS_EC > @@ -86,6 +122,24 @@ config CROS_EC_LPC > through a legacy port interface, so on x86 machines the main > function of the EC is power and thermal management. > > +config SPL_CROS_EC_LPC > + bool "Enable Chrome OS EC LPC driver in SPL" > + depends on CROS_EC > + help > + Enable I2C access to the Chrome OS EC. This is used on x86 > + Chromebooks such as link and falco. The keyboard is provided > + through a legacy port interface, so on x86 machines the main > + function of the EC is power and thermal management. > + > +config TPL_CROS_EC_LPC > + bool "Enable Chrome OS EC LPC driver in TPL" > + depends on CROS_EC > + help > + Enable I2C access to the Chrome OS EC. This is used on x86 > + Chromebooks such as link and falco. The keyboard is provided > + through a legacy port interface, so on x86 machines the main > + function of the EC is power and thermal management. > + > config CROS_EC_SANDBOX > bool "Enable Chrome OS EC sandbox driver" > depends on CROS_EC && SANDBOX > @@ -95,6 +149,24 @@ config CROS_EC_SANDBOX > EC flash read/write/erase support and a few other things. It is > enough to perform a Chrome OS verified boot on sandbox. > > +config SPL_CROS_EC_SANDBOX > + bool "Enable Chrome OS EC sandbox driver in SPL" > + depends on SPL_CROS_EC && SANDBOX > + help > + Enable a sandbox emulation of the Chrome OS EC in SPL. This supports > + keyboard (use the -l flag to enable the LCD), verified boot context, > + EC flash read/write/erase support and a few other things. It is > + enough to perform a Chrome OS verified boot on sandbox. > + > +config TPL_CROS_EC_SANDBOX > + bool "Enable Chrome OS EC sandbox driver in TPL" > + depends on TPL_CROS_EC && SANDBOX > + help > + Enable a sandbox emulation of the Chrome OS EC in TPL. This supports > + keyboard (use the -l flag to enable the LCD), verified boot context, > + EC flash read/write/erase support and a few other things. It is > + enough to perform a Chrome OS verified boot on sandbox. > + > config CROS_EC_SPI > bool "Enable Chrome OS EC SPI driver" > depends on CROS_EC > diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile > index 302d4415927..6efb8134b14 100644 > --- a/drivers/misc/Makefile > +++ b/drivers/misc/Makefile > @@ -4,11 +4,13 @@ > # Wolfgang Denk, DENX Software Engineering, wd@denx.de. > > obj-$(CONFIG_MISC) += misc-uclass.o > + > +obj-$(CONFIG_$(SPL_TPL_)CROS_EC) += cros_ec.o > +obj-$(CONFIG_$(SPL_TPL_)CROS_EC_SANDBOX) += cros_ec_sandbox.o > +obj-$(CONFIG_$(SPL_TPL_)CROS_EC_LPC) += cros_ec_lpc.o > + > ifndef CONFIG_SPL_BUILD > -obj-$(CONFIG_CROS_EC) += cros_ec.o > -obj-$(CONFIG_CROS_EC_LPC) += cros_ec_lpc.o > obj-$(CONFIG_CROS_EC_I2C) += cros_ec_i2c.o > -obj-$(CONFIG_CROS_EC_SANDBOX) += cros_ec_sandbox.o > obj-$(CONFIG_CROS_EC_SPI) += cros_ec_spi.o > endif >
Hi Jean-Jacques, On Tue, 20 Nov 2018 at 06:49, Jean-Jacques Hiblot <jjhiblot@ti.com> wrote: > > Hi Simon, > > On 18/11/2018 16:14, Simon Glass wrote: > > In some cases it is necessary to read the keyboard in early phases of > > U-Boot. The cros_ec keyboard is kept in the misc directory. Update the > > config to allow this. > > > > Signed-off-by: Simon Glass <sjg@chromium.org> > > --- > > > > Changes in v2: > > - Leave the misc uclass alone since it stops sandbox_spl working > > > > drivers/misc/Kconfig | 72 +++++++++++++++++++++++++++++++++++++++++++ > > drivers/misc/Makefile | 8 +++-- > > 2 files changed, 77 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig > > index 48febc47d26..802046cf966 100644 > > --- a/drivers/misc/Kconfig > > +++ b/drivers/misc/Kconfig > > @@ -13,6 +13,24 @@ config MISC > > set of generic read, write and ioctl methods may be used to > > access the device. > > > > +config SPL_MISC > > + bool "Enable Driver Model for Misc drivers in SPL" > > + depends on SPL_DM > > + help > > + Enable driver model for miscellaneous devices. This class is > > + used only for those do not fit other more general classes. A > > + set of generic read, write and ioctl methods may be used to > > + access the device. > > Platforms currently use CONFIG_SPL_DRIVERS_MISC_SUPPORT and CONFIG_MISC > to enable the MISC drivers in the SPL. This is a bit confusing but that is not my understanding of the situation. CONFIG_MISC enables UCLASS_MISC devices. The 'misc' drivers directory is included always in U-Boot proper. Yes the CONFIG_SPL_DRIVERS_MISC_SUPPORT option is for SPL only. But in my case I want an option to enable driver-model MISC devices in SPL/TPL. Oddly this is orthogonal to whether the drivers/misc directory itself is included in the build. Regards, Simon
On 31/01/2019 03:57, Simon Glass wrote: > Hi Jean-Jacques, > > On Tue, 20 Nov 2018 at 06:49, Jean-Jacques Hiblot <jjhiblot@ti.com> wrote: >> Hi Simon, >> >> On 18/11/2018 16:14, Simon Glass wrote: >>> In some cases it is necessary to read the keyboard in early phases of >>> U-Boot. The cros_ec keyboard is kept in the misc directory. Update the >>> config to allow this. >>> >>> Signed-off-by: Simon Glass <sjg@chromium.org> >>> --- >>> >>> Changes in v2: >>> - Leave the misc uclass alone since it stops sandbox_spl working >>> >>> drivers/misc/Kconfig | 72 +++++++++++++++++++++++++++++++++++++++++++ >>> drivers/misc/Makefile | 8 +++-- >>> 2 files changed, 77 insertions(+), 3 deletions(-) >>> >>> diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig >>> index 48febc47d26..802046cf966 100644 >>> --- a/drivers/misc/Kconfig >>> +++ b/drivers/misc/Kconfig >>> @@ -13,6 +13,24 @@ config MISC >>> set of generic read, write and ioctl methods may be used to >>> access the device. >>> >>> +config SPL_MISC >>> + bool "Enable Driver Model for Misc drivers in SPL" >>> + depends on SPL_DM >>> + help >>> + Enable driver model for miscellaneous devices. This class is >>> + used only for those do not fit other more general classes. A >>> + set of generic read, write and ioctl methods may be used to >>> + access the device. >> Platforms currently use CONFIG_SPL_DRIVERS_MISC_SUPPORT and CONFIG_MISC >> to enable the MISC drivers in the SPL. > This is a bit confusing but that is not my understanding of the situation. > > CONFIG_MISC enables UCLASS_MISC devices. The 'misc' drivers directory > is included always in U-Boot proper. Yes the > CONFIG_SPL_DRIVERS_MISC_SUPPORT option is for SPL only. > > But in my case I want an option to enable driver-model MISC devices in > SPL/TPL. Oddly this is orthogonal to whether the drivers/misc > directory itself is included in the build. Ok. that makes sense now. > > Regards, > Simon >
On Thu, 31 Jan 2019 at 02:39, Jean-Jacques Hiblot <jjhiblot@ti.com> wrote: > > > On 31/01/2019 03:57, Simon Glass wrote: > > Hi Jean-Jacques, > > > > On Tue, 20 Nov 2018 at 06:49, Jean-Jacques Hiblot <jjhiblot@ti.com> wrote: > >> Hi Simon, > >> > >> On 18/11/2018 16:14, Simon Glass wrote: > >>> In some cases it is necessary to read the keyboard in early phases of > >>> U-Boot. The cros_ec keyboard is kept in the misc directory. Update the > >>> config to allow this. > >>> > >>> Signed-off-by: Simon Glass <sjg@chromium.org> > >>> --- > >>> > >>> Changes in v2: > >>> - Leave the misc uclass alone since it stops sandbox_spl working > >>> > >>> drivers/misc/Kconfig | 72 +++++++++++++++++++++++++++++++++++++++++++ > >>> drivers/misc/Makefile | 8 +++-- > >>> 2 files changed, 77 insertions(+), 3 deletions(-) > >>> > >>> diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig > >>> index 48febc47d26..802046cf966 100644 > >>> --- a/drivers/misc/Kconfig > >>> +++ b/drivers/misc/Kconfig > >>> @@ -13,6 +13,24 @@ config MISC > >>> set of generic read, write and ioctl methods may be used to > >>> access the device. > >>> > >>> +config SPL_MISC > >>> + bool "Enable Driver Model for Misc drivers in SPL" > >>> + depends on SPL_DM > >>> + help > >>> + Enable driver model for miscellaneous devices. This class is > >>> + used only for those do not fit other more general classes. A > >>> + set of generic read, write and ioctl methods may be used to > >>> + access the device. > >> Platforms currently use CONFIG_SPL_DRIVERS_MISC_SUPPORT and CONFIG_MISC > >> to enable the MISC drivers in the SPL. > > This is a bit confusing but that is not my understanding of the situation. > > > > CONFIG_MISC enables UCLASS_MISC devices. The 'misc' drivers directory > > is included always in U-Boot proper. Yes the > > CONFIG_SPL_DRIVERS_MISC_SUPPORT option is for SPL only. > > > > But in my case I want an option to enable driver-model MISC devices in > > SPL/TPL. Oddly this is orthogonal to whether the drivers/misc > > directory itself is included in the build. > > Ok. that makes sense now. Applied to u-boot-dm.
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 48febc47d26..802046cf966 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -13,6 +13,24 @@ config MISC set of generic read, write and ioctl methods may be used to access the device. +config SPL_MISC + bool "Enable Driver Model for Misc drivers in SPL" + depends on SPL_DM + help + Enable driver model for miscellaneous devices. This class is + used only for those do not fit other more general classes. A + set of generic read, write and ioctl methods may be used to + access the device. + +config TPL_MISC + bool "Enable Driver Model for Misc drivers in TPL" + depends on TPL_DM + help + Enable driver model for miscellaneous devices. This class is + used only for those do not fit other more general classes. A + set of generic read, write and ioctl methods may be used to + access the device. + config ALTERA_SYSID bool "Altera Sysid support" depends on MISC @@ -68,6 +86,24 @@ config CROS_EC control access to the battery and main PMIC depending on the device. You can use the 'crosec' command to access it. +config SPL_CROS_EC + bool "Enable Chrome OS EC in SPL" + help + Enable access to the Chrome OS EC in SPL. This is a separate + microcontroller typically available on a SPI bus on Chromebooks. It + provides access to the keyboard, some internal storage and may + control access to the battery and main PMIC depending on the + device. You can use the 'crosec' command to access it. + +config TPL_CROS_EC + bool "Enable Chrome OS EC in TPL" + help + Enable access to the Chrome OS EC in TPL. This is a separate + microcontroller typically available on a SPI bus on Chromebooks. It + provides access to the keyboard, some internal storage and may + control access to the battery and main PMIC depending on the + device. You can use the 'crosec' command to access it. + config CROS_EC_I2C bool "Enable Chrome OS EC I2C driver" depends on CROS_EC @@ -86,6 +122,24 @@ config CROS_EC_LPC through a legacy port interface, so on x86 machines the main function of the EC is power and thermal management. +config SPL_CROS_EC_LPC + bool "Enable Chrome OS EC LPC driver in SPL" + depends on CROS_EC + help + Enable I2C access to the Chrome OS EC. This is used on x86 + Chromebooks such as link and falco. The keyboard is provided + through a legacy port interface, so on x86 machines the main + function of the EC is power and thermal management. + +config TPL_CROS_EC_LPC + bool "Enable Chrome OS EC LPC driver in TPL" + depends on CROS_EC + help + Enable I2C access to the Chrome OS EC. This is used on x86 + Chromebooks such as link and falco. The keyboard is provided + through a legacy port interface, so on x86 machines the main + function of the EC is power and thermal management. + config CROS_EC_SANDBOX bool "Enable Chrome OS EC sandbox driver" depends on CROS_EC && SANDBOX @@ -95,6 +149,24 @@ config CROS_EC_SANDBOX EC flash read/write/erase support and a few other things. It is enough to perform a Chrome OS verified boot on sandbox. +config SPL_CROS_EC_SANDBOX + bool "Enable Chrome OS EC sandbox driver in SPL" + depends on SPL_CROS_EC && SANDBOX + help + Enable a sandbox emulation of the Chrome OS EC in SPL. This supports + keyboard (use the -l flag to enable the LCD), verified boot context, + EC flash read/write/erase support and a few other things. It is + enough to perform a Chrome OS verified boot on sandbox. + +config TPL_CROS_EC_SANDBOX + bool "Enable Chrome OS EC sandbox driver in TPL" + depends on TPL_CROS_EC && SANDBOX + help + Enable a sandbox emulation of the Chrome OS EC in TPL. This supports + keyboard (use the -l flag to enable the LCD), verified boot context, + EC flash read/write/erase support and a few other things. It is + enough to perform a Chrome OS verified boot on sandbox. + config CROS_EC_SPI bool "Enable Chrome OS EC SPI driver" depends on CROS_EC diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index 302d4415927..6efb8134b14 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -4,11 +4,13 @@ # Wolfgang Denk, DENX Software Engineering, wd@denx.de. obj-$(CONFIG_MISC) += misc-uclass.o + +obj-$(CONFIG_$(SPL_TPL_)CROS_EC) += cros_ec.o +obj-$(CONFIG_$(SPL_TPL_)CROS_EC_SANDBOX) += cros_ec_sandbox.o +obj-$(CONFIG_$(SPL_TPL_)CROS_EC_LPC) += cros_ec_lpc.o + ifndef CONFIG_SPL_BUILD -obj-$(CONFIG_CROS_EC) += cros_ec.o -obj-$(CONFIG_CROS_EC_LPC) += cros_ec_lpc.o obj-$(CONFIG_CROS_EC_I2C) += cros_ec_i2c.o -obj-$(CONFIG_CROS_EC_SANDBOX) += cros_ec_sandbox.o obj-$(CONFIG_CROS_EC_SPI) += cros_ec_spi.o endif
In some cases it is necessary to read the keyboard in early phases of U-Boot. The cros_ec keyboard is kept in the misc directory. Update the config to allow this. Signed-off-by: Simon Glass <sjg@chromium.org> --- Changes in v2: - Leave the misc uclass alone since it stops sandbox_spl working drivers/misc/Kconfig | 72 +++++++++++++++++++++++++++++++++++++++++++ drivers/misc/Makefile | 8 +++-- 2 files changed, 77 insertions(+), 3 deletions(-)