diff options
| author | Tom Rini <trini@konsulko.com> | 2017-01-18 07:21:12 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-01-18 07:21:12 -0500 |
| commit | 2c45f8040ea1152d2ff0960f96905ca42ac089cd (patch) | |
| tree | a673b269a864c106ce729213593c62cbe9c1299d /configs | |
| parent | bfd07670a48d9fbf22646c93e07dcd8cbc8d0864 (diff) | |
| parent | 3296eeff8ae064a788d52325fcd4ce1fdf52ee06 (diff) | |
| download | u-boot-2c45f8040ea1152d2ff0960f96905ca42ac089cd.tar.gz | |
Merge git://git.denx.de/u-boot-samsung
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/arndale_defconfig | 2 | ||||
| -rw-r--r-- | configs/peach-pi_defconfig | 1 | ||||
| -rw-r--r-- | configs/peach-pit_defconfig | 1 | ||||
| -rw-r--r-- | configs/s5pc210_universal_defconfig | 3 | ||||
| -rw-r--r-- | configs/smdk5250_defconfig | 2 | ||||
| -rw-r--r-- | configs/snow_defconfig | 3 | ||||
| -rw-r--r-- | configs/spring_defconfig | 3 |
7 files changed, 15 insertions, 0 deletions
diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig index 2298def33d..a2cde44386 100644 --- a/configs/arndale_defconfig +++ b/configs/arndale_defconfig @@ -32,4 +32,6 @@ CONFIG_SOUND_MAX98095=y CONFIG_SOUND_WM8994=y CONFIG_USB=y CONFIG_DM_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y diff --git a/configs/peach-pi_defconfig b/configs/peach-pi_defconfig index 42b9f258b0..440cbcca0c 100644 --- a/configs/peach-pi_defconfig +++ b/configs/peach-pi_defconfig @@ -61,5 +61,6 @@ CONFIG_DISPLAY=y CONFIG_VIDEO_BRIDGE=y CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y CONFIG_LCD=y +CONFIG_VIDCONSOLE_AS_LCD=y CONFIG_TPM=y CONFIG_ERRNO_STR=y diff --git a/configs/peach-pit_defconfig b/configs/peach-pit_defconfig index 7b4ebfe77f..d12e1a9d5e 100644 --- a/configs/peach-pit_defconfig +++ b/configs/peach-pit_defconfig @@ -61,5 +61,6 @@ CONFIG_DISPLAY=y CONFIG_VIDEO_BRIDGE=y CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y CONFIG_LCD=y +CONFIG_VIDCONSOLE_AS_LCD=y CONFIG_TPM=y CONFIG_ERRNO_STR=y diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig index fad2b43ba2..d9dfcba83d 100644 --- a/configs/s5pc210_universal_defconfig +++ b/configs/s5pc210_universal_defconfig @@ -33,6 +33,9 @@ CONFIG_MMC_DW=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y CONFIG_MMC_SDHCI_S5P=y +CONFIG_DM_PMIC=y +CONFIG_DM_PMIC_MAX8998=y +CONFIG_SYS_I2C_S3C24X0=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig index 4ef41437a2..a34f915d55 100644 --- a/configs/smdk5250_defconfig +++ b/configs/smdk5250_defconfig @@ -44,6 +44,8 @@ CONFIG_SOUND_WM8994=y CONFIG_EXYNOS_SPI=y CONFIG_USB=y CONFIG_DM_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y CONFIG_VIDEO_BRIDGE=y CONFIG_ERRNO_STR=y diff --git a/configs/snow_defconfig b/configs/snow_defconfig index ef3cfa1519..2ef3774041 100644 --- a/configs/snow_defconfig +++ b/configs/snow_defconfig @@ -62,6 +62,8 @@ CONFIG_EXYNOS_SPI=y CONFIG_TPM_TIS_INFINEON=y CONFIG_USB=y CONFIG_DM_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y CONFIG_DM_VIDEO=y CONFIG_DISPLAY=y @@ -69,5 +71,6 @@ CONFIG_VIDEO_BRIDGE=y CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y CONFIG_VIDEO_BRIDGE_NXP_PTN3460=y CONFIG_LCD=y +CONFIG_VIDCONSOLE_AS_LCD=y CONFIG_TPM=y CONFIG_ERRNO_STR=y diff --git a/configs/spring_defconfig b/configs/spring_defconfig index 3bd8644276..243a9ec540 100644 --- a/configs/spring_defconfig +++ b/configs/spring_defconfig @@ -62,11 +62,14 @@ CONFIG_EXYNOS_SPI=y CONFIG_TPM_TIS_INFINEON=y CONFIG_USB=y CONFIG_DM_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y CONFIG_DM_VIDEO=y CONFIG_DISPLAY=y CONFIG_VIDEO_BRIDGE=y CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y CONFIG_LCD=y +CONFIG_VIDCONSOLE_AS_LCD=y CONFIG_TPM=y CONFIG_ERRNO_STR=y |