Merge ~xnox/grub:arm64-fdt+tpm into ~ubuntu-core-dev/grub/+git/ubuntu:ubuntu

[Dimitri John Ledkov]

Include fdt and tpm modules in arm64 EFI images. (LP: #2008950)

[Dimitri John Ledkov (xnox)]

ping

[Julian Andres Klode (juliank)]

Cherry-picked into into Ubuntu branch as-is, and Debian with some rewording. Kind of at the start of the 2.12 rebase of the former.

diff --git a/debian/build-efi-images b/debian/build-efi-images
index 6dda768..96e8d1b 100755
--- a/debian/build-efi-images
+++ b/debian/build-efi-images
@@ -143,6 +143,7 @@ CD_MODULES="
 	smbios
 	squash4
 	test
+	tpm
 	true
 	video
 	xfs
@@ -158,7 +159,11 @@ case $platform in
 	cpuid
 	linuxefi
 	play
-	tpm
+	"
+	;;
+    arm64-efi)
+	CD_MODULES="$CD_MODULES
+	fdt
 	"
 	;;
 esac