diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-09-05 12:59:54 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-09-05 12:59:54 +0200 |
| commit | 6662e16dbbe426933a09d0564943b43fa10b9457 (patch) | |
| tree | db85d5358cfc50a3941b6a5a26e3b536e4092b92 /arch/ppc/configs | |
| parent | bed1a6ffab6ba8f59146af07ccbdc7a625b6496f (diff) | |
| parent | fa345fa012fda102e6e0f428f45bbe5c0bfcff66 (diff) | |
| download | barebox-6662e16dbbe426933a09d0564943b43fa10b9457.tar.gz barebox-6662e16dbbe426933a09d0564943b43fa10b9457.tar.xz | |
Merge branch 'for-next/ppc'
Conflicts:
arch/ppc/boards/freescale-p2020rdb/p2020rdb.c
arch/ppc/configs/p2020rdb_defconfig
arch/ppc/mach-mpc85xx/include/mach/immap_85xx.h
Diffstat (limited to 'arch/ppc/configs')
| -rw-r--r-- | arch/ppc/configs/p2020rdb_defconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/ppc/configs/p2020rdb_defconfig b/arch/ppc/configs/p2020rdb_defconfig index c040635e70..7690327424 100644 --- a/arch/ppc/configs/p2020rdb_defconfig +++ b/arch/ppc/configs/p2020rdb_defconfig @@ -21,6 +21,12 @@ CONFIG_MALLOC_SIZE=0x200000 CONFIG_BAUDRATE=115200 CONFIG_DRIVER_SERIAL_NS16550=y CONFIG_RELOCATABLE=y +CONFIG_DRIVER_NET_GIANFAR=y +CONFIG_NET=y +CONFIG_NET_PING=y +CONFIG_NET_TFTP=y +CONFIG_PING=y +CONFIG_TFTP=y CONFIG_I2C=y CONFIG_I2C_IMX=y CONFIG_CMD_I2C=y |