diff options
| author | Riku Voipio <riku.voipio@linaro.org> | 2018-01-25 16:11:58 +0200 |
|---|---|---|
| committer | Riku Voipio <riku.voipio@linaro.org> | 2018-01-25 16:11:58 +0200 |
| commit | 0e397602a5ee03721aa0993eee219e4dc01a53a3 (patch) | |
| tree | 585f2dd329554961ba934403b2672a249970d5ca | |
| parent | bf1d38ef4d0ac5a04d23ae4828cf96fe2e4b31f6 (diff) | |
HIKEY: adapt grub
Use partition label as discussed at
https://bugs.96boards.org/show_bug.cgi?id=626
Change-Id: I2e2206c36611d9b4c1e0f1d0fd33587fbf8d7ee3
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
| -rw-r--r-- | disk_config/HIKEY | 3 | ||||
| -rwxr-xr-x | scripts/GRUB_PC/10-setup | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/disk_config/HIKEY b/disk_config/HIKEY index 73c72fe..dec2dc1 100644 --- a/disk_config/HIKEY +++ b/disk_config/HIKEY @@ -1,3 +1,4 @@ disk_config disk1 disklabel:msdos fstabkey:uuid bootable:1 primary /boot/efi 64 vfat rw -primary / 1G- ext4 rw +primary / 1G- ext4 rw createopts="-L rootfs" + diff --git a/scripts/GRUB_PC/10-setup b/scripts/GRUB_PC/10-setup index 63ecf0e..2aff5e3 100755 --- a/scripts/GRUB_PC/10-setup +++ b/scripts/GRUB_PC/10-setup @@ -40,13 +40,13 @@ EOF fi # Custom grub for emmc and lava cat << EOF > $target/boot/grub/emmc.config -set root=(hd0,gpt9) +search.fs_label rootfs root set prefix=(\$root)'/boot/grub' configfile \$prefix/grub.cfg EOF GRUB_MODULES="boot chain configfile echo efinet eval ext2 fat font gettext gfxterm gzio help linux loadenv lsefi normal part_gpt part_msdos read regexp search search_fs_file search_fs_uuid search_label terminal terminfo test tftp time" - $ROOTCMD grub-mkimage --prefix='(hd0,gpt9)/boot/grub' \ + $ROOTCMD grub-mkimage --prefix='($root)/boot/grub' \ --config=/boot/grub/emmc.config --output=/boot/efi/EFI/BOOT/GRUBAA64.EFI \ --format=arm64-efi --compression=auto $GRUB_MODULES echo "Standalone Hikey grub for eMMC and LAVA installed" |