Changeset cfb1217 in mainline for boot/Makefile.grub


Ignore:
Timestamp:
2016-04-05T19:04:11Z (8 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
3a34852
Parents:
3876300
Message:

Update Grub. For i386-pc platform add generated core.img for installer. Make necessary changes: grub.conf location, alignment of multiboot 2 tags.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile.grub

    r3876300 rcfb1217  
    3333GRUB = grub.$(GRUB_ARCH)
    3434BOOT = $(DISTROOT)/boot
     35BOOT_CONFIG = $(BOOT)/grub/grub.cfg
    3536
    3637ELTORITO = boot/grub/$(GRUB_ARCH).img
    … …  
    3839
    3940ifeq ($(GRUB_ARCH),pc)
    40         BOOT_CONFIG = $(BOOT)/grub/i386-pc/grub.cfg
    4141        MULTIBOOT_CMD = multiboot
    4242        MODULE_CMD = module
    4343endif
    4444ifeq ($(GRUB_ARCH),efi)
    45         BOOT_CONFIG = $(BOOT)/grub/grub.cfg
    4645        MULTIBOOT_CMD = multiboot2
    4746        MODULE_CMD = module2
Note: See TracChangeset for help on using the changeset viewer.