mirror of
https://git.savannah.gnu.org/git/grub.git
synced 2026-10-21 06:49:35 +00:00
2009-07-19 Pavel Roskin <proski@gnu.org>
* Makefile.in: Remove LIBLZO and enable_lzo. * conf/i386-pc.rmk: Remove lzo support. * configure.ac: Remove checks for lzo, don't define ENABLE_LZMA. * include/grub/i386/pc/kernel.h: Define ENABLE_LZMA. Remove lzo support. * kern/i386/pc/lzo1x.S: Remove. * kern/i386/pc/startup.S: Remove lzo support. * util/i386/pc/grub-mkimage.c: Likewise.
This commit is contained in:
1 parent
ac70fa32dd
commit
5680109e00
11 files changed
+21
-431
No files matched your search
+2
-17
@@ -210,20 +210,7 @@ codestart:
|
||||
incl %eax
|
||||
call EXT_C(grub_gate_a20)
|
||||
|
||||
#if defined(ENABLE_LZO)
|
||||
/* decompress the compressed part and put the result at 1MB */
|
||||
movl $GRUB_MEMORY_MACHINE_DECOMPRESSION_ADDR, %esi
|
||||
movl $(_start + GRUB_KERNEL_MACHINE_RAW_SIZE), %edi
|
||||
|
||||
pushl %esi
|
||||
pushl EXT_C(grub_compressed_size)
|
||||
pushl %edi
|
||||
call lzo1x_decompress
|
||||
addl $12, %esp
|
||||
|
||||
movl %eax, %ecx
|
||||
cld
|
||||
#elif defined(ENABLE_LZMA)
|
||||
#ifdef ENABLE_LZMA
|
||||
movl $GRUB_MEMORY_MACHINE_DECOMPRESSION_ADDR, %edi
|
||||
movl $(_start + GRUB_KERNEL_MACHINE_RAW_SIZE), %esi
|
||||
pushl %edi
|
||||
@@ -451,9 +438,7 @@ gate_a20_check_state:
|
||||
popl %ebx
|
||||
ret
|
||||
|
||||
#if defined(ENABLE_LZO)
|
||||
#include "lzo1x.S"
|
||||
#elif defined(ENABLE_LZMA)
|
||||
#ifdef ENABLE_LZMA
|
||||
#include "lzma_decode.S"
|
||||
#endif
|
||||
|
||||
|
||||
Reference in new issue
Block a user