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/ppc | |
| parent | 6021818e3d7933da580f83972cb0d8556df6659c (diff) | |
| parent | 838d48cef45863acf8208dffe9e624fa6f8ce6f5 (diff) | |
| download | barebox-edf068e9cf18d3b756c606cbd1d9ce312640646a.tar.gz barebox-edf068e9cf18d3b756c606cbd1d9ce312640646a.tar.xz | |
Merge branch 'for-next/tftp'
Diffstat (limited to 'arch/ppc')
| -rw-r--r-- | arch/ppc/configs/pcm030_defconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/ppc/configs/pcm030_defconfig b/arch/ppc/configs/pcm030_defconfig index c03750293c..d2ff16c71b 100644 --- a/arch/ppc/configs/pcm030_defconfig +++ b/arch/ppc/configs/pcm030_defconfig @@ -31,7 +31,8 @@ CONFIG_CMD_UNCOMPRESS=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_ARCH_MPC5XXX=y CONFIG_MACH_PHYCORE_MPC5200B_TINY=y CONFIG_DRIVER_NET_MPC5200=y |