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 tag 'fsl-qoriq-for-v2018.11-rc1' of git://git.denx.de/u-boot-fsl-qoriq
[oweals/u-boot.git]
/
configs
/
10m50_defconfig
diff --git
a/configs/10m50_defconfig
b/configs/10m50_defconfig
index 8635bf8716b9c7aaef8fb811df3f217ee02faee7..119cbcd354a06f93ea4f8c3fdbf860e3a0c9895f 100644
(file)
--- a/
configs/10m50_defconfig
+++ b/
configs/10m50_defconfig
@@
-1,6
+1,5
@@
CONFIG_NIOS2=y
CONFIG_SYS_CONFIG_NAME="10m50_devboard"
CONFIG_NIOS2=y
CONFIG_SYS_CONFIG_NAME="10m50_devboard"
-CONFIG_DEFAULT_DEVICE_TREE="10m50_devboard"
CONFIG_NR_DRAM_BANKS=1
CONFIG_FIT=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_FIT=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
@@
-17,6
+16,7
@@
CONFIG_CMD_DHCP=y
# CONFIG_CMD_NFS is not set
CONFIG_CMD_MII=y
CONFIG_CMD_PING=y
# CONFIG_CMD_NFS is not set
CONFIG_CMD_MII=y
CONFIG_CMD_PING=y
+CONFIG_DEFAULT_DEVICE_TREE="10m50_devboard"
CONFIG_ENV_IS_IN_FLASH=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_DM_GPIO=y
CONFIG_ENV_IS_IN_FLASH=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_DM_GPIO=y