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 git://git.denx.de/u-boot-i2c
[oweals/u-boot.git]
/
configs
/
MPC832XEMDS_SLAVE_defconfig
diff --git
a/configs/MPC832XEMDS_SLAVE_defconfig
b/configs/MPC832XEMDS_SLAVE_defconfig
index c1f307cca1e461f194201de008544549757bb5e1..682a9a833730f18d1c250792222734d26289eade 100644
(file)
--- a/
configs/MPC832XEMDS_SLAVE_defconfig
+++ b/
configs/MPC832XEMDS_SLAVE_defconfig
@@
-14,9
+14,6
@@
CONFIG_CMD_I2C=y
CONFIG_CMD_PCI=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_PING=y
-CONFIG_BOOTP_BOOTPATH=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_HOSTNAME=y
# CONFIG_MMC is not set
CONFIG_MTD_NOR_FLASH=y
CONFIG_SYS_NS16550=y