X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2FConfig;h=42da3f3b1da6b1f453fdd3cb43cc2ae43ae3e2b8;hb=918ee4a4cf5bb8d2a3ade16aac0dd643215c47e2;hp=d21623cb64d17035a31c5563bbf7ac06af6a1af6;hpb=5f387a1b8630c73cd0d573961356f579fd5520e4;p=ipfire-2.x.git

diff --git a/lfs/Config b/lfs/Config
index d21623cb64..42da3f3b1d 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -33,14 +33,36 @@
 # Cleanup environment from any variables
 unexport BUILD_ARCH BUILD_PLATFORM BUILDTARGET CROSSTARGET TOOLCHAIN TOOLS_DIR
 
+PARALLELISM = $(shell echo $$( \
+	if [ -n "$(MAX_PARALLELISM)" ] && [ $(MAX_PARALLELISM) -lt $(DEFAULT_PARALLELISM) ]; then \
+		echo $(MAX_PARALLELISM); \
+	else \
+		echo $(DEFAULT_PARALLELISM); \
+	fi) \
+)
+
+MAKETUNING = -j$(PARALLELISM)
+
 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,65 +101,18 @@ 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
+# We support EFI on x86_64 and aarch64
 ifeq "$(BUILD_ARCH)" "x86_64"
 	EFI = 1
 	EFI_ARCH = x64
+	GRUB_ARCH = $(BUILD_ARCH)
 endif
 
-# Basic modules
-GRUB_EFI_MODULES = \
-	configfile \
-	efi_gop \
-	efi_uga \
-	gzio \
-	linux \
-	loadbios \
-	loadenv \
-	normal \
-	regexp
-
-# Stuff for accessing file systems
-GRUB_EFI_MODULES += \
-	ahci \
-	ext2 \
-	fat \
-	iso9660 \
-	part_gpt \
-	part_msdos \
-	udf
-
-# Graphics & IO
-GRUB_EFI_MODULES += \
-	all_video \
-	at_keyboard \
-	bitmap_scale \
-	font \
-	gfxmenu \
-	gfxterm \
-	jpeg \
-	png \
-	tga \
-	usb_keyboard
-
-# Commands
-GRUB_EFI_MODULES += \
-	boot \
-	cat \
-	chain \
-	echo \
-	halt \
-	help \
-	ls \
-	minicmd \
-	probe \
-	reboot \
-	search \
-	search_fs_file \
-	search_fs_uuid \
-	search_label \
-	test \
-	true
+ifeq "$(BUILD_ARCH)" "aarch64"
+	EFI = 1
+	EFI_ARCH = aa64
+	GRUB_ARCH = arm64
+endif
 
 ###############################################################################
 # Common Macro Definitions