diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-04-05 12:24:20 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-04-05 12:24:20 +0200 |
| commit | 4db2fa7f9446d0f2fe8db3d62184b1212fe22707 (patch) | |
| tree | bc62cbfc14296551caebda626db7a90fef9ae844 /arch/powerpc/lib/bootm.c | |
| parent | 75df0d594990875419121c6f8687472ac9f4ae7a (diff) | |
| parent | 7d3053fbf16caad4745f42f7ae3e38e9d3e964b5 (diff) | |
| download | olio-uboot-2014.01-4db2fa7f9446d0f2fe8db3d62184b1212fe22707.tar.xz olio-uboot-2014.01-4db2fa7f9446d0f2fe8db3d62184b1212fe22707.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Conflicts:
drivers/usb/host/ehci-pci.c
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'arch/powerpc/lib/bootm.c')
| -rw-r--r-- | arch/powerpc/lib/bootm.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c index 116d81bec..c7f3d084a 100644 --- a/arch/powerpc/lib/bootm.c +++ b/arch/powerpc/lib/bootm.c @@ -33,6 +33,7 @@ #include <bzlib.h> #include <environment.h> #include <asm/byteorder.h> +#include <asm/mp.h> #if defined(CONFIG_OF_LIBFDT) #include <fdt.h> @@ -166,6 +167,10 @@ void arch_lmb_reserve(struct lmb *lmb) sp -= 4096; lmb_reserve(lmb, sp, (CONFIG_SYS_SDRAM_BASE + get_effective_memsize() - sp)); +#ifdef CONFIG_MP + cpu_mp_lmb_reserve(lmb); +#endif + return ; } |