diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-05-05 11:06:17 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-05-05 11:06:17 +0200 |
commit | 8fb1d4e0758fbeb91dd82541f7c769e2d1e6900a (patch) | |
tree | f8d8f474a0882dc0d65dafae17541e1c53fb3507 /arch/mips/boards | |
parent | 4626972921355dd8ed97f4a0d71a00950f2364e0 (diff) | |
parent | b7cc37eedf1663edd62179715ad1deb44421444a (diff) | |
download | barebox-8fb1d4e0758fbeb91dd82541f7c769e2d1e6900a.tar.gz barebox-8fb1d4e0758fbeb91dd82541f7c769e2d1e6900a.tar.xz |
Merge branch 'for-next/mips'
Conflicts:
arch/mips/boards/loongson-ls1b/serial.c
Diffstat (limited to 'arch/mips/boards')
-rw-r--r-- | arch/mips/boards/loongson-ls1b/Makefile | 1 | ||||
-rw-r--r-- | arch/mips/boards/loongson-ls1b/ram.c | 12 | ||||
-rw-r--r-- | arch/mips/boards/loongson-ls1b/serial.c | 12 |
3 files changed, 0 insertions, 25 deletions
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 <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/loongson-ls1b/serial.c b/arch/mips/boards/loongson-ls1b/serial.c index 7159ab7a5c..a9453ede28 100644 --- a/arch/mips/boards/loongson-ls1b/serial.c +++ b/arch/mips/boards/loongson-ls1b/serial.c @@ -1,22 +1,10 @@ #include <common.h> #include <init.h> -#include <ns16550.h> - -#include <mach/loongson1.h> - -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 | IORESOURCE_MEM_8BIT, &serial_plat); - return 0; } console_initcall(console_init); |