diff mbox

[U-Boot,v2,12/22] x86: ivybridge: kconfig: Imply platform specific drivers

Message ID 1501421008-5737-13-git-send-email-bmeng.cn@gmail.com
State Accepted
Commit a5b212942bb6cf0cc9fd5dd85241a84c04a33ba4
Delegated to: Bin Meng
Headers show

Commit Message

Bin Meng July 30, 2017, 1:23 p.m. UTC 
Imply drivers that are working with Ivybridge platform in the
platform Kconfig.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>

---

Changes in v2:
- imply ENV_IS_IN_SPI_FLASH for ivybridge

 arch/x86/cpu/ivybridge/Kconfig      | 5 +++++
 configs/chromebook_link64_defconfig | 5 -----
 configs/chromebook_link_defconfig   | 5 -----
 configs/chromebox_panther_defconfig | 5 -----
 configs/cougarcanyon2_defconfig     | 5 +----
 5 files changed, 6 insertions(+), 19 deletions(-)

Comments

Simon Glass Aug. 1, 2017, 9:12 a.m. UTC | #1 
On 30 July 2017 at 07:23, Bin Meng <bmeng.cn@gmail.com> wrote:
> Imply drivers that are working with Ivybridge platform in the
> platform Kconfig.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
>
> ---
>
> Changes in v2:
> - imply ENV_IS_IN_SPI_FLASH for ivybridge
>
>  arch/x86/cpu/ivybridge/Kconfig      | 5 +++++
>  configs/chromebook_link64_defconfig | 5 -----
>  configs/chromebook_link_defconfig   | 5 -----
>  configs/chromebox_panther_defconfig | 5 -----
>  configs/cougarcanyon2_defconfig     | 5 +----
>  5 files changed, 6 insertions(+), 19 deletions(-)

Reviewed-by: Simon Glass <sjg@chromium.org>
Bin Meng Aug. 1, 2017, 12:23 p.m. UTC | #2 
On Tue, Aug 1, 2017 at 5:12 PM, Simon Glass <sjg@chromium.org> wrote:
> On 30 July 2017 at 07:23, Bin Meng <bmeng.cn@gmail.com> wrote:
>> Imply drivers that are working with Ivybridge platform in the
>> platform Kconfig.
>>
>> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
>>
>> ---
>>
>> Changes in v2:
>> - imply ENV_IS_IN_SPI_FLASH for ivybridge
>>
>>  arch/x86/cpu/ivybridge/Kconfig      | 5 +++++
>>  configs/chromebook_link64_defconfig | 5 -----
>>  configs/chromebook_link_defconfig   | 5 -----
>>  configs/chromebox_panther_defconfig | 5 -----
>>  configs/cougarcanyon2_defconfig     | 5 +----
>>  5 files changed, 6 insertions(+), 19 deletions(-)
>
> Reviewed-by: Simon Glass <sjg@chromium.org>

applied to u-boot-x86, thanks!
diff mbox

Patch

diff --git a/arch/x86/cpu/ivybridge/Kconfig b/arch/x86/cpu/ivybridge/Kconfig
index 5df5e3a..82af7ac 100644
--- a/arch/x86/cpu/ivybridge/Kconfig
+++ b/arch/x86/cpu/ivybridge/Kconfig
@@ -10,6 +10,11 @@  config NORTHBRIDGE_INTEL_IVYBRIDGE
 	select CACHE_MRC_BIN if HAVE_MRC
 	imply HAVE_INTEL_ME
 	imply ENABLE_MRC_CACHE
+	imply ENV_IS_IN_SPI_FLASH
+	imply ICH_SPI
+	imply SCSI
+	imply SPI_FLASH
+	imply VIDEO_VESA
 
 if NORTHBRIDGE_INTEL_IVYBRIDGE
 
