summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Smagin <dmitry.s.smagin@gmail.com>2013-09-18 09:20:32 +0400
committerSascha Hauer <s.hauer@pengutronix.de>2013-09-19 08:53:16 +0200
commitcb8ea6f3b376b83da723a50a2c21e57850f2ad95 (patch)
treeec2740855c589ef3cae622f0ee275a3ace482b7c
parentfe4117357f8f304a08b957eded8ede9db8dafdcf (diff)
downloadbarebox-cb8ea6f3b376b83da723a50a2c21e57850f2ad95.tar.gz
barebox-cb8ea6f3b376b83da723a50a2c21e57850f2ad95.tar.xz
MIPS: rxz50: add initial devicetree support
Memory initialization is moved from board.c to rzx50.dts file. Signed-off-by: Dmitry Smagin <dmitry.s.smagin@gmail.com> Acked-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/mips/boards/rzx50/Makefile1
-rw-r--r--arch/mips/boards/rzx50/board.c12
-rw-r--r--arch/mips/boards/rzx50/serial.c1
-rw-r--r--arch/mips/dts/rzx50.dts12
4 files changed, 12 insertions, 14 deletions
diff --git a/arch/mips/boards/rzx50/Makefile b/arch/mips/boards/rzx50/Makefile
index 9e14763111..ff1a655afe 100644
--- a/arch/mips/boards/rzx50/Makefile
+++ b/arch/mips/boards/rzx50/Makefile
@@ -1,2 +1 @@
-obj-y += board.o
obj-$(CONFIG_DRIVER_SERIAL_NS16550) += serial.o
diff --git a/arch/mips/boards/rzx50/board.c b/arch/mips/boards/rzx50/board.c
deleted file mode 100644
index 9e655aba50..0000000000
--- a/arch/mips/boards/rzx50/board.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <common.h>
-#include <init.h>
-#include <sizes.h>
-#include <asm/memory.h>
-
-static int mem_init(void)
-{
- mips_add_ram0(SZ_64M);
-
- return 0;
-}
-mem_initcall(mem_init);
diff --git a/arch/mips/boards/rzx50/serial.c b/arch/mips/boards/rzx50/serial.c
index 0038c1db40..566356aaa5 100644
--- a/arch/mips/boards/rzx50/serial.c
+++ b/arch/mips/boards/rzx50/serial.c
@@ -22,7 +22,6 @@
static int rzx50_console_init(void)
{
- barebox_set_model("Ritmix RZX-50");
barebox_set_hostname("rzx50");
/* Register the serial port */
diff --git a/arch/mips/dts/rzx50.dts b/arch/mips/dts/rzx50.dts
new file mode 100644
index 0000000000..69320ddbb3
--- /dev/null
+++ b/arch/mips/dts/rzx50.dts
@@ -0,0 +1,12 @@
+/dts-v1/;
+
+/include/ "skeleton.dtsi"
+
+/ {
+ model = "Ritmix RZX-50";
+ compatible = "ritmix,rzx50";
+
+ memory {
+ reg = <0x00000000 0x4000000>;
+ };
+};