Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next

[ipfire-2.x.git] / lfs / Config

diff --git a/lfs/Config b/lfs/Config
index f14767f88c2b83d342e05e55d4523d935e9d9df5..76f279da96236003618f0b176873aea8f80d1ff6 100644 (file)
--- a/lfs/Config
+++ b/lfs/Config
@@ -37,10 +37,22 @@ ifeq "$(BUILD_ARCH)" "aarch64"
        IS_64BIT = 1
 endif
 
+ifeq "$(BUILD_ARCH)" "armv7hl"
+       IS_32BIT = 1
+endif
+
+ifeq "$(BUILD_ARCH)" "armv5tel"
+       IS_32BIT = 1
+endif
+
 ifeq "$(BUILD_ARCH)" "x86_64"
        IS_64BIT = 1
 endif
 
+ifeq "$(BUILD_ARCH)" "i586"
+       IS_32BIT = 1
+endif
+
 ifeq "$(TOOLCHAIN)" "1"
        PREFIX = $(TOOLS_DIR)
 else
@@ -79,9 +91,17 @@ DIR_TMP     = /tmp
 # Add the compiler location and version and specs to the ccache hash
 CCACHE_COMPILERCHECK += $(shell gcc -dumpspecs 2>/dev/null | md5sum | cut -d ' ' -f1)
 
-# We support EFI on x86_64
-ifeq "$(MACHINE)" "x86_64"
+# We support EFI on x86_64 and aarch64
+ifeq "$(BUILD_ARCH)" "x86_64"
+       EFI = 1
+       EFI_ARCH = x64
+       GRUB_ARCH = $(BUILD_ARCH)
+endif
+
+ifeq "$(BUILD_ARCH)" "aarch64"
        EFI = 1
+       EFI_ARCH = aa64
+       GRUB_ARCH = arm64
 endif
 
 ###############################################################################