X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fflash-images;h=b78691e083ea40a309bb336552ba492a5307fa68;hp=24cf327a525855c0ff21d92a70f27058ef4334a0;hb=d27675b08175ed7969d842fdc64f157797911faa;hpb=f096a2ea9871ab087e36cd0044a3875d03b98799

diff --git a/lfs/flash-images b/lfs/flash-images
index 24cf327a52..b78691e083 100644
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -59,12 +59,15 @@ MNThdd   := /install/harddisk
 IMG      := /install/images/image.img
 
 # All sizes in blocks
-ifeq "$(BUILD_ARCH)" "armv5tel"
+ifeq "$(BUILD_PLATFORM)" "arm"
  BOOTLOADER =
  S_OFFSET = 8192
 
  # FAT32
  PART_TYPE = c
+ifeq "$(BUILD_ARCH)" "aarch64"
+ BOOTLOADER = grub
+endif
 else
  BOOTLOADER = grub
  S_OFFSET = 8192
@@ -89,7 +92,7 @@ PADDING = 100 # MB
 ifeq "$(EFI)" "1"
  SFDISK      = $(SFDISK_BOOT)$(SFDISK_EFI)$(SFDISK_ROOT)
 else
- SFDISK      = $(SFDISK_BOOT)$(SFDISK_ROOT)
+ SFDISK      = $(SFDISK_BOOT),0,0\n$(SFDISK_ROOT)
 endif
 
 SFDISK_BOOT = $(S_OFFSET),$(S_BOOT),$(PART_TYPE),*\n
@@ -195,13 +198,15 @@ ifeq "$(BOOTLOADER)" "grub"
 	sed -i $(MNThdd)/boot/grub/grub.cfg \
 		-e "s/root=[A-Za-z0-9\/=-]*/root=UUID=$$(blkid -o value -s UUID $(PART_ROOT))/g"
 
+ifeq "$(BUILD_PLATFORM)" "x86"
 	# Install GRUB
 	grub-install --force --recheck --no-floppy --target=i386-pc \
 		--root-directory=$(MNThdd) $(DEVICE)
+endif
 
 ifeq "$(EFI)" "1"
 	# Install GRUB for EFI
-	grub-install --target=$(BUILD_ARCH)-efi --removable --no-nvram \
+	grub-install --target=$(GRUB_ARCH)-efi --removable --no-nvram \
 		--boot-directory=$(MNThdd)/boot --efi-directory=$(MNThdd)/boot/efi
 endif