diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2012-07-27 10:41:30 +0100 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2012-07-30 09:51:36 +0100 |
| commit | 0d6f330878173c7ba45b884f3e41ce40b917c73c (patch) | |
| tree | 0a887066d35d8b01914330d6ab6818fe015a5a9d /core/init.inc | |
| parent | 0fcd9a48603497dcc2727570a50a4401bb0fd085 (diff) | |
| parent | f0bbf9dd40f37f8c4870a33784996efd56955a75 (diff) | |
| download | syslinux-0d6f330878173c7ba45b884f3e41ce40b917c73c.tar.gz | |
Merge remote-tracking branch 'mfleming/elflink' into for-hpa/elflink/firmware
Conflicts:
Makefile
com32/elflink/ldlinux/adv.c
com32/elflink/ldlinux/kernel.c
com32/elflink/ldlinux/ldlinux.c
com32/include/bitsize/stddef.h
com32/include/bitsize/stdint.h
com32/include/stdint.h
com32/include/sys/module.h
com32/include/sys/x86_64/bitops.h
com32/include/syslinux/linux.h
com32/lib/Makefile
com32/lib/sys/ansicon_write.c
com32/lib/sys/module/elfutils.h
com32/lib/sys/vesa/efi/fill.h
com32/lib/syslinux/load_linux.c
com32/lib/syslinux/serial.c
com32/lib/syslinux/shuffle.c
core/conio.c
core/elflink/config.c
core/elflink/load_env32.c
core/graphics.c
core/include/graphics.h
core/init.c
core/pxelinux.asm
mk/elf.mk
mk/lib.mk
Diffstat (limited to 'core/init.inc')
| -rw-r--r-- | core/init.inc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/init.inc b/core/init.inc index 4ee68b27..995f9825 100644 --- a/core/init.inc +++ b/core/init.inc @@ -23,6 +23,11 @@ common_init: ; Initialize PM invocation framework call pm_init +%if IS_PXELINUX + ; Save derivative-specific data + pm_call pm_save_data +%endif + ; Decompress PM code to its target location pm_call pm_decompress cmp eax,__pm_code_len @@ -65,7 +70,7 @@ pm_decompress: mov edi,__bss16_start mov ecx,__bss16_dwords rep stosd - mov edi,__high_clear_start ; .uibss, .auxseg, .lowmem + mov edi,__high_clear_start ; .uibss, .lowmem mov ecx,__high_clear_dwords rep stosd |