projects
/
platform
/
kernel
/
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 git://git.denx.de/u-boot-sh
[platform/kernel/u-boot.git]
/
configs
/
ls1046aqds_defconfig
diff --git
a/configs/ls1046aqds_defconfig
b/configs/ls1046aqds_defconfig
index
3d6e5c0
..
30f9d82
100644
(file)
--- a/
configs/ls1046aqds_defconfig
+++ b/
configs/ls1046aqds_defconfig
@@
-43,10
+43,12
@@
CONFIG_SPI_FLASH=y
CONFIG_SF_DEFAULT_BUS=1
CONFIG_PHYLIB=y
CONFIG_E1000=y
+CONFIG_FMAN_ENET=y
CONFIG_PCI=y
CONFIG_DM_PCI=y
CONFIG_DM_PCI_COMPAT=y
CONFIG_PCIE_LAYERSCAPE=y
+CONFIG_SYS_QE_FMAN_FW_IN_NOR=y
CONFIG_DM_SCSI=y
CONFIG_SYS_NS16550=y
CONFIG_SPI=y