diff options
| author | Tom Rini <trini@konsulko.com> | 2016-06-12 12:52:33 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-06-12 12:52:33 -0400 |
| commit | 672a45e828039c20e5165af95623554bdc31862d (patch) | |
| tree | 5d79e136c39e99d79da470abe309c350c1ece289 /configs | |
| parent | b10335009667fee493fbce59bbeb0504d0ca9ff0 (diff) | |
| parent | 1a83fb4a17d959d7b037999ab7ed7e62429abe34 (diff) | |
| download | talos-obmc-uboot-672a45e828039c20e5165af95623554bdc31862d.tar.gz talos-obmc-uboot-672a45e828039c20e5165af95623554bdc31862d.zip | |
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/Mele_A1000G_quad_defconfig | 1 | ||||
| -rw-r--r-- | configs/Wobo_i5_defconfig | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/configs/Mele_A1000G_quad_defconfig b/configs/Mele_A1000G_quad_defconfig index b3f825e33f..2ac2596dce 100644 --- a/configs/Mele_A1000G_quad_defconfig +++ b/configs/Mele_A1000G_quad_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_SUNXI=y CONFIG_MACH_SUN6I=y CONFIG_DRAM_ZQ=120 +CONFIG_INITIAL_USB_SCAN_DELAY=2000 CONFIG_USB1_VBUS_PIN="PC27" CONFIG_USB2_VBUS_PIN="" CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-mele-a1000g-quad" diff --git a/configs/Wobo_i5_defconfig b/configs/Wobo_i5_defconfig index fc43cc5fb1..17ed968597 100644 --- a/configs/Wobo_i5_defconfig +++ b/configs/Wobo_i5_defconfig @@ -11,3 +11,5 @@ CONFIG_SPL=y # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set CONFIG_USB_EHCI_HCD=y +CONFIG_AXP_ALDO3_VOLT=3300 +CONFIG_AXP_ALDO4_VOLT=3300 |
