grub2 ChangeLog conf/i386-pc.mk conf/i386-pc.rm...

[Robert Millan]

CVSROOT:        /sources/grub
Module name:    grub2
Changes by:     Robert Millan <robertmh>        08/01/20 23:20:36

Modified files:
        .              : ChangeLog 
        conf           : i386-pc.mk i386-pc.rmk 
        include/grub   : disk.h kernel.h 
        include/grub/i386/pc: kernel.h memory.h 
        kern/i386/pc   : init.c startup.S 
        util/i386/pc   : grub-mkimage.c 
Added files:
        disk           : memdisk.c 

Log message:
        2008-01-21  Robert Millan  <address@hidden>
        
                * conf/i386-pc.rmk (kernel_img_HEADERS): Add `machine/kernel.h'.
                (pkglib_MODULES): Add `memdisk.mod'.
                (memdisk_mod_SOURCES): New variable.
                (memdisk_mod_CFLAGS): Likewise.
                (memdisk_mod_LDFLAGS): Likewise.
        
                * disk/memdisk.c: New file.
        
                * include/grub/disk.h (grub_disk_dev_id): Add
                `GRUB_DISK_DEVICE_MEMDISK_ID'.
        
                * include/grub/i386/pc/kernel.h
                (GRUB_KERNEL_MACHINE_MEMDISK_IMAGE_SIZE): New macro.
                (GRUB_KERNEL_MACHINE_PREFIX): Increment by 4.
                (grub_kernel_image_size): New variable declaration.
                (grub_total_module_size): Likewise.
                (grub_memdisk_image_size): Likewise.
        
                * include/grub/i386/pc/memory.h
                (GRUB_MEMORY_MACHINE_DECOMPRESSION_ADDR): New macro.
        
                * include/grub/kernel.h: Include `<grub/symbol.h>'.
                (grub_arch_memdisk_addr): New variable declaration.
                (grub_arch_memdisk_size): Likewise.
        
                * kern/i386/pc/init.c (grub_arch_memdisk_addr): New function.
                (grub_arch_memdisk_size): Likewise.
        
                * kern/i386/pc/startup.S (grub_memdisk_image_size): New 
variable.
                (codestart): Replace hardcoded `0x100000' with
                `GRUB_MEMORY_MACHINE_DECOMPRESSION_ADDR' macro.
        
                * util/i386/pc/grub-mkimage.c: Include `<grub/misc.h>'.
                (generate_image): Add `memdisk_path' parameter.  When 
`memdisk_path' is
                not NULL, append the contents of the file it refers to, at the 
end of
                the compressed kernel image.  Initialize 
`grub_memdisk_image_size'
                variable (at `GRUB_KERNEL_MACHINE_MEMDISK_IMAGE_SIZE' offset).
                (options): Add "memdisk"|'m' option.
                (main): Parse --memdisk|-m option, and pass user-provided path 
as
                parameter to generate_image().

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/grub2/ChangeLog?cvsroot=grub&r1=1.507&r2=1.508
http://cvs.savannah.gnu.org/viewcvs/grub2/conf/i386-pc.mk?cvsroot=grub&r1=1.111&r2=1.112
http://cvs.savannah.gnu.org/viewcvs/grub2/conf/i386-pc.rmk?cvsroot=grub&r1=1.100&r2=1.101
http://cvs.savannah.gnu.org/viewcvs/grub2/disk/memdisk.c?cvsroot=grub&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/grub2/include/grub/disk.h?cvsroot=grub&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/grub2/include/grub/kernel.h?cvsroot=grub&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/grub2/include/grub/i386/pc/kernel.h?cvsroot=grub&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/grub2/include/grub/i386/pc/memory.h?cvsroot=grub&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/grub2/kern/i386/pc/init.c?cvsroot=grub&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/grub2/kern/i386/pc/startup.S?cvsroot=grub&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/grub2/util/i386/pc/grub-mkimage.c?cvsroot=grub&r1=1.13&r2=1.14