diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-02-03 10:49:18 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-02-03 10:49:18 +0100 |
| commit | 06ea6c135dbeda6ee9210c1526d5688350eb6ae7 (patch) | |
| tree | fc74509e65c464a32f4bb369597e86bb2ecacfaf /common | |
| parent | 75c38628f7320e58f2b4bf617ed6d17841ea486f (diff) | |
| parent | 86ddd55dda013516e633cafca956ca81ec673e9b (diff) | |
| download | barebox-06ea6c135dbeda6ee9210c1526d5688350eb6ae7.tar.gz barebox-06ea6c135dbeda6ee9210c1526d5688350eb6ae7.tar.xz | |
Merge branch 'next'
Diffstat (limited to 'common')
| -rw-r--r-- | common/env.c | 2 | ||||
| -rw-r--r-- | common/startup.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/common/env.c b/common/env.c index f81bd468ff..b72b5d1f4a 100644 --- a/common/env.c +++ b/common/env.c @@ -81,7 +81,7 @@ int env_push_context(void) return 0; } -late_initcall(env_push_context); +device_initcall(env_push_context); /** * FIXME diff --git a/common/startup.c b/common/startup.c index 0d7ccb9487..aa76cb75af 100644 --- a/common/startup.c +++ b/common/startup.c @@ -40,6 +40,7 @@ #include <environment.h> #include <reloc.h> #include <asm-generic/memory_layout.h> +#include <asm/sections.h> extern initcall_t __barebox_initcalls_start[], __barebox_early_initcalls_end[], __barebox_initcalls_end[]; @@ -50,8 +51,8 @@ static void display_meminfo(void) ulong mend = mem_malloc_end(); ulong msize = mend - mstart + 1; - debug("barebox code : 0x%08lX -> 0x%08lX BSS: -> 0x%08lX\n", - _barebox_start, _bss_start, _bss_end); + debug("barebox code: 0x%p -> 0x%p\n", _stext, _etext); + debug("bss segment: 0x%p -> 0x%p\n", __bss_start, __bss_stop); printf("Malloc space: 0x%08lx -> 0x%08lx (size %s)\n", mstart, mend, size_human_readable(msize)); #ifdef CONFIG_ARM |