hikey: Use internal fat16copy utility instead of mcopy am: fcfe2d6ac0 am: 501450f9ff am: e4a6718099
am: d9f4dc98bf
Change-Id: I3fa137191907da2cb2852f32931399b9d7dbd0b9
diff --git a/bootloader/EFI/BOOT/grub.cfg b/bootloader/EFI/BOOT/grub.cfg
index 95c7dcc..d5b166d 100644
--- a/bootloader/EFI/BOOT/grub.cfg
+++ b/bootloader/EFI/BOOT/grub.cfg
@@ -3,35 +3,35 @@
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 8a5b5a5..b65b218 100644
--- a/build/tasks/boot_fat.mk
+++ b/build/tasks/boot_fat.mk
@@ -5,10 +5,10 @@
# $@ 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