Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 716520 | Differences between
and this patch

Collapse All | Expand All

(-)a/Documentation/x86/boot.rst (-3 / +3 lines)
Lines 786-794 Protocol: 2.08+ Link Here
786 
  uncompressed data should be determined using the standard magic
 786 
  uncompressed data should be determined using the standard magic
787 
  numbers.  The currently supported compression formats are gzip
 787 
  numbers.  The currently supported compression formats are gzip
788 
  (magic numbers 1F 8B or 1F 9E), bzip2 (magic number 42 5A), LZMA
 788 
  (magic numbers 1F 8B or 1F 9E), bzip2 (magic number 42 5A), LZMA
789 
  (magic number 5D 00), XZ (magic number FD 37), and LZ4 (magic number
 789 
  (magic number 5D 00), XZ (magic number FD 37), LZ4 (magic number
790 
  02 21).  The uncompressed payload is currently always ELF (magic
 790 
  02 21) and ZSTD (magic number 28 B5). The uncompressed payload is
791 
  number 7F 45 4C 46).
 791 
  currently always ELF (magic number 7F 45 4C 46).
792 

          792
          

        

        

          793
          
============	==============

          793
          
============	==============

        

        

          794
          
Field name:	payload_length

          794
          
Field name:	payload_length

        



(-)a/arch/x86/Kconfig
      (+1 lines)




  

    
      
            Lines 183-188
          config X86
      
      
        Link Here
      
    
  

        

          183
          
	select HAVE_KERNEL_LZMA

          183
          
	select HAVE_KERNEL_LZMA

        

        

          184
          
	select HAVE_KERNEL_LZO

          184
          
	select HAVE_KERNEL_LZO

        

        

          185
          
	select HAVE_KERNEL_XZ

          185
          
	select HAVE_KERNEL_XZ

        

            

              
              
              186
              
	select HAVE_KERNEL_ZSTD

            

        

          186
          
	select HAVE_KPROBES

          187
          
	select HAVE_KPROBES

        

        

          187
          
	select HAVE_KPROBES_ON_FTRACE

          188
          
	select HAVE_KPROBES_ON_FTRACE

        

        

          188
          
	select HAVE_FUNCTION_ERROR_INJECTION

          189
          
	select HAVE_FUNCTION_ERROR_INJECTION

        



(-)a/arch/x86/boot/compressed/Makefile
      (-1 / +4 lines)




  

    
      
            Lines 24-30
          OBJECT_FILES_NON_STANDARD	:= y
      
      
        Link Here
      
    
  

        

          24
          
KCOV_INSTRUMENT		:= n

          24
          
KCOV_INSTRUMENT		:= n

        

        

          25
          

          25
          

        

        

          26
          
targets := vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma \

          26
          
targets := vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma \

        

          
            

              27
              
	vmlinux.bin.xz vmlinux.bin.lzo vmlinux.bin.lz4


              27
              
	vmlinux.bin.xz vmlinux.bin.lzo vmlinux.bin.lz4 vmlinux.bin.zst

            

        

          28
          

          28
          

        

        

          29
          
KBUILD_CFLAGS := -m$(BITS) -O2

          29
          
KBUILD_CFLAGS := -m$(BITS) -O2

        

        

          30
          
KBUILD_CFLAGS += -fno-strict-aliasing $(call cc-option, -fPIE, -fPIC)

          30
          
KBUILD_CFLAGS += -fno-strict-aliasing $(call cc-option, -fPIE, -fPIC)

        

  

    
      
            Lines 145-150
          $(obj)/vmlinux.bin.lzo: $(vmlinux.bin.all-y) FORCE
      
      
        Link Here
      
    
  

        

          145
          
	$(call if_changed,lzo)

          145
          
	$(call if_changed,lzo)

        

        

          146
          
$(obj)/vmlinux.bin.lz4: $(vmlinux.bin.all-y) FORCE

          146
          
$(obj)/vmlinux.bin.lz4: $(vmlinux.bin.all-y) FORCE

        

        

          147
          
	$(call if_changed,lz4)

          147
          
	$(call if_changed,lz4)

        

            

              
              
              148
              
