303148045a
This integrates the XZ decompression code to the x86 pre-boot code. mkpiggy.c is updated to reserve about 32 KiB more buffer safety margin for kernel decompression. It is done unconditionally for all decompressors to keep the code simpler. The XZ decompressor needs around 30 KiB of heap, so the heap size is increased to 32 KiB on both x86-32 and x86-64. Documentation/x86/boot.txt is updated to list the XZ magic number. With the x86 BCJ filter in XZ, XZ-compressed x86 kernel tends to be a few percent smaller than the equivalent LZMA-compressed kernel. Signed-off-by: Lasse Collin <lasse.collin@tukaani.org> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Alain Knaff <alain@knaff.lu> Cc: Albin Tonnerre <albin.tonnerre@free-electrons.com> Cc: Phillip Lougher <phillip@lougher.demon.co.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
48 lines
1.2 KiB
C
48 lines
1.2 KiB
C
#ifndef _ASM_X86_BOOT_H
|
|
#define _ASM_X86_BOOT_H
|
|
|
|
/* Internal svga startup constants */
|
|
#define NORMAL_VGA 0xffff /* 80x25 mode */
|
|
#define EXTENDED_VGA 0xfffe /* 80x50 mode */
|
|
#define ASK_VGA 0xfffd /* ask for it at bootup */
|
|
|
|
#ifdef __KERNEL__
|
|
|
|
#include <asm/pgtable_types.h>
|
|
|
|
/* Physical address where kernel should be loaded. */
|
|
#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
|
|
+ (CONFIG_PHYSICAL_ALIGN - 1)) \
|
|
& ~(CONFIG_PHYSICAL_ALIGN - 1))
|
|
|
|
/* Minimum kernel alignment, as a power of two */
|
|
#ifdef CONFIG_X86_64
|
|
#define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
|
|
#else
|
|
#define MIN_KERNEL_ALIGN_LG2 (PAGE_SHIFT + THREAD_ORDER)
|
|
#endif
|
|
#define MIN_KERNEL_ALIGN (_AC(1, UL) << MIN_KERNEL_ALIGN_LG2)
|
|
|
|
#if (CONFIG_PHYSICAL_ALIGN & (CONFIG_PHYSICAL_ALIGN-1)) || \
|
|
(CONFIG_PHYSICAL_ALIGN < MIN_KERNEL_ALIGN)
|
|
#error "Invalid value for CONFIG_PHYSICAL_ALIGN"
|
|
#endif
|
|
|
|
#ifdef CONFIG_KERNEL_BZIP2
|
|
#define BOOT_HEAP_SIZE 0x400000
|
|
#else /* !CONFIG_KERNEL_BZIP2 */
|
|
|
|
#define BOOT_HEAP_SIZE 0x8000
|
|
|
|
#endif /* !CONFIG_KERNEL_BZIP2 */
|
|
|
|
#ifdef CONFIG_X86_64
|
|
#define BOOT_STACK_SIZE 0x4000
|
|
#else
|
|
#define BOOT_STACK_SIZE 0x1000
|
|
#endif
|
|
|
|
#endif /* __KERNEL__ */
|
|
|
|
#endif /* _ASM_X86_BOOT_H */
|