diff options
| author | Tom Rini <trini@konsulko.com> | 2016-09-18 16:12:04 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-09-18 18:05:30 (GMT) |
| commit | 9a6535e05f17acf03e891266a650cb6029124743 (patch) | |
| tree | fec0cd46e0f050812deecf89b8bb349c8fdffd0e /configs | |
| parent | b58d3512442357cb023bce69f55c08b9fd21beaa (diff) | |
| parent | f9d7e17e844f9e94c39a8c95f73a4454097a6948 (diff) | |
| download | u-boot-fsl-qoriq-9a6535e05f17acf03e891266a650cb6029124743.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/uniphier_ld11_defconfig | 2 | ||||
| -rw-r--r-- | configs/uniphier_ld20_defconfig | 2 | ||||
| -rw-r--r-- | configs/uniphier_ld4_sld8_defconfig | 3 | ||||
| -rw-r--r-- | configs/uniphier_pro4_defconfig | 4 | ||||
| -rw-r--r-- | configs/uniphier_pxs2_ld6b_defconfig | 2 | ||||
| -rw-r--r-- | configs/uniphier_sld3_defconfig | 1 |
6 files changed, 2 insertions, 12 deletions
diff --git a/configs/uniphier_ld11_defconfig b/configs/uniphier_ld11_defconfig index 39d4150..6b27e71 100644 --- a/configs/uniphier_ld11_defconfig +++ b/configs/uniphier_ld11_defconfig @@ -24,8 +24,6 @@ CONFIG_SPL_OF_TRANSLATE=y CONFIG_GPIO_UNIPHIER=y CONFIG_MISC=y CONFIG_I2C_EEPROM=y -CONFIG_PINCTRL=y -CONFIG_SPL_PINCTRL=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/uniphier_ld20_defconfig b/configs/uniphier_ld20_defconfig index d5f901e..3c0313e 100644 --- a/configs/uniphier_ld20_defconfig +++ b/configs/uniphier_ld20_defconfig @@ -25,8 +25,6 @@ CONFIG_GPIO_UNIPHIER=y CONFIG_MISC=y CONFIG_I2C_EEPROM=y CONFIG_MMC_UNIPHIER=y -CONFIG_PINCTRL=y -CONFIG_SPL_PINCTRL=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/configs/uniphier_ld4_sld8_defconfig b/configs/uniphier_ld4_sld8_defconfig index f20ea29..4e2f401 100644 --- a/configs/uniphier_ld4_sld8_defconfig +++ b/configs/uniphier_ld4_sld8_defconfig @@ -30,10 +30,7 @@ CONFIG_NAND_DENALI=y CONFIG_SYS_NAND_DENALI_64BIT=y CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8 CONFIG_SPL_NAND_DENALI=y -CONFIG_PINCTRL=y -CONFIG_SPL_PINCTRL=y CONFIG_USB=y -CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_GENERIC=y CONFIG_USB_STORAGE=y diff --git a/configs/uniphier_pro4_defconfig b/configs/uniphier_pro4_defconfig index 8ee2e84..6bfb6da 100644 --- a/configs/uniphier_pro4_defconfig +++ b/configs/uniphier_pro4_defconfig @@ -29,8 +29,8 @@ CONFIG_NAND_DENALI=y CONFIG_SYS_NAND_DENALI_64BIT=y CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8 CONFIG_SPL_NAND_DENALI=y -CONFIG_PINCTRL=y -CONFIG_SPL_PINCTRL=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_GENERIC=y CONFIG_USB_STORAGE=y diff --git a/configs/uniphier_pxs2_ld6b_defconfig b/configs/uniphier_pxs2_ld6b_defconfig index 1d54cde..f88350e 100644 --- a/configs/uniphier_pxs2_ld6b_defconfig +++ b/configs/uniphier_pxs2_ld6b_defconfig @@ -30,8 +30,6 @@ CONFIG_NAND_DENALI=y CONFIG_SYS_NAND_DENALI_64BIT=y CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8 CONFIG_SPL_NAND_DENALI=y -CONFIG_PINCTRL=y -CONFIG_SPL_PINCTRL=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/configs/uniphier_sld3_defconfig b/configs/uniphier_sld3_defconfig index 9114225..26f3663 100644 --- a/configs/uniphier_sld3_defconfig +++ b/configs/uniphier_sld3_defconfig @@ -31,7 +31,6 @@ CONFIG_SYS_NAND_DENALI_64BIT=y CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8 CONFIG_SPL_NAND_DENALI=y CONFIG_USB=y -CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_GENERIC=y CONFIG_USB_STORAGE=y |