Revert "Generate a VHD image"

[ipfire-2.x.git] / lfs / flash-images

diff --git a/lfs/flash-images b/lfs/flash-images
index 55ffd0e819047b6b763398f973a97f070062f3b1..dcad81ab38b9b140166b913628d88e5973a05b4a 100644 (file)
--- 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
@@ -76,7 +79,7 @@ endif
 # /boot:  128MB - OFFSET
 # /    : 1200 MB
 S_BOOT := $(shell echo $$(( 262144 - $(S_OFFSET) )))
-S_ROOT := 2477600
+S_ROOT := 2476032
 
 ifeq "$(EFI)" "1"
  S_EFI = 65536 # 32 MB
@@ -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