diff options
| author | Grant Likely <grant.likely@linaro.org> | 2014-03-19 15:01:53 +0000 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2014-03-19 15:01:53 +0000 |
| commit | ca3992bc0c12e381deb84cd47ec1181a6d34660d (patch) | |
| tree | 162006e862b9d856fdce1b19f0ba117dafb6ca58 /include/asm-generic/vmlinux.lds.h | |
| parent | 0829f6d1f69e4f2fae4062987ae6531a9af1a2e3 (diff) | |
| parent | 2040b52768ebab6e7bd73af0dc63703269c62f17 (diff) | |
Merge branch 'devicetree/next-reserved-mem' into devicetree/next
Diffstat (limited to 'include/asm-generic/vmlinux.lds.h')
| -rw-r--r-- | include/asm-generic/vmlinux.lds.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index bc2121fa9132..f10f64fcc815 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -167,6 +167,16 @@ #define CLK_OF_TABLES() #endif +#ifdef CONFIG_OF_RESERVED_MEM +#define RESERVEDMEM_OF_TABLES() \ + . = ALIGN(8); \ + VMLINUX_SYMBOL(__reservedmem_of_table) = .; \ + *(__reservedmem_of_table) \ + *(__reservedmem_of_table_end) +#else +#define RESERVEDMEM_OF_TABLES() +#endif + #define KERNEL_DTB() \ STRUCT_ALIGN(); \ VMLINUX_SYMBOL(__dtb_start) = .; \ @@ -490,6 +500,7 @@ TRACE_SYSCALLS() \ MEM_DISCARD(init.rodata) \ CLK_OF_TABLES() \ + RESERVEDMEM_OF_TABLES() \ CLKSRC_OF_TABLES() \ KERNEL_DTB() \ IRQCHIP_OF_MATCH_TABLE() |