summaryrefslogtreecommitdiffstats
path: root/arch/sandbox
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-10-03 21:17:39 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-10-03 21:17:39 +0200
commitedf068e9cf18d3b756c606cbd1d9ce312640646a (patch)
treec52f2376f8677c747295c55238e24ee7362a8cba /arch/sandbox
parent6021818e3d7933da580f83972cb0d8556df6659c (diff)
parent838d48cef45863acf8208dffe9e624fa6f8ce6f5 (diff)
downloadbarebox-edf068e9cf18d3b756c606cbd1d9ce312640646a.tar.gz
barebox-edf068e9cf18d3b756c606cbd1d9ce312640646a.tar.xz
Merge branch 'for-next/tftp'
Diffstat (limited to 'arch/sandbox')
-rw-r--r--arch/sandbox/configs/sandbox_defconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sandbox/configs/sandbox_defconfig b/arch/sandbox/configs/sandbox_defconfig
index d105584a81..2ee7f782ed 100644
--- a/arch/sandbox/configs/sandbox_defconfig
+++ b/arch/sandbox/configs/sandbox_defconfig
@@ -21,7 +21,8 @@ CONFIG_CMD_PARTITION=y
CONFIG_NET=y
CONFIG_NET_DHCP=y
CONFIG_NET_PING=y
-CONFIG_NET_TFTP=y
+CONFIG_CMD_TFTP=y
+CONFIG_FS_TFTP=y
CONFIG_DRIVER_NET_TAP=y
# CONFIG_SPI is not set
CONFIG_FS_CRAMFS=y