diff --git a/configs/chromebook_link64_defconfig b/configs/chromebook_link64_defconfig
index ab01909..9cdd84c 100644
--- a/configs/chromebook_link64_defconfig
+++ b/configs/chromebook_link64_defconfig
@@ -18,7 +18,6 @@  CONFIG_FIT=y
 CONFIG_SPL_LOAD_FIT=y
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
-CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 CONFIG_SPL_CPU_SUPPORT=y
@@ -57,7 +56,6 @@  CONFIG_REGMAP=y
 CONFIG_SPL_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_SPL_SYSCON=y
-CONFIG_SCSI=y
 CONFIG_DM_SCSI=y
 CONFIG_BLK=y
 CONFIG_CPU=y
@@ -65,7 +63,6 @@  CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_INTEL=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_LPC=y
-CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_WINBOND=y
@@ -73,11 +70,9 @@  CONFIG_DEBUG_UART_BASE=0x3f8
 CONFIG_DEBUG_UART_CLOCK=1843200
 CONFIG_DEBUG_UART_BOARD_INIT=y
 CONFIG_SYS_NS16550=y
-CONFIG_ICH_SPI=y
 CONFIG_TPM_TIS_LPC=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y
-CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
 CONFIG_VIDEO_IVYBRIDGE_IGD=y
diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig
index b1e2b6a..eb272cc 100644
--- a/configs/chromebook_link_defconfig
+++ b/configs/chromebook_link_defconfig
@@ -10,7 +10,6 @@  CONFIG_HAVE_VGA_BIOS=y
 CONFIG_FIT=y
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
-CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_CPU=y
@@ -39,7 +38,6 @@  CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
-CONFIG_SCSI=y
 CONFIG_DM_SCSI=y
 CONFIG_BLK=y
 CONFIG_CPU=y
@@ -47,7 +45,6 @@  CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_INTEL=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_LPC=y
-CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_WINBOND=y
@@ -55,11 +52,9 @@  CONFIG_DEBUG_UART_BASE=0x3f8
 CONFIG_DEBUG_UART_CLOCK=1843200
 CONFIG_DEBUG_UART_BOARD_INIT=y
 CONFIG_SYS_NS16550=y
-CONFIG_ICH_SPI=y
 CONFIG_TPM_TIS_LPC=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y
-CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
 CONFIG_VIDEO_IVYBRIDGE_IGD=y
diff --git a/configs/chromebox_panther_defconfig b/configs/chromebox_panther_defconfig
index d86d416..12e87d1 100644
--- a/configs/chromebox_panther_defconfig
+++ b/configs/chromebox_panther_defconfig
@@ -7,7 +7,6 @@  CONFIG_HAVE_VGA_BIOS=y
 CONFIG_FIT=y
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
-CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_IMLS is not set
@@ -35,22 +34,18 @@  CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
-CONFIG_SCSI=y
 CONFIG_DM_SCSI=y
 CONFIG_BLK=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_LPC=y
-CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_RTL8169=y
 CONFIG_SYS_NS16550=y
-CONFIG_ICH_SPI=y
 CONFIG_TPM_TIS_LPC=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y
-CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
 CONFIG_CONSOLE_SCROLL_LINES=5
diff --git a/configs/cougarcanyon2_defconfig b/configs/cougarcanyon2_defconfig
index 17ea047..fabed53 100644
--- a/configs/cougarcanyon2_defconfig
+++ b/configs/cougarcanyon2_defconfig
@@ -3,7 +3,6 @@  CONFIG_VENDOR_INTEL=y
 CONFIG_DEFAULT_DEVICE_TREE="cougarcanyon2"
 CONFIG_TARGET_COUGARCANYON2=y
 # CONFIG_ENABLE_MRC_CACHE is not set
-CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_IMLS is not set
@@ -28,10 +27,8 @@  CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
-CONFIG_SCSI=y
-CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SYS_NS16550=y
-CONFIG_ICH_SPI=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y
+# CONFIG_VIDEO_VESA is not set