| Message ID | 20190426035922.20596-47-sjg@chromium.org |
|---|---|
| State | Superseded |
| Delegated to: | Bin Meng |
| Headers | show |
| Series | x86: Add support for booting from TPL | expand |
Hi Simon, On Fri, Apr 26, 2019 at 12:00 PM Simon Glass <sjg@chromium.org> wrote: > > With the move to Kconfig this option should be set in Kconfig, not in the > config header file. Move it. > > Signed-off-by: Simon Glass <sjg@chromium.org> > --- > > Changes in v2: > - Add new patch to enable the RTC in Kconfig > > arch/Kconfig | 1 + > configs/chromebook_link_defconfig | 1 + > include/configs/x86-common.h | 1 - > 3 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/arch/Kconfig b/arch/Kconfig > index a1d1ac301d6..2a93b72dbc4 100644 > --- a/arch/Kconfig > +++ b/arch/Kconfig > @@ -165,6 +165,7 @@ config X86 > imply USB_ETHER_SMSC95XX > imply USB_HOST_ETHER > imply PCH > + imply RTC_MC146818 > > # Thing to enable for when SPL/TPL are enabled: SPL > imply SPL_DM > diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig > index 6058dfaf0f2..b1c5095ec92 100644 > --- a/configs/chromebook_link_defconfig > +++ b/configs/chromebook_link_defconfig > @@ -53,6 +53,7 @@ CONFIG_DM_I2C=y > CONFIG_SYS_I2C_INTEL=y > CONFIG_CROS_EC=y > CONFIG_CROS_EC_LPC=y > +CONFIG_RTC_MC146818=y This has been implied in arch/Kconfig above, why adding another one here? > CONFIG_SYS_NS16550=y > CONFIG_SOUND=y > CONFIG_SPI=y Regards, Bin
diff --git a/arch/Kconfig b/arch/Kconfig index a1d1ac301d6..2a93b72dbc4 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -165,6 +165,7 @@ config X86 imply USB_ETHER_SMSC95XX imply USB_HOST_ETHER imply PCH + imply RTC_MC146818 # Thing to enable for when SPL/TPL are enabled: SPL imply SPL_DM diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig index 6058dfaf0f2..b1c5095ec92 100644 --- a/configs/chromebook_link_defconfig +++ b/configs/chromebook_link_defconfig @@ -53,6 +53,7 @@ CONFIG_DM_I2C=y CONFIG_SYS_I2C_INTEL=y CONFIG_CROS_EC=y CONFIG_CROS_EC_LPC=y +CONFIG_RTC_MC146818=y CONFIG_SYS_NS16550=y CONFIG_SOUND=y CONFIG_SPI=y diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 4180b25f977..7fcf76a6bf2 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -36,7 +36,6 @@ /*----------------------------------------------------------------------- * Real Time Clock Configuration */ -#define CONFIG_RTC_MC146818 #define CONFIG_SYS_ISA_IO_BASE_ADDRESS 0 #define CONFIG_SYS_ISA_IO CONFIG_SYS_ISA_IO_BASE_ADDRESS
With the move to Kconfig this option should be set in Kconfig, not in the config header file. Move it. Signed-off-by: Simon Glass <sjg@chromium.org> --- Changes in v2: - Add new patch to enable the RTC in Kconfig arch/Kconfig | 1 + configs/chromebook_link_defconfig | 1 + include/configs/x86-common.h | 1 - 3 files changed, 2 insertions(+), 1 deletion(-)