diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2016-09-02 14:40:59 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2016-09-07 17:50:45 -0700 |
| commit | fcfe2d6ac00539f2d4cf77295503c0d285ee8170 (patch) | |
| tree | f951560f8dc0a7229a9623230a55847e791feab7 | |
| parent | 7f50a6b9bdb3e98766ea90d1d93d83bf5a715e9f (diff) | |
| download | hikey-fcfe2d6ac00539f2d4cf77295503c0d285ee8170.tar.gz | |
hikey: Use internal fat16copy utility instead of mcopy
Since fat16copy can't rename files, also change
grub's expectation of the kernel being named Image
to kernel
Change-Id: I73bde0f3173baf032ffa879ffc9052cf93bcfe88
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
[jstultz: added grub tweaks]
Signed-off-by: John Stultz <john.stultz@linaro.org>
| -rw-r--r-- | bootloader/EFI/BOOT/grub.cfg | 10 | ||||
| -rw-r--r-- | build/tasks/boot_fat.mk | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/bootloader/EFI/BOOT/grub.cfg b/bootloader/EFI/BOOT/grub.cfg index 95c7dccb..d5b166d0 100644 --- a/bootloader/EFI/BOOT/grub.cfg +++ b/bootloader/EFI/BOOT/grub.cfg @@ -3,35 +3,35 @@ set timeout=1 menuentry 'AOSP' { search.fs_label boot root set root=($root) - linux /Image console=ttyFIQ0 androidboot.console=ttyFIQ0 androidboot.hardware=hikey firmware_class.path=/system/etc/firmware efi=noruntime + linux /kernel console=ttyFIQ0 androidboot.console=ttyFIQ0 androidboot.hardware=hikey firmware_class.path=/system/etc/firmware efi=noruntime initrd /ramdisk.img devicetree /hi6220-hikey.dtb } menuentry 'AOSP-DEBUG' { search.fs_label boot root set root=($root) - linux /Image earlycon=pl011,0xf7113000 no_console_suspend=1 console=ttyFIQ0 androidboot.console=ttyFIQ0 sysrq_always_enabled androidboot.hardware=hikey firmware_class.path=/system/etc/firmware efi=noruntime + linux /kernel earlycon=pl011,0xf7113000 no_console_suspend=1 console=ttyFIQ0 androidboot.console=ttyFIQ0 sysrq_always_enabled androidboot.hardware=hikey firmware_class.path=/system/etc/firmware efi=noruntime initrd /ramdisk.img devicetree /hi6220-hikey.dtb } menuentry 'AOSP-CONSOLE' { search.fs_label boot root set root=($root) - linux /Image console=ttyAMA3,115200 androidboot.console=ttyAMA3 fiq_debugger.disable=Y androidboot.hardware=hikey firmware_class.path=/system/etc/firmware efi=noruntime + linux /kernel console=ttyAMA3,115200 androidboot.console=ttyAMA3 fiq_debugger.disable=Y androidboot.hardware=hikey firmware_class.path=/system/etc/firmware efi=noruntime initrd /ramdisk.img devicetree /hi6220-hikey.dtb } menuentry 'AOSP@720P' { search.fs_label boot root set root=($root) - linux /Image console=ttyFIQ0 androidboot.console=ttyFIQ0 androidboot.hardware=hikey firmware_class.path=/system/etc/firmware efi=noruntime video=HDMI-A-1:1280x720@60 + linux /kernel console=ttyFIQ0 androidboot.console=ttyFIQ0 androidboot.hardware=hikey firmware_class.path=/system/etc/firmware efi=noruntime video=HDMI-A-1:1280x720@60 initrd /ramdisk.img devicetree /hi6220-hikey.dtb } menuentry 'AOSP@SVGA' { search.fs_label boot root set root=($root) - linux /Image console=ttyFIQ0 androidboot.console=ttyFIQ0 androidboot.hardware=hikey firmware_class.path=/system/etc/firmware efi=noruntime video=HDMI-A-1:800x600@60 + linux /kernel console=ttyFIQ0 androidboot.console=ttyFIQ0 androidboot.hardware=hikey firmware_class.path=/system/etc/firmware efi=noruntime video=HDMI-A-1:800x600@60 initrd /ramdisk.img devicetree /hi6220-hikey.dtb } diff --git a/build/tasks/boot_fat.mk b/build/tasks/boot_fat.mk index 8a5b5a58..b65b2188 100644 --- a/build/tasks/boot_fat.mk +++ b/build/tasks/boot_fat.mk @@ -5,10 +5,10 @@ $(PRODUCT_OUT)/boot_fat.uefi.img: $(INSTALLED_KERNEL_TARGET) $(INSTALLED_RAMDISK # $@ is referring to $(PRODUCT_OUT)/boot_fat.uefi.img dd if=/dev/zero of=$@ bs=512 count=98304 mkfs.fat -n "boot" $@ - mcopy -i $@ $(PRODUCT_OUT)/kernel ::Image - mcopy -i $@ $(PRODUCT_OUT)/hi6220-hikey.dtb ::hi6220-hikey.dtb - mcopy -s -i $@ device/linaro/hikey/bootloader/* :: - mcopy -i $@ $(PRODUCT_OUT)/ramdisk.img ::ramdisk.img + $(FAT16COPY) $@ $(PRODUCT_OUT)/kernel + $(FAT16COPY) $@ $(PRODUCT_OUT)/hi6220-hikey.dtb + $(FAT16COPY) $@ device/linaro/hikey/bootloader/* + $(FAT16COPY) $@ $(PRODUCT_OUT)/ramdisk.img droidcore: $(PRODUCT_OUT)/boot_fat.uefi.img endif |