diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-02-04 15:49:00 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-02-04 15:49:00 +0100 |
| commit | aacd51bfd2d20138b6f9c549fb4f1aa66e88243b (patch) | |
| tree | 042153b32f5a24e5c3d94f7d249a9004d1f77d9a | |
| parent | 6eb49a5b1f2b09a723e3115b3911cebaf6d1ae23 (diff) | |
| parent | ba979549d6e66d3a4ce4f6042e47c39f458bd7b1 (diff) | |
| download | barebox-aacd51bfd2d20138b6f9c549fb4f1aa66e88243b.tar.gz barebox-aacd51bfd2d20138b6f9c549fb4f1aa66e88243b.tar.xz | |
Merge branch 'for-next/mips'
| -rw-r--r-- | arch/mips/boards/dlink-dir-320/Makefile | 1 | ||||
| -rw-r--r-- | arch/mips/boards/dlink-dir-320/board.c | 12 | ||||
| -rw-r--r-- | arch/mips/boards/qemu-malta/init.c | 4 | ||||
| -rw-r--r-- | arch/mips/boards/rzx50/Makefile | 1 | ||||
| -rw-r--r-- | arch/mips/boards/rzx50/board.c | 12 | ||||
| -rw-r--r-- | arch/mips/include/asm/memory.h | 12 |
6 files changed, 40 insertions, 2 deletions
diff --git a/arch/mips/boards/dlink-dir-320/Makefile b/arch/mips/boards/dlink-dir-320/Makefile index ff1a655afe..9e14763111 100644 --- a/arch/mips/boards/dlink-dir-320/Makefile +++ b/arch/mips/boards/dlink-dir-320/Makefile @@ -1 +1,2 @@ +obj-y += board.o obj-$(CONFIG_DRIVER_SERIAL_NS16550) += serial.o diff --git a/arch/mips/boards/dlink-dir-320/board.c b/arch/mips/boards/dlink-dir-320/board.c new file mode 100644 index 0000000000..3eed6f0bcc --- /dev/null +++ b/arch/mips/boards/dlink-dir-320/board.c @@ -0,0 +1,12 @@ +#include <common.h> +#include <init.h> +#include <sizes.h> +#include <asm/memory.h> + +static int mem_init(void) +{ + mips_add_ram0(SZ_32M); + + return 0; +} +mem_initcall(mem_init); diff --git a/arch/mips/boards/qemu-malta/init.c b/arch/mips/boards/qemu-malta/init.c index 28c23aa9a0..fb4472fe86 100644 --- a/arch/mips/boards/qemu-malta/init.c +++ b/arch/mips/boards/qemu-malta/init.c @@ -20,7 +20,7 @@ #include <types.h> #include <driver.h> #include <init.h> -#include <memory.h> +#include <asm/memory.h> #include <ns16550.h> #include <mach/hardware.h> #include <io.h> @@ -30,7 +30,7 @@ static int malta_mem_init(void) { - barebox_add_memory_bank("ram0", 0xa0000000, SZ_256M); + mips_add_ram0(SZ_256M); return 0; } diff --git a/arch/mips/boards/rzx50/Makefile b/arch/mips/boards/rzx50/Makefile index ff1a655afe..9e14763111 100644 --- a/arch/mips/boards/rzx50/Makefile +++ b/arch/mips/boards/rzx50/Makefile @@ -1 +1,2 @@ +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 new file mode 100644 index 0000000000..9e655aba50 --- /dev/null +++ b/arch/mips/boards/rzx50/board.c @@ -0,0 +1,12 @@ +#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/include/asm/memory.h b/arch/mips/include/asm/memory.h new file mode 100644 index 0000000000..2aa28b7686 --- /dev/null +++ b/arch/mips/include/asm/memory.h @@ -0,0 +1,12 @@ +#ifndef __ASM_MIPS_MEMORY_H +#define __ASM_MIPS_MEMORY_H + +#include <memory.h> +#include <asm/addrspace.h> + +static inline void mips_add_ram0(resource_size_t size) +{ + barebox_add_memory_bank("kseg0_ram0", KSEG0, size); + barebox_add_memory_bank("kseg1_ram0", KSEG1, size); +} +#endif /* __ASM_MIPS_MEMORY_H */ |