From b7cc37eedf1663edd62179715ad1deb44421444a Mon Sep 17 00:00:00 2001 From: Antony Pavlov Date: Mon, 7 Apr 2014 11:38:49 +0400 Subject: MIPS: loongson-ls1b: switch to device tree Signed-off-by: Antony Pavlov Signed-off-by: Sascha Hauer --- arch/mips/boards/loongson-ls1b/Makefile | 1 - arch/mips/boards/loongson-ls1b/ram.c | 12 ------------ arch/mips/boards/loongson-ls1b/serial.c | 12 ------------ arch/mips/configs/loongson-ls1b_defconfig | 6 ++++++ 4 files changed, 6 insertions(+), 25 deletions(-) delete mode 100644 arch/mips/boards/loongson-ls1b/ram.c (limited to 'arch/mips') diff --git a/arch/mips/boards/loongson-ls1b/Makefile b/arch/mips/boards/loongson-ls1b/Makefile index a21952b737..31c062987f 100644 --- a/arch/mips/boards/loongson-ls1b/Makefile +++ b/arch/mips/boards/loongson-ls1b/Makefile @@ -1,2 +1 @@ -obj-y += ram.o obj-y += serial.o diff --git a/arch/mips/boards/loongson-ls1b/ram.c b/arch/mips/boards/loongson-ls1b/ram.c deleted file mode 100644 index 9e655aba50..0000000000 --- a/arch/mips/boards/loongson-ls1b/ram.c +++ /dev/null @@ -1,12 +0,0 @@ -#include -#include -#include -#include - -static int mem_init(void) -{ - mips_add_ram0(SZ_64M); - - return 0; -} -mem_initcall(mem_init); diff --git a/arch/mips/boards/loongson-ls1b/serial.c b/arch/mips/boards/loongson-ls1b/serial.c index d8e0f7c28a..a9453ede28 100644 --- a/arch/mips/boards/loongson-ls1b/serial.c +++ b/arch/mips/boards/loongson-ls1b/serial.c @@ -1,22 +1,10 @@ #include #include -#include - -#include - -static struct NS16550_plat serial_plat = { - .clock = 83000000, - .shift = 0, -}; static int console_init(void) { - barebox_set_model("Loongson Tech LS1B Demo Board"); barebox_set_hostname("ls1b"); - add_ns16550_device(DEVICE_ID_DYNAMIC, KSEG1ADDR(LS1X_UART2_BASE), - 8, IORESOURCE_MEM_8BIT, &serial_plat); - return 0; } console_initcall(console_init); diff --git a/arch/mips/configs/loongson-ls1b_defconfig b/arch/mips/configs/loongson-ls1b_defconfig index 0322052a3e..bc48abad79 100644 --- a/arch/mips/configs/loongson-ls1b_defconfig +++ b/arch/mips/configs/loongson-ls1b_defconfig @@ -1,3 +1,5 @@ +CONFIG_BUILTIN_DTB=y +CONFIG_BUILTIN_DTB_NAME="loongson-ls1b" CONFIG_MACH_MIPS_LOONGSON=y CONFIG_PBL_IMAGE=y CONFIG_STACK_SIZE=0x7000 @@ -36,7 +38,11 @@ CONFIG_CMD_IOMEM=y CONFIG_FLEXIBLE_BOOTARGS=y CONFIG_CMD_RESET=y CONFIG_CMD_GO=y +CONFIG_CMD_OFTREE=y +CONFIG_CMD_OF_PROPERTY=y +CONFIG_CMD_OF_NODE=y CONFIG_CMD_TIMEOUT=y +CONFIG_OFDEVICE=y # CONFIG_SPI is not set CONFIG_ZLIB=y CONFIG_BZLIB=y -- cgit v1.2.3