diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-01-07 11:57:51 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-01-07 11:57:51 +0100 |
| commit | 968cb4bb84f28a4ae51a7f1d58395aa83842de5c (patch) | |
| tree | 9dd885ac8f4f1329d3ee4d9aec18b9badcf8565c /arch | |
| parent | 32f9b1079a6ee088fce727b6827b6f1693ca8c0c (diff) | |
| parent | 217f390d8d7f9ff645ad7a96c566aa358a9e1ebb (diff) | |
| download | barebox-968cb4bb84f28a4ae51a7f1d58395aa83842de5c.tar.gz barebox-968cb4bb84f28a4ae51a7f1d58395aa83842de5c.tar.xz | |
Merge branch 'for-next/openrisc'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/openrisc/boards/generic/config.h | 2 | ||||
| -rw-r--r-- | arch/openrisc/boards/generic/generic.c | 7 | ||||
| -rw-r--r-- | arch/openrisc/configs/generic_defconfig | 6 |
3 files changed, 15 insertions, 0 deletions
diff --git a/arch/openrisc/boards/generic/config.h b/arch/openrisc/boards/generic/config.h index 95260cdc3f..6ebab42692 100644 --- a/arch/openrisc/boards/generic/config.h +++ b/arch/openrisc/boards/generic/config.h @@ -11,6 +11,8 @@ #define OPENRISC_SOPC_UART_FREQ CONFIG_SYS_CLK_FREQ #define OPENRISC_SOPC_UART_BASE 0x90000000 +#define OPENRISC_SOPC_ETHOC_BASE 0x92000000 + /* We reserve 256K for barebox */ #define BAREBOX_RESERVED_SIZE 0x40000 diff --git a/arch/openrisc/boards/generic/generic.c b/arch/openrisc/boards/generic/generic.c index e366d85714..290e05c6ec 100644 --- a/arch/openrisc/boards/generic/generic.c +++ b/arch/openrisc/boards/generic/generic.c @@ -16,6 +16,13 @@ static int openrisc_console_init(void) /* Register the serial port */ add_ns16550_device(DEVICE_ID_DYNAMIC, OPENRISC_SOPC_UART_BASE, 1024, IORESOURCE_MEM_8BIT, &serial_plat); + +#ifdef CONFIG_DRIVER_NET_ETHOC + add_generic_device("ethoc", DEVICE_ID_DYNAMIC, NULL, + OPENRISC_SOPC_ETHOC_BASE, 0x1000, + IORESOURCE_MEM, NULL); +#endif + return 0; } diff --git a/arch/openrisc/configs/generic_defconfig b/arch/openrisc/configs/generic_defconfig index 7ae85b0344..53ff671b88 100644 --- a/arch/openrisc/configs/generic_defconfig +++ b/arch/openrisc/configs/generic_defconfig @@ -18,3 +18,9 @@ CONFIG_CMD_GO=y CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y CONFIG_DRIVER_SERIAL_NS16550=y +CONFIG_NET=y +CONFIG_NET_DHCP=y +CONFIG_NET_PING=y +CONFIG_CMD_TFTP=y +CONFIG_FS_TFTP=y +CONFIG_DRIVER_NET_ETHOC=y |