$(obj)/vmlinux.bin.zst: $(vmlinux.bin.all-y) FORCE

            

            

              149
              
	$(call if_changed,zstd)

            

        

          148
          

          150
          

        

        

          149
          
suffix-$(CONFIG_KERNEL_GZIP)	:= gz

          151
          
suffix-$(CONFIG_KERNEL_GZIP)	:= gz

        

        

          150
          
suffix-$(CONFIG_KERNEL_BZIP2)	:= bz2

          152
          
suffix-$(CONFIG_KERNEL_BZIP2)	:= bz2

        

  

    
      
            Lines 152-157
          suffix-$(CONFIG_KERNEL_LZMA)	:= lzma
      
      
        Link Here
      
    
  

        

          152
          
suffix-$(CONFIG_KERNEL_XZ)	:= xz

          154
          
suffix-$(CONFIG_KERNEL_XZ)	:= xz

        

        

          153
          
suffix-$(CONFIG_KERNEL_LZO) 	:= lzo

          155
          
suffix-$(CONFIG_KERNEL_LZO) 	:= lzo

        

        

          154
          
suffix-$(CONFIG_KERNEL_LZ4) 	:= lz4

          156
          
suffix-$(CONFIG_KERNEL_LZ4) 	:= lz4

        

            

              
              
              157
              
suffix-$(CONFIG_KERNEL_ZSTD)	:= zst

            

        

          155
          

          158
          

        

        

          156
          
quiet_cmd_mkpiggy = MKPIGGY $@

          159
          
quiet_cmd_mkpiggy = MKPIGGY $@

        

        

          157
          
      cmd_mkpiggy = $(obj)/mkpiggy $< > $@

          160
          
      cmd_mkpiggy = $(obj)/mkpiggy $< > $@

        



(-)a/arch/x86/boot/compressed/misc.c
      (+4 lines)




  

    
      
            Lines 77-82
          static int lines, cols;
      
      
        Link Here
      
    
  

        

          77
          
#ifdef CONFIG_KERNEL_LZ4

          77
          
#ifdef CONFIG_KERNEL_LZ4

        

        

          78
          
#include "../../../../lib/decompress_unlz4.c"

          78
          
#include "../../../../lib/decompress_unlz4.c"

        

        

          79
          
#endif

          79
          
#endif

        

            

              
              
              80
              

            

            

              81
              
#ifdef CONFIG_KERNEL_ZSTD

            

            

              82
              
#include "../../../../lib/decompress_unzstd.c"

            

            

              83
              
#endif

            

        

          80
          
/*

          84
          
/*

        

        

          81
          
 * NOTE: When adding a new decompressor, please update the analysis in

          85
          
 * NOTE: When adding a new decompressor, please update the analysis in

        

        

          82
          
 * ../header.S.

          86
          
 * ../header.S.

        



(-)a/arch/x86/include/asm/boot.h
      (-2 / +4 lines)




  

    
      
            Lines 24-32
          
      
      
        Link Here
      
    
  

        

          24
          
# error "Invalid value for CONFIG_PHYSICAL_ALIGN"

          24
          
# error "Invalid value for CONFIG_PHYSICAL_ALIGN"

        

        

          25
          
#endif

          25
          
#endif

        

        

          26
          

          26
          

        

          
            

              27
              
#ifdef CONFIG_KERNEL_BZIP2


              27
              
#if defined(CONFIG_KERNEL_BZIP2)

            

        

          28
          
# define BOOT_HEAP_SIZE		0x400000

          28
          
# define BOOT_HEAP_SIZE		0x400000

        

          
            

              29
              
#else /* !CONFIG_KERNEL_BZIP2 */


              29
              
#elif defined(CONFIG_KERNEL_ZSTD)

            

            

              
              

              30
              
# define BOOT_HEAP_SIZE		 0x30000

            

            


              31
              
#else

            

        

          30
          
# define BOOT_HEAP_SIZE		 0x10000

          32
          
# define BOOT_HEAP_SIZE		 0x10000

        

        

          31
          
#endif

          33
          
#endif

        

        

          32
          

          34
          

        






  

  Return to bug 716520