diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-06-04 21:03:28 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-06-04 21:03:28 +0200 |
| commit | 4c37b77af4759b65058c3aee5eed4d809ac96d84 (patch) | |
| tree | 6d16b08615a8d0d0179c7aff7bed997bde45f627 /arch/mips/boards/dlink-dir-320/board.c | |
| parent | 6ec2780419cb1c656a61b29385dc134a06cae287 (diff) | |
| parent | d77b1094c4ba478132b4520c11eb9c10873be8cf (diff) | |
| download | barebox-4c37b77af4759b65058c3aee5eed4d809ac96d84.tar.gz barebox-4c37b77af4759b65058c3aee5eed4d809ac96d84.tar.xz | |
Merge branch 'for-next/mips'
Conflicts:
arch/mips/configs/dlink-dir-320_defconfig
Diffstat (limited to 'arch/mips/boards/dlink-dir-320/board.c')
| -rw-r--r-- | arch/mips/boards/dlink-dir-320/board.c | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/arch/mips/boards/dlink-dir-320/board.c b/arch/mips/boards/dlink-dir-320/board.c index 3eed6f0bcc..d00e4fab4b 100644 --- a/arch/mips/boards/dlink-dir-320/board.c +++ b/arch/mips/boards/dlink-dir-320/board.c @@ -1,12 +1,27 @@ +/* + * Copyright (C) 2011, 2014 Antony Pavlov <antonynpavlov@gmail.com> + * + * This file is part of barebox. + * See file CREDITS for list of people who contributed to this project. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + #include <common.h> #include <init.h> -#include <sizes.h> -#include <asm/memory.h> -static int mem_init(void) +static int dir320_console_init(void) { - mips_add_ram0(SZ_32M); + barebox_set_hostname("dir320"); return 0; } -mem_initcall(mem_init); +console_initcall(dir320_console_init); |