HIKEY: fix ESP mounting
Set up label and logical sector size for the ESP partition. 4K logical
sector size is required on Hikey960 UFS and it should work on SD as
well.
Change-Id: I2ea093e2d9f4099b88a5309914408487da112bd7
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
diff --git a/disk_config/HIKEY b/disk_config/HIKEY
index 39a8249..61f53c3 100644
--- a/disk_config/HIKEY
+++ b/disk_config/HIKEY
@@ -1,4 +1,4 @@
disk_config disk1 disklabel:msdos fstabkey:uuid bootable:1
-primary /boot/efi 64 vfat rw
+primary /boot/efi 64 vfat rw createopts="-n BOOT -S 4096"
primary / 1G- ext4 rw createopts="-L rootfs-sd"
diff --git a/scripts/GRUB_PC/10-setup b/scripts/GRUB_PC/10-setup
index 2aff5e3..a76c923 100755
--- a/scripts/GRUB_PC/10-setup
+++ b/scripts/GRUB_PC/10-setup
@@ -16,6 +16,9 @@
exit 189
fi
+# make boot verbose by default
+sed -i -e 's,GRUB_CMDLINE_LINUX_DEFAULT="quiet",GRUB_CMDLINE_LINUX_DEFAULT="",' $target/etc/default/grub
+
# disable os-prober because of #788062
ainsl /etc/default/grub 'GRUB_DISABLE_OS_PROBER=true'
diff --git a/scripts/HIKEY/10-setup b/scripts/HIKEY/10-setup
index 0640f6c..511de82 100755
--- a/scripts/HIKEY/10-setup
+++ b/scripts/HIKEY/10-setup
@@ -1,5 +1,8 @@
#!/bin/sh
+# replace UUID with label for /boot/efi
+sed -i -e 's,^UUID.*/boot/efi.*$,LABEL=BOOT /boot/efi vfat rw 0 2,' $target/etc/fstab
+
echo hi655x_pmic >> $target/etc/initramfs-tools/modules
$ROOTCMD update-initramfs -u -k all