On Thursday 15 March 2012 03:52:45 Marek Vasut wrote:
--- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c
-static void bootm_start_lmb(void) -{ #ifdef CONFIG_LMB +static void boot_start_lmb(bootm_headers_t *images) +{ ulong mem_start; phys_size_t mem_size;
- lmb_init(&images.lmb);
lmb_init(&images->lmb);
mem_start = getenv_bootm_low(); mem_size = getenv_bootm_size();
- lmb_add(&images.lmb, (phys_addr_t)mem_start, mem_size);
- lmb_add(&images->lmb, (phys_addr_t)mem_start, mem_size);
- arch_lmb_reserve(&images.lmb);
- board_lmb_reserve(&images.lmb);
- arch_lmb_reserve(&images->lmb);
- board_lmb_reserve(&images->lmb);
+} #else -# define lmb_reserve(lmb, base, size) +static inline void boot_start_lmb(bootm_headers_t *images) { } #endif -}
this breaks all non-lmb configs. before, lmb_reverse() was stubbed out, but now it's not, leading to build failures:
cmd_bootm.c: In function ‘do_bootm_subcommand’: cmd_bootm.c:518:23: error: ‘bootm_headers_t’ has no member named ‘lmb’ cmd_bootm.c: In function ‘do_bootm’: cmd_bootm.c:665:21: error: ‘bootm_headers_t’ has no member named ‘lmb’ make[2]: *** [cmd_bootm.o] Error 1 -mike