projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
[oweals/u-boot.git]
/
configs
/
Colombus_defconfig
diff --git
a/configs/Colombus_defconfig
b/configs/Colombus_defconfig
index c21733d1abfbc076f2bfccf7562b8a02723a958a..feaeb9855ee1eca597ebe9fa83780be32cfc3e74 100644
(file)
--- a/
configs/Colombus_defconfig
+++ b/
configs/Colombus_defconfig
@@
-17,7
+17,6
@@
CONFIG_VIDEO_LCD_PANEL_EDP_4_LANE_1620M_VIA_ANX9804=y
CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-colombus"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL=y
-CONFIG_OF_BOARD_SETUP=y
CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII"
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set