summaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-02-23 15:35:47 -0500
committerTom Rini <trini@konsulko.com>2016-02-23 15:35:47 -0500
commit52dd704bf8eda7ca039cdb398ec0b6895c3ef939 (patch)
tree16218aaacdd67330bfc1a6863a9f9dbcf73170fe /configs
parentb625fab7069cab52fd8e0c3dbb25e0d04d020173 (diff)
parentdc44fd8ae4be0a88123a90ae2b3acdec45290ecf (diff)
downloadtalos-obmc-uboot-52dd704bf8eda7ca039cdb398ec0b6895c3ef939.tar.gz
talos-obmc-uboot-52dd704bf8eda7ca039cdb398ec0b6895c3ef939.zip
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
Diffstat (limited to 'configs')
-rw-r--r--configs/orangepi_pc_defconfig3
-rw-r--r--configs/orangepi_plus_defconfig2
2 files changed, 4 insertions, 1 deletions
diff --git a/configs/orangepi_pc_defconfig b/configs/orangepi_pc_defconfig
index ea9ed874e8..aaf0f68c35 100644
--- a/configs/orangepi_pc_defconfig
+++ b/configs/orangepi_pc_defconfig
@@ -12,4 +12,5 @@ CONFIG_SPL=y
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set
CONFIG_CMD_GPIO=y
-CONFIG_R_I2C_ENABLE=y
+CONFIG_SY8106A_POWER=y
+CONFIG_USB_EHCI_HCD=y
diff --git a/configs/orangepi_plus_defconfig b/configs/orangepi_plus_defconfig
index 003a9c6c03..e52dcfc718 100644
--- a/configs/orangepi_plus_defconfig
+++ b/configs/orangepi_plus_defconfig
@@ -12,3 +12,5 @@ CONFIG_SPL=y
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set
CONFIG_CMD_GPIO=y
+CONFIG_SY8106A_POWER=y
+CONFIG_USB_EHCI_HCD=y
OpenPOWER on IntegriCloud