summaryrefslogtreecommitdiffstats
path: root/arch/openrisc
diff options
context:
space:
mode:
authorAntony Pavlov <antonynpavlov@gmail.com>2014-09-08 10:53:07 +0400
committerSascha Hauer <s.hauer@pengutronix.de>2014-09-09 10:20:30 +0200
commit5ed99c79aa659650f33b709714fc03f8a108bd51 (patch)
tree0aae81ac7e742f2aa2f97e029f747dfbb7cf1bf4 /arch/openrisc
parent16b50fcd7f96a71a043e56fd3cfa745d44623e35 (diff)
downloadbarebox-5ed99c79aa659650f33b709714fc03f8a108bd51.tar.gz
barebox-5ed99c79aa659650f33b709714fc03f8a108bd51.tar.xz
openrisc: generic board: reduce platform code
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Cc: Franck Jullien <franck.jullien@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/openrisc')
-rw-r--r--arch/openrisc/boards/generic/config.h5
-rw-r--r--arch/openrisc/boards/generic/generic.c24
2 files changed, 2 insertions, 27 deletions
diff --git a/arch/openrisc/boards/generic/config.h b/arch/openrisc/boards/generic/config.h
index 10c33a12f9..f6a054beed 100644
--- a/arch/openrisc/boards/generic/config.h
+++ b/arch/openrisc/boards/generic/config.h
@@ -8,11 +8,6 @@
#define OPENRISC_SOPC_MEMORY_BASE 0x00000000
#define OPENRISC_SOPC_MEMORY_SIZE 0x02000000
-#define OPENRISC_SOPC_UART_FREQ CONFIG_SYS_CLK_FREQ
-#define OPENRISC_SOPC_UART_BASE 0x90000000
-
-#define OPENRISC_SOPC_ETHOC_BASE 0x92000000
-
/* We reserve 512K for barebox */
#define BAREBOX_RESERVED_SIZE 0x80000
diff --git a/arch/openrisc/boards/generic/generic.c b/arch/openrisc/boards/generic/generic.c
index 9f680073cb..ff6f9f4d42 100644
--- a/arch/openrisc/boards/generic/generic.c
+++ b/arch/openrisc/boards/generic/generic.c
@@ -1,30 +1,10 @@
#include <common.h>
#include <init.h>
-#include <driver.h>
-#include <partition.h>
-#include <ns16550.h>
-static struct NS16550_plat serial_plat = {
- .clock = OPENRISC_SOPC_UART_FREQ,
- .shift = 0,
-};
-
-static int openrisc_console_init(void)
+static int openrisc_core_init(void)
{
- barebox_set_model("OpenRISC or1k");
barebox_set_hostname("or1k");
- /* Register the serial port */
- add_ns16550_device(DEVICE_ID_DYNAMIC, OPENRISC_SOPC_UART_BASE, 1024,
- IORESOURCE_MEM | 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;
}
-
-console_initcall(openrisc_console_init);
+core_initcall(openrisc_core_init);