diff options
author | Tom Rini <trini@konsulko.com> | 2015-12-11 09:06:51 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2015-12-11 09:06:51 -0500 |
commit | a5d4785ccb4ae8c5414490b14a9112a944318217 (patch) | |
tree | 74d76f621df6a201b4a6fe90bd31b8154247deb4 /configs/i12-tvbox_defconfig | |
parent | 0305be1087a0d3b7058c5761e9cbc26a1b3fbd2c (diff) | |
parent | bb3654629a6b2ab131de96489f70421f6a848c70 (diff) |
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
Diffstat (limited to 'configs/i12-tvbox_defconfig')
-rw-r--r-- | configs/i12-tvbox_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/configs/i12-tvbox_defconfig b/configs/i12-tvbox_defconfig index ad03341cfa0..a15a15ad4ba 100644 --- a/configs/i12-tvbox_defconfig +++ b/configs/i12-tvbox_defconfig @@ -12,5 +12,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,MACPWR=SUNXI_GPH(21)" # CONFIG_CMD_FPGA is not set CONFIG_CMD_GPIO=y CONFIG_ETH_DESIGNWARE=y -CONFIG_SYS_NS16550=y CONFIG_USB_EHCI_HCD=y |