diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-03 21:17:39 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-03 21:17:39 +0200 |
commit | edf068e9cf18d3b756c606cbd1d9ce312640646a (patch) | |
tree | c52f2376f8677c747295c55238e24ee7362a8cba /arch/arm/configs/eukrea_cpuimx35_defconfig | |
parent | 6021818e3d7933da580f83972cb0d8556df6659c (diff) | |
parent | 838d48cef45863acf8208dffe9e624fa6f8ce6f5 (diff) | |
download | barebox-edf068e9cf18d3b756c606cbd1d9ce312640646a.tar.gz barebox-edf068e9cf18d3b756c606cbd1d9ce312640646a.tar.xz |
Merge branch 'for-next/tftp'
Diffstat (limited to 'arch/arm/configs/eukrea_cpuimx35_defconfig')
-rw-r--r-- | arch/arm/configs/eukrea_cpuimx35_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/configs/eukrea_cpuimx35_defconfig b/arch/arm/configs/eukrea_cpuimx35_defconfig index 16ef4ccef3..f85e9a2439 100644 --- a/arch/arm/configs/eukrea_cpuimx35_defconfig +++ b/arch/arm/configs/eukrea_cpuimx35_defconfig @@ -54,8 +54,8 @@ CONFIG_NET=y CONFIG_NET_DHCP=y CONFIG_NET_NFS=y CONFIG_NET_PING=y -CONFIG_NET_TFTP=y -CONFIG_NET_TFTP_PUSH=y +CONFIG_CMD_TFTP=y +CONFIG_FS_TFTP=y CONFIG_NET_NETCONSOLE=y CONFIG_DRIVER_NET_FEC_IMX=y # CONFIG_SPI is not set |