summaryrefslogtreecommitdiff
path: root/configs/uniphier_ld4_sld8_defconfig
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-09-18 12:12:04 -0400
committerTom Rini <trini@konsulko.com>2016-09-18 14:05:30 -0400
commit9a6535e05f17acf03e891266a650cb6029124743 (patch)
treefec0cd46e0f050812deecf89b8bb349c8fdffd0e /configs/uniphier_ld4_sld8_defconfig
parentb58d3512442357cb023bce69f55c08b9fd21beaa (diff)
parentf9d7e17e844f9e94c39a8c95f73a4454097a6948 (diff)
downloadu-boot-imx-9a6535e05f17acf03e891266a650cb6029124743.zip
u-boot-imx-9a6535e05f17acf03e891266a650cb6029124743.tar.gz
u-boot-imx-9a6535e05f17acf03e891266a650cb6029124743.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
Diffstat (limited to 'configs/uniphier_ld4_sld8_defconfig')
-rw-r--r--configs/uniphier_ld4_sld8_defconfig3
1 files changed, 0 insertions, 3 deletions
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